Update Instance CRD for DB and Operator patching (#253)

Change-Id: Ie6fa87909cc781f5f1db6d88cda49a387749a99d
GoogleCloudPlatform · Sep 14, 2022 · 8837e32 · 8837e32
1 parent 1f4032a
commit 8837e32
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 13 deletions.
diff --git a/oracle/api/v1alpha1/instance_types.go b/oracle/api/v1alpha1/instance_types.go
@@ -256,9 +256,6 @@ type InstanceStatus struct {
 	// +kubebuilder:validation:Format=date-time
 	LastRestoreTime *metav1.Time `json:"lastRestoreTime,omitempty"`
 
-	// CurrentServiceImage stores the image name used by the database instance.
-	CurrentServiceImage string `json:"currentServiceImage,omitempty"`
-
 	// CurrentParameters stores the last successfully set instance parameters.
 	CurrentParameters map[string]string `json:"currentParameters,omitempty"`
 
@@ -283,6 +280,15 @@ type InstanceStatus struct {
 	// parameter update loop.
 	LastFailedParameterUpdate map[string]string `json:"lastFailedParameterUpdate,omitempty"`
 
+	// ActiveImages stores the stable images used by the active containers.
+	ActiveImages map[string]string `json:"ActiveImages,omitempty"`
+
+	// LastFailedImages stores the images which failed the last patching workflow..
+	LastFailedImages map[string]string `json:"LastFailedImages,omitempty"`
+
+	// CurrentActiveStateMachine stores the name of the state machine currently active.
+	CurrentActiveStateMachine string `json:"CurrentActiveStateMachine,omitempty"`
+
 	// LockedByController is a shared lock field granting exclusive access
 	// to maintenance operations to only one controller.
 	// Empty value means unlocked.

diff --git a/oracle/api/v1alpha1/zz_generated.deepcopy.go b/oracle/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/oracle/config/crd/bases/oracle.db.anthosapis.com_instances.yaml b/oracle/config/crd/bases/oracle.db.anthosapis.com_instances.yaml
@@ -549,10 +549,26 @@ spec:
           status:
             description: InstanceStatus defines the observed state of Instance.
             properties:
+              ActiveImages:
+                additionalProperties:
+                  type: string
+                description: ActiveImages stores the stable images used by the active
+                  containers.
+                type: object
+              CurrentActiveStateMachine:
+                description: CurrentActiveStateMachine stores the name of the state
+                  machine currently active.
+                type: string
               DnfsEnabled:
                 description: DnfsEnabled stores whether dNFS has already been enabled
                   or not.
                 type: boolean
+              LastFailedImages:
+                additionalProperties:
+                  type: string
+                description: LastFailedImages stores the images which failed the last
+                  patching workflow..
+                type: object
               adminUser:
                 description: AdminUser represents the observed state of the admin
                   user
@@ -742,10 +758,6 @@ spec:
                 - primaryServiceName
                 - primaryUser
                 type: object
-              currentServiceImage:
-                description: CurrentServiceImage stores the image name used by the
-                  database instance.
-                type: string
               dataGuardOutput:
                 description: DataGuardOutput stores the latest Data Guard utility
                   status output.

diff --git a/oracle/controllers/backupcontroller/backup_controller.go b/oracle/controllers/backupcontroller/backup_controller.go
@@ -264,7 +264,7 @@ func (r *BackupReconciler) reconcileBackupCreation(ctx context.Context, backup *
 		if err := r.addBackupMetadata(ctx, backup, &oracleBackupMetadata{
 			incarnation:       inst.Status.CurrentDatabaseIncarnation,
 			parentIncarnation: inst.Status.LastDatabaseIncarnation,
-			databaseImage:     inst.Spec.Images["service"],
+			databaseImage:     inst.Status.ActiveImages["service"],
 		}); err != nil {
 			return ctrl.Result{}, err
 		}

diff --git a/oracle/controllers/instancecontroller/instance_controller.go b/oracle/controllers/instancecontroller/instance_controller.go
@@ -278,7 +278,7 @@ func (r *InstanceReconciler) Reconcile(_ context.Context, req ctrl.Request) (_ c
 				r.Recorder.Eventf(&inst, corev1.EventTypeNormal, "InstanceReady", "Instance has been created successfully. Elapsed Time: %v", elapsed)
 			}
 			k8s.InstanceUpsertCondition(&inst.Status, k8s.Ready, v1.ConditionTrue, k8s.CreateComplete, "")
-			inst.Status.CurrentServiceImage = images["service"]
+			inst.Status.ActiveImages = CloneMap(sp.Images)
 			return ctrl.Result{}, nil
 		}
 	}

diff --git a/oracle/operator.yaml b/oracle/operator.yaml
@@ -2313,10 +2313,26 @@ spec:
           status:
             description: InstanceStatus defines the observed state of Instance.
             properties:
+              ActiveImages:
+                additionalProperties:
+                  type: string
+                description: ActiveImages stores the stable images used by the active
+                  containers.
+                type: object
+              CurrentActiveStateMachine:
+                description: CurrentActiveStateMachine stores the name of the state
+                  machine currently active.
+                type: string
               DnfsEnabled:
                 description: DnfsEnabled stores whether dNFS has already been enabled
                   or not.
                 type: boolean
+              LastFailedImages:
+                additionalProperties:
+                  type: string
+                description: LastFailedImages stores the images which failed the last
+                  patching workflow..
+                type: object
               adminUser:
                 description: AdminUser represents the observed state of the admin
                   user
@@ -2506,10 +2522,6 @@ spec:
                 - primaryServiceName
                 - primaryUser
                 type: object
-              currentServiceImage:
-                description: CurrentServiceImage stores the image name used by the
-                  database instance.
-                type: string
               dataGuardOutput:
                 description: DataGuardOutput stores the latest Data Guard utility
                   status output.