Add Status.ObservedGeneration to Nova CR

Jira: OSPRH-5919
openstack-k8s-operators · Apr 2, 2024 · 1559023 · 1559023
1 parent 6274ce7
commit 1559023
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 0 deletions.
diff --git a/api/bases/nova.openstack.org_nova.yaml b/api/bases/nova.openstack.org_nova.yaml
@@ -1727,6 +1727,12 @@ spec:
                   from nova-metadata service
                 format: int32
                 type: integer
+              observedGeneration:
+                description: 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.
+                format: int64
+                type: integer
               registeredCells:
                 additionalProperties:
                   type: string

diff --git a/api/v1beta1/nova_types.go b/api/v1beta1/nova_types.go
@@ -147,6 +147,9 @@ type NovaStatus struct {
 	// DiscoveredCells is a map keyed by cell names that have discovered all kubernetes managed
 	// computes in cell value is a hash of config from all kubernetes managed computes in cell
 	DiscoveredCells map[string]string `json:"discoveredCells,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.
+	ObservedGeneration int64 `json:"observedGeneration,omitempty"`
 }
 
 //+kubebuilder:object:root=true

diff --git a/config/crd/bases/nova.openstack.org_nova.yaml b/config/crd/bases/nova.openstack.org_nova.yaml
@@ -1727,6 +1727,12 @@ spec:
                   from nova-metadata service
                 format: int32
                 type: integer
+              observedGeneration:
+                description: 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.
+                format: int64
+                type: integer
               registeredCells:
                 additionalProperties:
                   type: string

diff --git a/controllers/nova_controller.go b/controllers/nova_controller.go
@@ -585,6 +585,7 @@ func (r *NovaReconciler) Reconcile(ctx context.Context, req ctrl.Request) (resul
 	}
 
 	Log.Info("Successfully reconciled")
+	instance.Status.ObservedGeneration = instance.Generation
 	return ctrl.Result{}, nil
 }