@@ -37,7 +37,6 @@ import (
37
37
clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1" //nolint:staticcheck
38
38
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
39
39
clusterv1util "sigs.k8s.io/cluster-api/util"
40
- "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/conditions"
41
40
v1beta1conditions "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/conditions" //nolint:staticcheck
42
41
v1beta2conditions "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/conditions/v1beta2"
43
42
v1beta1patch "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/patch"
@@ -350,15 +349,15 @@ func patchIBMPowerVSImage(ctx context.Context, patchHelper *v1beta1patch.Helper,
350
349
}
351
350
352
351
// always update the readyCondition.
353
- conditions .SetSummary (ibmPowerVSImage ,
354
- conditions .WithConditions (
355
- infrav1 .ImageReadyCondition ,
352
+ v1beta1conditions .SetSummary (ibmPowerVSImage ,
353
+ v1beta1conditions .WithConditions (
354
+ infrav1 .InstanceReadyCondition ,
356
355
),
357
356
)
358
357
359
358
if err := v1beta2conditions .SetSummaryCondition (ibmPowerVSImage , ibmPowerVSImage , infrav1 .IBMPowerVSImageReadyV1Beta2Condition ,
360
359
v1beta2conditions.ForConditionTypes {
361
- infrav1 .IBMPowerVSImageReadyV1Beta2Condition ,
360
+ infrav1 .IBMPowerVSMachineInstanceReadyV1Beta2Condition ,
362
361
},
363
362
// Using a custom merge strategy to override reasons applied during merge.
364
363
v1beta2conditions.CustomMergeStrategy {
0 commit comments