fix: set status.phase for Plan

dkoshkin · Sep 22, 2023 · 202d354 · 202d354
1 parent 46eeb5c
commit 202d354
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 0 deletions.
diff --git a/api/v1alpha1/plan_phase_types.go b/api/v1alpha1/plan_phase_types.go
@@ -0,0 +1,14 @@
+// Copyright 2023 Dimitri Koshkin. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package v1alpha1
+
+type PlanPhase string
+
+const (
+	// PlanPhaseNoSuitableMachineImage is the phase when there is no suitable machine image.
+	PlanPhaseNoSuitableMachineImage = PlanPhase("NoSuitableMachineImage")
+
+	// PlanPhaseFoundMachineImage is the phase when a suitable machine image has been found.
+	PlanPhaseFoundMachineImage = PlanPhase("FoundMachineImage")
+)
diff --git a/api/v1alpha1/plan_types.go b/api/v1alpha1/plan_types.go
@@ -49,6 +49,11 @@ type PlanStatus struct {
 	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
 
+	// Phase represents the current phase of image building
+	// E.g. NoSuitableMachineImage, FoundMachineImage.
+	// +optional
+	Phase PlanPhase `json:"phase,omitempty"`
+
 	// MachineImageDetails holds the details for a MachineImage with the highest version within the range.
 	MachineImageDetails *MachineImageDetails `json:"machineImageDetails"`
 
@@ -69,6 +74,7 @@ type MachineImageDetails struct {
 //+kubebuilder:resource:categories=kubernetes-upgrader
 //+kubebuilder:printcolumn:name="Version Range",type="string",JSONPath=`.spec.versionRange`
 //+kubebuilder:printcolumn:name="Latest Version",type="string",JSONPath=`.status.machineImageDetails.version`
+//+kubebuilder:printcolumn:name="Phase",type="string",JSONPath=`.status.phase`
 
 // Plan is the Schema for the plans API.
 type Plan struct {

diff --git a/config/crd/bases/kubernetesupgraded.dimitrikoshkin.com_plans.yaml b/config/crd/bases/kubernetesupgraded.dimitrikoshkin.com_plans.yaml
@@ -23,6 +23,9 @@ spec:
     - jsonPath: .status.machineImageDetails.version
       name: Latest Version
       type: string
+    - jsonPath: .status.phase
+      name: Phase
+      type: string
     name: v1alpha1
     schema:
       openAPIV3Schema:
@@ -154,6 +157,10 @@ spec:
                     type: string
                 type: object
                 x-kubernetes-map-type: atomic
+              phase:
+                description: Phase represents the current phase of image building
+                  E.g. NoSuitableMachineImage, FoundMachineImage.
+                type: string
             required:
             - machineImageDetails
             - machineImageRef

diff --git a/internal/controller/plan_controller.go b/internal/controller/plan_controller.go
@@ -132,6 +132,7 @@ func (r *PlanReconciler) reconcileNormal(
 			"LatestVersionNotFound",
 			"Did not find a suitable MachineImage, requeueing",
 		)
+		plan.Status.Phase = kubernetesupgraderv1.PlanPhaseNoSuitableMachineImage
 		return ctrl.Result{RequeueAfter: planRequeueDelay}, nil
 	}
 
@@ -142,6 +143,7 @@ func (r *PlanReconciler) reconcileNormal(
 	}
 	// Update the Plan status with the latest MachineImage.
 	plan.Status.MachineImageRef = latestVersion.GetObjectReference()
+	plan.Status.Phase = kubernetesupgraderv1.PlanPhaseFoundMachineImage
 
 	return ctrl.Result{}, nil
 }