Skip to content

Commit 322a3dc

Browse files
committed
fix conditions
1 parent 1be332d commit 322a3dc

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

controllers/ibmpowervsimage_controller.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ import (
3737
clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1" //nolint:staticcheck
3838
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
3939
clusterv1util "sigs.k8s.io/cluster-api/util"
40-
"sigs.k8s.io/cluster-api/util/deprecated/v1beta1/conditions"
4140
v1beta1conditions "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/conditions" //nolint:staticcheck
4241
v1beta2conditions "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/conditions/v1beta2"
4342
v1beta1patch "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/patch"
@@ -350,15 +349,15 @@ func patchIBMPowerVSImage(ctx context.Context, patchHelper *v1beta1patch.Helper,
350349
}
351350

352351
// always update the readyCondition.
353-
conditions.SetSummary(ibmPowerVSImage,
354-
conditions.WithConditions(
355-
infrav1.ImageReadyCondition,
352+
v1beta1conditions.SetSummary(ibmPowerVSImage,
353+
v1beta1conditions.WithConditions(
354+
infrav1.InstanceReadyCondition,
356355
),
357356
)
358357

359358
if err := v1beta2conditions.SetSummaryCondition(ibmPowerVSImage, ibmPowerVSImage, infrav1.IBMPowerVSImageReadyV1Beta2Condition,
360359
v1beta2conditions.ForConditionTypes{
361-
infrav1.IBMPowerVSImageReadyV1Beta2Condition,
360+
infrav1.IBMPowerVSMachineInstanceReadyV1Beta2Condition,
362361
},
363362
// Using a custom merge strategy to override reasons applied during merge.
364363
v1beta2conditions.CustomMergeStrategy{

0 commit comments

Comments
 (0)