Merge pull request #259 from fmount/observed_generation

Add Status.ObservedGeneration to Manila CR
openstack-k8s-operators · Mar 27, 2024 · 1b212e9 · 1b212e9
2 parents ad5d5fa + 256b9c4
commit 1b212e9
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 0 deletions.
diff --git a/api/bases/manila.openstack.org_manilas.yaml b/api/bases/manila.openstack.org_manilas.yaml
@@ -1137,6 +1137,9 @@ spec:
                   format: int32
                   type: integer
                 type: object
+              observedGeneration:
+                format: int64
+                type: integer
               transportURLSecret:
                 type: string
             type: object

diff --git a/api/v1beta1/manila_types.go b/api/v1beta1/manila_types.go
@@ -139,6 +139,12 @@ type ManilaStatus struct {
 
 	// ReadyCounts of Manila Share instances
 	ManilaSharesReadyCounts map[string]int32 `json:"manilaSharesReadyCounts,omitempty"`
+
+	// ObservedGeneration - the most recent generation observed for this
+	// service. If the observed generation is less than the spec generation,
+	// then the controller has not processed the latest changes injected by
+	// the opentack-operator in the top-level CR (e.g. the ContainerImage)
+	ObservedGeneration int64 `json:"observedGeneration,omitempty"`
 }
 
 //+kubebuilder:object:root=true

diff --git a/config/crd/bases/manila.openstack.org_manilas.yaml b/config/crd/bases/manila.openstack.org_manilas.yaml
@@ -1137,6 +1137,9 @@ spec:
                   format: int32
                   type: integer
                 type: object
+              observedGeneration:
+                format: int64
+                type: integer
               transportURLSecret:
                 type: string
             type: object

diff --git a/controllers/manila_controller.go b/controllers/manila_controller.go
@@ -780,6 +780,7 @@ func (r *ManilaReconciler) reconcileNormal(ctx context.Context, instance *manila
 
 	r.Log.Info(fmt.Sprintf("Reconciled Service '%s' successfully", instance.Name))
 	// update the overall status condition if service is ready
+	instance.Status.ObservedGeneration = instance.Generation
 	if instance.IsReady() {
 		instance.Status.Conditions.MarkTrue(condition.ReadyCondition, condition.ReadyMessage)
 	}