fix for issue # 119

Author: barney-s

api/v1alpha1/sandbox_types.go

@@ -119,6 +119,22 @@ type SandboxSpec struct {
 	Replicas *int32 `json:"replicas,omitempty"`
 }
 
+// SandboxPhase is a label for the condition of a sandbox at the current time.
+type SandboxPhase string
+
+const (
+	// SandboxPhasePending means the sandbox is being created.
+	SandboxPhasePending SandboxPhase = "Pending"
+	// SandboxPhaseRunning means the sandbox is ready.
+	SandboxPhaseRunning SandboxPhase = "Running"
+	// SandboxPhasePaused means the sandbox is paused.
+	SandboxPhasePaused SandboxPhase = "Paused"
+	// SandboxPhaseTerminating means the sandbox is terminating.
+	SandboxPhaseTerminating SandboxPhase = "Terminating"
+	// SandboxPhaseFailed means the sandbox has failed.
+	SandboxPhaseFailed SandboxPhase = "Failed"
+)
+
 // SandboxStatus defines the observed state of Sandbox.
 type SandboxStatus struct {
 	// FQDN that is valid for default cluster settings
@@ -132,6 +148,10 @@ type SandboxStatus struct {
 	// status conditions array
 	Conditions []metav1.Condition `json:"conditions,omitempty"`
 
+	// Phase is the current phase of the sandbox.
+	// +optional
+	Phase SandboxPhase `json:"phase,omitempty"`
+
 	// Replicas is the number of actual replicas.
 	Replicas int32 `json:"replicas"`
 

controllers/sandbox_controller.go

@@ -95,6 +95,7 @@ func (r *SandboxReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 
 	if !sandbox.ObjectMeta.DeletionTimestamp.IsZero() {
 		log.Info("Sandbox is being deleted")
+		sandbox.Status.Phase = sandboxv1alpha1.SandboxPhaseTerminating
 		return ctrl.Result{}, nil
 	}
 
@@ -126,6 +127,7 @@ func (r *SandboxReconciler) reconcileChildResources(ctx context.Context, sandbox
 	nameHash := NameHash(sandbox.Name)
 
 	var allErrors error
+	sandbox.Status.Phase = sandboxv1alpha1.SandboxPhasePending
 
 	// Reconcile PVCs
 	err := r.reconcilePVCs(ctx, sandbox)
@@ -172,6 +174,14 @@ func (r *SandboxReconciler) computeReadyCondition(sandbox *sandboxv1alpha1.Sandb
 	podReady := false
 	if pod != nil {
 		message = "Pod exists with phase: " + string(pod.Status.Phase)
+		switch pod.Status.Phase {
+		case corev1.PodRunning:
+			sandbox.Status.Phase = sandboxv1alpha1.SandboxPhaseRunning
+		case corev1.PodFailed, corev1.PodUnknown:
+			sandbox.Status.Phase = sandboxv1alpha1.SandboxPhaseFailed
+		default:
+			sandbox.Status.Phase = sandboxv1alpha1.SandboxPhasePending
+		}
 		// Check if pod Ready condition is true
 		if pod.Status.Phase == corev1.PodRunning {
 			message = "Pod is Running but not Ready"
@@ -318,7 +328,14 @@ func (r *SandboxReconciler) reconcilePod(ctx context.Context, sandbox *sandboxv1
 	if pod != nil {
 		log.Info("Found Pod", "Pod.Namespace", pod.Namespace, "Pod.Name", pod.Name)
 		// TODO - Do we enfore (change) spec if a pod exists ?
-		// r.Patch(ctx, pod, client.Apply, client.ForceOwnership, client.FieldOwner("sandbox-controller"))
+		patch := client.MergeFrom(pod.DeepCopy())
+		if err := ctrl.SetControllerReference(sandbox, pod, r.Scheme); err != nil {
+			return nil, fmt.Errorf("SetControllerReference for Pod failed: %w", err)
+		}
+		if err := r.Patch(ctx, pod, patch, client.FieldOwner(sandboxControllerFieldOwner)); err != nil {
+			log.Error(err, "Failed to patch", "Pod.Namespace", pod.Namespace, "Pod.Name", pod.Name)
+			return nil, err
+		}
 		return pod, nil
 	}
 
@@ -402,6 +419,7 @@ func (r *SandboxReconciler) reconcilePVCs(ctx context.Context, sandbox *sandboxv
 
 func (r *SandboxReconciler) handleSandboxExpiry(ctx context.Context, sandbox *sandboxv1alpha1.Sandbox) error {
 	var allErrors error
+	sandbox.Status.Phase = sandboxv1alpha1.SandboxPhaseTerminating
 	pod := &corev1.Pod{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      sandbox.Name,