restore status.ObservedGeneration (#546)

Author: kerenlahav

api/common/common.go

@@ -82,6 +82,7 @@ type SAPBTPResource interface {
 	GetReady() metav1.ConditionStatus
 	GetAnnotations() map[string]string
 	SetAnnotations(map[string]string)
+	SetObservedGeneration(int64)
 }
 
 func GetObservedGeneration(obj SAPBTPResource) int64 {

api/v1/servicebinding_types.go

@@ -131,6 +131,9 @@ type ServiceBindingStatus struct {
 
 	// The subaccount id of the service binding
 	SubaccountID string `json:"subaccountID,omitempty"`
+
+	// Last generation that was acted on
+	ObservedGeneration int64 `json:"observedGeneration,omitempty"`
 }
 
 // +kubebuilder:object:root=true
@@ -196,6 +199,10 @@ func (sb *ServiceBinding) SetAnnotations(annotations map[string]string) {
 	sb.ObjectMeta.Annotations = annotations
 }
 
+func (sb *ServiceBinding) SetObservedGeneration(newObserved int64) {
+	sb.Status.ObservedGeneration = newObserved
+}
+
 // +kubebuilder:object:root=true
 
 // ServiceBindingList contains a list of ServiceBinding

api/v1/serviceinstance_types.go

@@ -127,6 +127,9 @@ type ServiceInstanceStatus struct {
 
 	// if true need to update instance
 	ForceReconcile bool `json:"forceReconcile,omitempty"`
+
+	// Last generation that was acted on
+	ObservedGeneration int64 `json:"observedGeneration,omitempty"`
 }
 
 // +kubebuilder:object:root=true
@@ -193,6 +196,10 @@ func (si *ServiceInstance) SetAnnotations(annotations map[string]string) {
 	si.ObjectMeta.Annotations = annotations
 }
 
+func (si *ServiceInstance) SetObservedGeneration(newObserved int64) {
+	si.Status.ObservedGeneration = newObserved
+}
+
 // +kubebuilder:object:root=true
 
 // ServiceInstanceList contains a list of ServiceInstance

config/crd/bases/services.cloud.sap.com_servicebindings.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: servicebindings.services.cloud.sap.com
 spec:
   group: services.cloud.sap.com
@@ -262,6 +262,10 @@ spec:
                 description: Indicates when binding secret was rotated
                 format: date-time
                 type: string
+              observedGeneration:
+                description: Last generation that was acted on
+                format: int64
+                type: integer
               operationType:
                 description: The operation type (CREATE/UPDATE/DELETE) for ongoing
                   operation
@@ -347,6 +351,7 @@ spec:
               externalName:
                 description: The name of the binding in Service Manager
                 type: string
+                maxLength: 100
               parameters:
                 description: |-
                   Parameters for the binding.

config/crd/bases/services.cloud.sap.com_serviceinstances.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: serviceinstances.services.cloud.sap.com
 spec:
   group: services.cloud.sap.com
@@ -85,6 +85,7 @@ spec:
               externalName:
                 description: The name of the instance in Service Manager
                 type: string
+                maxLength: 100
               parameters:
                 description: |-
                   Provisioning parameters for the instance.
@@ -250,6 +251,10 @@ spec:
                 description: The generated ID of the instance, will be automatically
                   filled once the instance is created
                 type: string
+              observedGeneration:
+                description: Last generation that was acted on
+                format: int64
+                type: integer
               operationType:
                 description: The operation type (CREATE/UPDATE/DELETE) for ongoing
                   operation
@@ -336,6 +341,7 @@ spec:
               externalName:
                 description: The name of the instance in Service Manager
                 type: string
+                maxLength: 100
               parameters:
                 description: |-
                   Provisioning parameters for the instance.

controllers/serviceinstance_controller.go

@@ -98,10 +98,7 @@ func (r *ServiceInstanceReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 	if isFinalState(ctx, serviceInstance) {
 		if len(serviceInstance.Status.HashedSpec) == 0 {
 			updateHashedSpecValue(serviceInstance)
-			err := r.Client.Status().Update(ctx, serviceInstance)
-			if err != nil {
-				return ctrl.Result{}, err
-			}
+			return ctrl.Result{}, utils.UpdateStatus(ctx, r.Client, serviceInstance)
 		}
 
 		return ctrl.Result{}, nil

internal/utils/controller_util.go

@@ -56,6 +56,7 @@ func RemoveFinalizer(ctx context.Context, k8sClient client.Client, object client
 func UpdateStatus(ctx context.Context, k8sClient client.Client, object common.SAPBTPResource) error {
 	log := GetLogger(ctx)
 	log.Info(fmt.Sprintf("updating %s status", object.GetObjectKind().GroupVersionKind().Kind))
+	object.SetObservedGeneration(getLastObservedGen(object))
 	return k8sClient.Status().Update(ctx, object)
 }