Skip to content

Commit afb1afe

Browse files
authored
Merge pull request #12450 from sivchari/use-v1beta1-condition
⚠️ Keep using v1beta1 condition in CAPD Docker backend
2 parents 8c385a2 + b50e39f commit afb1afe

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

test/infrastructure/docker/internal/controllers/backends/docker/dockermachine_backend.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@ func (r *MachineBackendReconciler) ReconcileNormal(ctx context.Context, cluster
133133
// In this case recover the information from the existing v1beta1 condition, because we do not know if
134134
// all commands succeeded.
135135
if !conditions.Has(dockerMachine, infrav1.DevMachineDockerContainerBootstrapExecSucceededCondition) {
136-
condition := conditions.Get(dockerMachine, infrav1.DevMachineDockerContainerBootstrapExecSucceededCondition)
137-
if condition == nil || condition.Status == metav1.ConditionTrue {
136+
condition := v1beta1conditions.Get(dockerMachine, infrav1.BootstrapExecSucceededV1Beta1Condition)
137+
if condition == nil || condition.Status == corev1.ConditionTrue {
138138
conditions.Set(dockerMachine, metav1.Condition{
139139
Type: infrav1.DevMachineDockerContainerBootstrapExecSucceededCondition,
140140
Status: metav1.ConditionTrue,

0 commit comments

Comments
 (0)