Merge pull request #2274 from fabriziopandini/capd-reconcile-status-ready-after-move

k8s-ci-robot · web-flow · commit 4b7ca5aa580c · 2020-02-06T01:25:34.000-08:00
🐛capd: reconcile status ready after move
diff --git a/test/infrastructure/docker/controllers/dockermachine_controller.go b/test/infrastructure/docker/controllers/dockermachine_controller.go
@@ -158,6 +158,9 @@ func (r *DockerMachineReconciler) reconcileNormal(ctx context.Context, machine *
 
 	// if the machine is already provisioned, return
 	if dockerMachine.Spec.ProviderID != nil {
+		// ensure ready state is set.
+		// This is required after move, bacuse status is not moved to the target cluster.
+		dockerMachine.Status.Ready = true
 		return ctrl.Result{}, nil
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -158,6 +158,9 @@ func (r DockerMachineReconciler) reconcileNormal(ctx context.Context, machine `
`158`	`158`
`159`	`159`	`// if the machine is already provisioned, return`
`160`	`160`	`if dockerMachine.Spec.ProviderID != nil {`
	`161`	`+ // ensure ready state is set.`
	`162`	`+ // This is required after move, bacuse status is not moved to the target cluster.`
	`163`	`+ dockerMachine.Status.Ready = true`
`161`	`164`	`return ctrl.Result{}, nil`
`162`	`165`	`}`
`163`	`166`