@@ -63,9 +63,9 @@ func (r *ClusterBackEndReconciler) ReconcileNormal(ctx context.Context, cluster
63
63
if err != nil {
64
64
conditions .MarkFalse (dockerCluster , infrav1 .LoadBalancerAvailableCondition , infrav1 .LoadBalancerProvisioningFailedReason , clusterv1 .ConditionSeverityWarning , err .Error ())
65
65
v1beta2conditions .Set (dockerCluster , metav1.Condition {
66
- Type : infrav1 .DockerClusterDockerLoadBalancerAvailableV1Beta2Condition ,
66
+ Type : infrav1 .DevClusterDockerLoadBalancerAvailableV1Beta2Condition ,
67
67
Status : metav1 .ConditionFalse ,
68
- Reason : infrav1 .DockerClusterDockerLoadBalancerNotAvailableV1Beta2Reason ,
68
+ Reason : infrav1 .DevClusterDockerLoadBalancerNotAvailableV1Beta2Reason ,
69
69
Message : fmt .Sprintf ("Failed to create helper for managing the externalLoadBalancer: %v" , err ),
70
70
})
71
71
return ctrl.Result {}, errors .Wrapf (err , "failed to create helper for managing the externalLoadBalancer" )
@@ -75,9 +75,9 @@ func (r *ClusterBackEndReconciler) ReconcileNormal(ctx context.Context, cluster
75
75
if err := externalLoadBalancer .Create (ctx ); err != nil {
76
76
conditions .MarkFalse (dockerCluster , infrav1 .LoadBalancerAvailableCondition , infrav1 .LoadBalancerProvisioningFailedReason , clusterv1 .ConditionSeverityWarning , err .Error ())
77
77
v1beta2conditions .Set (dockerCluster , metav1.Condition {
78
- Type : infrav1 .DockerClusterDockerLoadBalancerAvailableV1Beta2Condition ,
78
+ Type : infrav1 .DevClusterDockerLoadBalancerAvailableV1Beta2Condition ,
79
79
Status : metav1 .ConditionFalse ,
80
- Reason : infrav1 .DockerClusterDockerLoadBalancerNotAvailableV1Beta2Reason ,
80
+ Reason : infrav1 .DevClusterDockerLoadBalancerNotAvailableV1Beta2Reason ,
81
81
Message : fmt .Sprintf ("Failed to create load balancer: %v" , err ),
82
82
})
83
83
return ctrl.Result {}, errors .Wrap (err , "failed to create load balancer" )
@@ -88,9 +88,9 @@ func (r *ClusterBackEndReconciler) ReconcileNormal(ctx context.Context, cluster
88
88
if err != nil {
89
89
conditions .MarkFalse (dockerCluster , infrav1 .LoadBalancerAvailableCondition , infrav1 .LoadBalancerProvisioningFailedReason , clusterv1 .ConditionSeverityWarning , err .Error ())
90
90
v1beta2conditions .Set (dockerCluster , metav1.Condition {
91
- Type : infrav1 .DockerClusterDockerLoadBalancerAvailableV1Beta2Condition ,
91
+ Type : infrav1 .DevClusterDockerLoadBalancerAvailableV1Beta2Condition ,
92
92
Status : metav1 .ConditionFalse ,
93
- Reason : infrav1 .DockerClusterDockerLoadBalancerNotAvailableV1Beta2Reason ,
93
+ Reason : infrav1 .DevClusterDockerLoadBalancerNotAvailableV1Beta2Reason ,
94
94
Message : fmt .Sprintf ("Failed to get ip for the load balancer: %v" , err ),
95
95
})
96
96
return ctrl.Result {}, errors .Wrap (err , "failed to get ip for the load balancer" )
@@ -106,9 +106,9 @@ func (r *ClusterBackEndReconciler) ReconcileNormal(ctx context.Context, cluster
106
106
dockerCluster .Status .Ready = true
107
107
conditions .MarkTrue (dockerCluster , infrav1 .LoadBalancerAvailableCondition )
108
108
v1beta2conditions .Set (dockerCluster , metav1.Condition {
109
- Type : infrav1 .DockerClusterDockerLoadBalancerAvailableV1Beta2Condition ,
109
+ Type : infrav1 .DevClusterDockerLoadBalancerAvailableV1Beta2Condition ,
110
110
Status : metav1 .ConditionTrue ,
111
- Reason : infrav1 .DockerClusterDockerLoadBalancerAvailableV1Beta2Reason ,
111
+ Reason : infrav1 .DevClusterDockerLoadBalancerAvailableV1Beta2Reason ,
112
112
})
113
113
114
114
return ctrl.Result {}, nil
@@ -128,9 +128,9 @@ func (r *ClusterBackEndReconciler) ReconcileDelete(ctx context.Context, cluster
128
128
if err != nil {
129
129
conditions .MarkFalse (dockerCluster , infrav1 .LoadBalancerAvailableCondition , infrav1 .LoadBalancerProvisioningFailedReason , clusterv1 .ConditionSeverityWarning , err .Error ())
130
130
v1beta2conditions .Set (dockerCluster , metav1.Condition {
131
- Type : infrav1 .DockerClusterDockerLoadBalancerAvailableV1Beta2Condition ,
131
+ Type : infrav1 .DevClusterDockerLoadBalancerAvailableV1Beta2Condition ,
132
132
Status : metav1 .ConditionFalse ,
133
- Reason : infrav1 .DockerClusterDockerLoadBalancerNotAvailableV1Beta2Reason ,
133
+ Reason : infrav1 .DevClusterDockerLoadBalancerNotAvailableV1Beta2Reason ,
134
134
Message : fmt .Sprintf ("Failed to create helper for managing the externalLoadBalancer: %v" , err ),
135
135
})
136
136
@@ -142,9 +142,9 @@ func (r *ClusterBackEndReconciler) ReconcileDelete(ctx context.Context, cluster
142
142
if conditions .GetReason (dockerCluster , infrav1 .LoadBalancerAvailableCondition ) != clusterv1 .DeletingReason {
143
143
conditions .MarkFalse (dockerCluster , infrav1 .LoadBalancerAvailableCondition , clusterv1 .DeletingReason , clusterv1 .ConditionSeverityInfo , "" )
144
144
v1beta2conditions .Set (dockerCluster , metav1.Condition {
145
- Type : infrav1 .DockerClusterDockerLoadBalancerAvailableV1Beta2Condition ,
145
+ Type : infrav1 .DevClusterDockerLoadBalancerAvailableV1Beta2Condition ,
146
146
Status : metav1 .ConditionFalse ,
147
- Reason : infrav1 .DockerClusterDockerLoadBalancerDeletingV1Beta2Reason ,
147
+ Reason : infrav1 .DevClusterDockerLoadBalancerDeletingV1Beta2Reason ,
148
148
})
149
149
return ctrl.Result {RequeueAfter : 1 * time .Second }, nil
150
150
}
@@ -176,16 +176,16 @@ func (r *ClusterBackEndReconciler) PatchDevCluster(ctx context.Context, patchHel
176
176
)
177
177
if err := v1beta2conditions .SetSummaryCondition (dockerCluster , dockerCluster , infrav1 .DevClusterReadyV1Beta2Condition ,
178
178
v1beta2conditions.ForConditionTypes {
179
- infrav1 .DockerClusterDockerLoadBalancerAvailableV1Beta2Condition ,
179
+ infrav1 .DevClusterDockerLoadBalancerAvailableV1Beta2Condition ,
180
180
},
181
181
// Using a custom merge strategy to override reasons applied during merge.
182
182
v1beta2conditions.CustomMergeStrategy {
183
183
MergeStrategy : v1beta2conditions .DefaultMergeStrategy (
184
184
// Use custom reasons.
185
185
v1beta2conditions .ComputeReasonFunc (v1beta2conditions .GetDefaultComputeMergeReasonFunc (
186
- infrav1 .DevMachineNotReadyV1Beta2Reason ,
187
- infrav1 .DevMachineReadyUnknownV1Beta2Reason ,
188
- infrav1 .DevMachineReadyV1Beta2Reason ,
186
+ infrav1 .DevClusterNotReadyV1Beta2Reason ,
187
+ infrav1 .DevClusterReadyUnknownV1Beta2Reason ,
188
+ infrav1 .DevClusterReadyV1Beta2Reason ,
189
189
)),
190
190
),
191
191
},
@@ -203,7 +203,7 @@ func (r *ClusterBackEndReconciler) PatchDevCluster(ctx context.Context, patchHel
203
203
}},
204
204
patch.WithOwnedV1Beta2Conditions {Conditions : []string {
205
205
infrav1 .DevClusterReadyV1Beta2Condition ,
206
- infrav1 .DockerClusterDockerLoadBalancerAvailableV1Beta2Condition ,
206
+ infrav1 .DevClusterDockerLoadBalancerAvailableV1Beta2Condition ,
207
207
}},
208
208
)
209
209
}
0 commit comments