@@ -219,7 +219,7 @@ func (r *IBMPowerVSClusterReconciler) reconcile(ctx context.Context, clusterScop
219219 // reconcile Transit Gateway
220220 log .Info ("Reconciling transit gateway" )
221221 if requeue , err := clusterScope .ReconcileTransitGateway (ctx ); err != nil {
222- deprecatedv1beta1conditions .MarkFalse (powerVSCluster .cluster , infrav1 .TransitGatewayReadyCondition , infrav1 .TransitGatewayReconciliationFailedReason , clusterv1 .ConditionSeverityError , "%s" , err .Error ())
222+ deprecatedv1beta1conditions .MarkFalse (powerVSCluster .cluster , infrav1 .TransitGatewayReadyV1Beta2Condition , infrav1 .TransitGatewayReconciliationFailedV1Beta2Reason , clusterv1 .ConditionSeverityError , "%s" , err .Error ())
223223 conditions .Set (powerVSCluster .cluster , metav1.Condition {
224224 Type : infrav1 .TransitGatewayReadyCondition ,
225225 Status : metav1 .ConditionFalse ,
@@ -231,7 +231,7 @@ func (r *IBMPowerVSClusterReconciler) reconcile(ctx context.Context, clusterScop
231231 log .Info ("Creating a transit gateway is pending, requeuing" )
232232 return reconcile.Result {RequeueAfter : 1 * time .Minute }, nil
233233 }
234- deprecatedv1beta1conditions .MarkTrue (powerVSCluster .cluster , infrav1 .TransitGatewayReadyCondition )
234+ deprecatedv1beta1conditions .MarkTrue (powerVSCluster .cluster , infrav1 .TransitGatewayReadyV1Beta2Condition )
235235 conditions .Set (powerVSCluster .cluster , metav1.Condition {
236236 Type : infrav1 .TransitGatewayReadyCondition ,
237237 Status : metav1 .ConditionTrue ,
@@ -242,7 +242,7 @@ func (r *IBMPowerVSClusterReconciler) reconcile(ctx context.Context, clusterScop
242242 if clusterScope .IBMPowerVSCluster .Spec .Ignition != nil {
243243 log .Info ("Reconciling COS service instance" )
244244 if err := clusterScope .ReconcileCOSInstance (ctx ); err != nil {
245- deprecatedv1beta1conditions .MarkFalse (powerVSCluster .cluster , infrav1 .COSInstanceReadyCondition , infrav1 .COSInstanceReconciliationFailedReason , clusterv1 .ConditionSeverityError , "%s" , err .Error ())
245+ deprecatedv1beta1conditions .MarkFalse (powerVSCluster .cluster , infrav1 .COSInstanceReadyV1Beta2Condition , infrav1 .COSInstanceReconciliationFailedV1Beta2Reason , clusterv1 .ConditionSeverityError , "%s" , err .Error ())
246246 conditions .Set (powerVSCluster .cluster , metav1.Condition {
247247 Type : infrav1 .COSInstanceReadyCondition ,
248248 Status : metav1 .ConditionFalse ,
@@ -251,7 +251,7 @@ func (r *IBMPowerVSClusterReconciler) reconcile(ctx context.Context, clusterScop
251251 })
252252 return reconcile.Result {}, fmt .Errorf ("failed to reconcile COS instance: %w" , err )
253253 }
254- deprecatedv1beta1conditions .MarkTrue (powerVSCluster .cluster , infrav1 .COSInstanceReadyCondition )
254+ deprecatedv1beta1conditions .MarkTrue (powerVSCluster .cluster , infrav1 .COSInstanceReadyV1Beta2Condition )
255255 conditions .Set (powerVSCluster .cluster , metav1.Condition {
256256 Type : infrav1 .COSInstanceReadyCondition ,
257257 Status : metav1 .ConditionTrue ,
@@ -305,8 +305,8 @@ func (r *IBMPowerVSClusterReconciler) reconcilePowerVSResources(ctx context.Cont
305305 if requeue , err := clusterScope .ReconcilePowerVSServiceInstance (ctx ); err != nil {
306306 powerVSCluster .updateCondition (clusterv1.Condition {
307307 Status : corev1 .ConditionFalse ,
308- Type : infrav1 .ServiceInstanceReadyCondition ,
309- Reason : infrav1 .ServiceInstanceReconciliationFailedReason ,
308+ Type : infrav1 .ServiceInstanceReadyV1Beta2Condition ,
309+ Reason : infrav1 .ServiceInstanceReconciliationFailedV1Beta2Reason ,
310310 Severity : clusterv1 .ConditionSeverityError ,
311311 Message : err .Error (),
312312 })
@@ -326,7 +326,7 @@ func (r *IBMPowerVSClusterReconciler) reconcilePowerVSResources(ctx context.Cont
326326 }
327327 powerVSCluster .updateCondition (clusterv1.Condition {
328328 Status : corev1 .ConditionTrue ,
329- Type : infrav1 .ServiceInstanceReadyCondition ,
329+ Type : infrav1 .ServiceInstanceReadyV1Beta2Condition ,
330330 })
331331 conditions .Set (powerVSCluster .cluster , metav1.Condition {
332332 Type : infrav1 .WorkspaceReadyCondition ,
@@ -341,8 +341,8 @@ func (r *IBMPowerVSClusterReconciler) reconcilePowerVSResources(ctx context.Cont
341341 if networkActive , err := clusterScope .ReconcileNetwork (ctx ); err != nil {
342342 powerVSCluster .updateCondition (clusterv1.Condition {
343343 Status : corev1 .ConditionFalse ,
344- Type : infrav1 .NetworkReadyCondition ,
345- Reason : infrav1 .NetworkReconciliationFailedReason ,
344+ Type : infrav1 .NetworkReadyV1Beta2Condition ,
345+ Reason : infrav1 .NetworkReconciliationFailedV1Beta2Reason ,
346346 Severity : clusterv1 .ConditionSeverityError ,
347347 Message : err .Error (),
348348 })
@@ -357,7 +357,7 @@ func (r *IBMPowerVSClusterReconciler) reconcilePowerVSResources(ctx context.Cont
357357 } else if networkActive {
358358 powerVSCluster .updateCondition (clusterv1.Condition {
359359 Status : corev1 .ConditionTrue ,
360- Type : infrav1 .NetworkReadyCondition ,
360+ Type : infrav1 .NetworkReadyV1Beta2Condition ,
361361 })
362362 conditions .Set (powerVSCluster .cluster , metav1.Condition {
363363 Type : infrav1 .NetworkReadyCondition ,
@@ -382,8 +382,8 @@ func (r *IBMPowerVSClusterReconciler) reconcileVPCResources(ctx context.Context,
382382 if requeue , err := clusterScope .ReconcileVPC (ctx ); err != nil {
383383 powerVSCluster .updateCondition (clusterv1.Condition {
384384 Status : corev1 .ConditionFalse ,
385- Type : infrav1 .VPCReadyCondition ,
386- Reason : infrav1 .VPCReconciliationFailedReason ,
385+ Type : infrav1 .VPCReadyV1Beta2Condition ,
386+ Reason : infrav1 .VPCReconciliationFailedV1Beta2Reason ,
387387 Severity : clusterv1 .ConditionSeverityError ,
388388 Message : err .Error (),
389389 })
@@ -402,7 +402,7 @@ func (r *IBMPowerVSClusterReconciler) reconcileVPCResources(ctx context.Context,
402402 }
403403 powerVSCluster .updateCondition (clusterv1.Condition {
404404 Status : corev1 .ConditionTrue ,
405- Type : infrav1 .VPCReadyCondition ,
405+ Type : infrav1 .VPCReadyV1Beta2Condition ,
406406 })
407407 conditions .Set (powerVSCluster .cluster , metav1.Condition {
408408 Type : infrav1 .VPCReadyCondition ,
@@ -415,8 +415,8 @@ func (r *IBMPowerVSClusterReconciler) reconcileVPCResources(ctx context.Context,
415415 if requeue , err := clusterScope .ReconcileVPCSubnets (ctx ); err != nil {
416416 powerVSCluster .updateCondition (clusterv1.Condition {
417417 Status : corev1 .ConditionFalse ,
418- Type : infrav1 .VPCSubnetReadyCondition ,
419- Reason : infrav1 .VPCSubnetReconciliationFailedReason ,
418+ Type : infrav1 .VPCSubnetReadyV1Beta2Condition ,
419+ Reason : infrav1 .VPCSubnetReconciliationFailedV1Beta2Reason ,
420420 Severity : clusterv1 .ConditionSeverityError ,
421421 Message : err .Error (),
422422 })
@@ -435,7 +435,7 @@ func (r *IBMPowerVSClusterReconciler) reconcileVPCResources(ctx context.Context,
435435 }
436436 powerVSCluster .updateCondition (clusterv1.Condition {
437437 Status : corev1 .ConditionTrue ,
438- Type : infrav1 .VPCSubnetReadyCondition ,
438+ Type : infrav1 .VPCSubnetReadyV1Beta2Condition ,
439439 })
440440 conditions .Set (powerVSCluster .cluster , metav1.Condition {
441441 Type : infrav1 .VPCSubnetReadyCondition ,
@@ -448,23 +448,23 @@ func (r *IBMPowerVSClusterReconciler) reconcileVPCResources(ctx context.Context,
448448 if err := clusterScope .ReconcileVPCSecurityGroups (ctx ); err != nil {
449449 powerVSCluster .updateCondition (clusterv1.Condition {
450450 Status : corev1 .ConditionFalse ,
451- Type : infrav1 .VPCSecurityGroupReadyCondition ,
452- Reason : infrav1 .VPCSecurityGroupReconciliationFailedReason ,
451+ Type : infrav1 .VPCSecurityGroupReadyV1Beta2Condition ,
452+ Reason : infrav1 .VPCSecurityGroupReconciliationFailedV1Beta2Reason ,
453453 Severity : clusterv1 .ConditionSeverityError ,
454454 Message : err .Error (),
455455 })
456456 conditions .Set (powerVSCluster .cluster , metav1.Condition {
457457 Type : infrav1 .VPCSecurityGroupReadyCondition ,
458458 Status : metav1 .ConditionFalse ,
459- Reason : infrav1 .VPCSecurityGroupReadyCondition ,
459+ Reason : infrav1 .VPCSecurityGroupReconciliationFailedReason ,
460460 Message : err .Error (),
461461 })
462462 ch <- reconcileResult {reconcile.Result {}, fmt .Errorf ("failed to reconcile VPC security groups: %w" , err )}
463463 return
464464 }
465465 powerVSCluster .updateCondition (clusterv1.Condition {
466466 Status : corev1 .ConditionTrue ,
467- Type : infrav1 .VPCSecurityGroupReadyCondition ,
467+ Type : infrav1 .VPCSecurityGroupReadyV1Beta2Condition ,
468468 })
469469 conditions .Set (powerVSCluster .cluster , metav1.Condition {
470470 Type : infrav1 .VPCSecurityGroupReadyCondition ,
@@ -477,8 +477,8 @@ func (r *IBMPowerVSClusterReconciler) reconcileVPCResources(ctx context.Context,
477477 if loadBalancerReady , err := clusterScope .ReconcileLoadBalancers (ctx ); err != nil {
478478 powerVSCluster .updateCondition (clusterv1.Condition {
479479 Status : corev1 .ConditionFalse ,
480- Type : infrav1 .LoadBalancerReadyCondition ,
481- Reason : infrav1 .LoadBalancerReconciliationFailedReason ,
480+ Type : infrav1 .LoadBalancerReadyV1Beta2Condition ,
481+ Reason : infrav1 .LoadBalancerReconciliationFailedV1Beta2Reason ,
482482 Severity : clusterv1 .ConditionSeverityError ,
483483 Message : err .Error (),
484484 })
@@ -493,7 +493,7 @@ func (r *IBMPowerVSClusterReconciler) reconcileVPCResources(ctx context.Context,
493493 } else if loadBalancerReady {
494494 powerVSCluster .updateCondition (clusterv1.Condition {
495495 Status : corev1 .ConditionTrue ,
496- Type : infrav1 .LoadBalancerReadyCondition ,
496+ Type : infrav1 .LoadBalancerReadyV1Beta2Condition ,
497497 })
498498 conditions .Set (powerVSCluster .cluster , metav1.Condition {
499499 Type : infrav1 .VPCLoadBalancerReadyCondition ,
0 commit comments