Merge pull request #5434 from fabriziopandini/capd-show-missing-container

🌱 CAPD detects missing container

Author: k8s-ci-robot

controllers/machine_controller.go

@@ -206,7 +206,7 @@ func patchMachine(ctx context.Context, patchHelper *patch.Helper, machine *clust
 			clusterv1.MachineHealthCheckSuccededCondition,
 			clusterv1.MachineOwnerRemediatedCondition,
 		),
-		conditions.WithStepCounterIf(machine.ObjectMeta.DeletionTimestamp.IsZero()),
+		conditions.WithStepCounterIf(machine.ObjectMeta.DeletionTimestamp.IsZero() && machine.Spec.ProviderID == nil),
 		conditions.WithStepCounterIfOnly(
 			clusterv1.BootstrapReadyCondition,
 			clusterv1.InfrastructureReadyCondition,

test/infrastructure/docker/api/v1beta1/condition_consts.go

@@ -42,6 +42,10 @@ const (
 	// an error while provisioning the container that provides the DockerMachine infrastructure; those kind of
 	// errors are usually transient and failed provisioning are automatically re-tried by the controller.
 	ContainerProvisioningFailedReason = "ContainerProvisioningFailed"
+
+	// ContainerDeletedReason (Severity=Error) documents a DockerMachine controller detecting
+	// the underlying container has been deleted unexpectedly.
+	ContainerDeletedReason = "ContainerDeleted"
 )
 
 const (

test/infrastructure/docker/controllers/dockermachine_controller.go

@@ -169,7 +169,7 @@ func patchDockerMachine(ctx context.Context, patchHelper *patch.Helper, dockerMa
 			infrav1.ContainerProvisionedCondition,
 			infrav1.BootstrapExecSucceededCondition,
 		),
-		conditions.WithStepCounterIf(dockerMachine.ObjectMeta.DeletionTimestamp.IsZero()),
+		conditions.WithStepCounterIf(dockerMachine.ObjectMeta.DeletionTimestamp.IsZero() && dockerMachine.Spec.ProviderID == nil),
 	)
 
 	// Patch the object, ignoring conflicts on the conditions owned by this controller.
@@ -192,7 +192,12 @@ func (r *DockerMachineReconciler) reconcileNormal(ctx context.Context, cluster *
 		// ensure ready state is set.
 		// This is required after move, because status is not moved to the target cluster.
 		dockerMachine.Status.Ready = true
-		conditions.MarkTrue(dockerMachine, infrav1.ContainerProvisionedCondition)
+
+		if externalMachine.Exists() {
+			conditions.MarkTrue(dockerMachine, infrav1.ContainerProvisionedCondition)
+		} else {
+			conditions.MarkFalse(dockerMachine, infrav1.ContainerProvisionedCondition, infrav1.ContainerDeletedReason, clusterv1.ConditionSeverityError, fmt.Sprintf("Container %s does not exists anymore", externalMachine.Name()))
+		}
 		return ctrl.Result{}, nil
 	}