@@ -63,9 +63,9 @@ func (r *ClusterBackEndReconciler) ReconcileNormal(ctx context.Context, cluster
6363 if err != nil {
6464 conditions .MarkFalse (dockerCluster , infrav1 .LoadBalancerAvailableCondition , infrav1 .LoadBalancerProvisioningFailedReason , clusterv1 .ConditionSeverityWarning , err .Error ())
6565 v1beta2conditions .Set (dockerCluster , metav1.Condition {
66- Type : infrav1 .DockerClusterDockerLoadBalancerAvailableV1Beta2Condition ,
66+ Type : infrav1 .DevClusterDockerLoadBalancerAvailableV1Beta2Condition ,
6767 Status : metav1 .ConditionFalse ,
68- Reason : infrav1 .DockerClusterDockerLoadBalancerNotAvailableV1Beta2Reason ,
68+ Reason : infrav1 .DevClusterDockerLoadBalancerNotAvailableV1Beta2Reason ,
6969 Message : fmt .Sprintf ("Failed to create helper for managing the externalLoadBalancer: %v" , err ),
7070 })
7171 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
7575 if err := externalLoadBalancer .Create (ctx ); err != nil {
7676 conditions .MarkFalse (dockerCluster , infrav1 .LoadBalancerAvailableCondition , infrav1 .LoadBalancerProvisioningFailedReason , clusterv1 .ConditionSeverityWarning , err .Error ())
7777 v1beta2conditions .Set (dockerCluster , metav1.Condition {
78- Type : infrav1 .DockerClusterDockerLoadBalancerAvailableV1Beta2Condition ,
78+ Type : infrav1 .DevClusterDockerLoadBalancerAvailableV1Beta2Condition ,
7979 Status : metav1 .ConditionFalse ,
80- Reason : infrav1 .DockerClusterDockerLoadBalancerNotAvailableV1Beta2Reason ,
80+ Reason : infrav1 .DevClusterDockerLoadBalancerNotAvailableV1Beta2Reason ,
8181 Message : fmt .Sprintf ("Failed to create load balancer: %v" , err ),
8282 })
8383 return ctrl.Result {}, errors .Wrap (err , "failed to create load balancer" )
@@ -88,9 +88,9 @@ func (r *ClusterBackEndReconciler) ReconcileNormal(ctx context.Context, cluster
8888 if err != nil {
8989 conditions .MarkFalse (dockerCluster , infrav1 .LoadBalancerAvailableCondition , infrav1 .LoadBalancerProvisioningFailedReason , clusterv1 .ConditionSeverityWarning , err .Error ())
9090 v1beta2conditions .Set (dockerCluster , metav1.Condition {
91- Type : infrav1 .DockerClusterDockerLoadBalancerAvailableV1Beta2Condition ,
91+ Type : infrav1 .DevClusterDockerLoadBalancerAvailableV1Beta2Condition ,
9292 Status : metav1 .ConditionFalse ,
93- Reason : infrav1 .DockerClusterDockerLoadBalancerNotAvailableV1Beta2Reason ,
93+ Reason : infrav1 .DevClusterDockerLoadBalancerNotAvailableV1Beta2Reason ,
9494 Message : fmt .Sprintf ("Failed to get ip for the load balancer: %v" , err ),
9595 })
9696 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
106106 dockerCluster .Status .Ready = true
107107 conditions .MarkTrue (dockerCluster , infrav1 .LoadBalancerAvailableCondition )
108108 v1beta2conditions .Set (dockerCluster , metav1.Condition {
109- Type : infrav1 .DockerClusterDockerLoadBalancerAvailableV1Beta2Condition ,
109+ Type : infrav1 .DevClusterDockerLoadBalancerAvailableV1Beta2Condition ,
110110 Status : metav1 .ConditionTrue ,
111- Reason : infrav1 .DockerClusterDockerLoadBalancerAvailableV1Beta2Reason ,
111+ Reason : infrav1 .DevClusterDockerLoadBalancerAvailableV1Beta2Reason ,
112112 })
113113
114114 return ctrl.Result {}, nil
@@ -128,9 +128,9 @@ func (r *ClusterBackEndReconciler) ReconcileDelete(ctx context.Context, cluster
128128 if err != nil {
129129 conditions .MarkFalse (dockerCluster , infrav1 .LoadBalancerAvailableCondition , infrav1 .LoadBalancerProvisioningFailedReason , clusterv1 .ConditionSeverityWarning , err .Error ())
130130 v1beta2conditions .Set (dockerCluster , metav1.Condition {
131- Type : infrav1 .DockerClusterDockerLoadBalancerAvailableV1Beta2Condition ,
131+ Type : infrav1 .DevClusterDockerLoadBalancerAvailableV1Beta2Condition ,
132132 Status : metav1 .ConditionFalse ,
133- Reason : infrav1 .DockerClusterDockerLoadBalancerNotAvailableV1Beta2Reason ,
133+ Reason : infrav1 .DevClusterDockerLoadBalancerNotAvailableV1Beta2Reason ,
134134 Message : fmt .Sprintf ("Failed to create helper for managing the externalLoadBalancer: %v" , err ),
135135 })
136136
@@ -142,9 +142,9 @@ func (r *ClusterBackEndReconciler) ReconcileDelete(ctx context.Context, cluster
142142 if conditions .GetReason (dockerCluster , infrav1 .LoadBalancerAvailableCondition ) != clusterv1 .DeletingReason {
143143 conditions .MarkFalse (dockerCluster , infrav1 .LoadBalancerAvailableCondition , clusterv1 .DeletingReason , clusterv1 .ConditionSeverityInfo , "" )
144144 v1beta2conditions .Set (dockerCluster , metav1.Condition {
145- Type : infrav1 .DockerClusterDockerLoadBalancerAvailableV1Beta2Condition ,
145+ Type : infrav1 .DevClusterDockerLoadBalancerAvailableV1Beta2Condition ,
146146 Status : metav1 .ConditionFalse ,
147- Reason : infrav1 .DockerClusterDockerLoadBalancerDeletingV1Beta2Reason ,
147+ Reason : infrav1 .DevClusterDockerLoadBalancerDeletingV1Beta2Reason ,
148148 })
149149 return ctrl.Result {RequeueAfter : 1 * time .Second }, nil
150150 }
@@ -176,16 +176,16 @@ func (r *ClusterBackEndReconciler) PatchDevCluster(ctx context.Context, patchHel
176176 )
177177 if err := v1beta2conditions .SetSummaryCondition (dockerCluster , dockerCluster , infrav1 .DevClusterReadyV1Beta2Condition ,
178178 v1beta2conditions.ForConditionTypes {
179- infrav1 .DockerClusterDockerLoadBalancerAvailableV1Beta2Condition ,
179+ infrav1 .DevClusterDockerLoadBalancerAvailableV1Beta2Condition ,
180180 },
181181 // Using a custom merge strategy to override reasons applied during merge.
182182 v1beta2conditions.CustomMergeStrategy {
183183 MergeStrategy : v1beta2conditions .DefaultMergeStrategy (
184184 // Use custom reasons.
185185 v1beta2conditions .ComputeReasonFunc (v1beta2conditions .GetDefaultComputeMergeReasonFunc (
186- infrav1 .DevMachineNotReadyV1Beta2Reason ,
187- infrav1 .DevMachineReadyUnknownV1Beta2Reason ,
188- infrav1 .DevMachineReadyV1Beta2Reason ,
186+ infrav1 .DevClusterNotReadyV1Beta2Reason ,
187+ infrav1 .DevClusterReadyUnknownV1Beta2Reason ,
188+ infrav1 .DevClusterReadyV1Beta2Reason ,
189189 )),
190190 ),
191191 },
@@ -203,7 +203,7 @@ func (r *ClusterBackEndReconciler) PatchDevCluster(ctx context.Context, patchHel
203203 }},
204204 patch.WithOwnedV1Beta2Conditions {Conditions : []string {
205205 infrav1 .DevClusterReadyV1Beta2Condition ,
206- infrav1 .DockerClusterDockerLoadBalancerAvailableV1Beta2Condition ,
206+ infrav1 .DevClusterDockerLoadBalancerAvailableV1Beta2Condition ,
207207 }},
208208 )
209209}
0 commit comments