add finalizers in controller (#142)

SAP · Mar 10, 2022 · 4485049 · 4485049
1 parent 1f4c159
commit 4485049
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 18 deletions.
diff --git a/api/v1/webhooks/servicebinding_mutating_webhook.go b/api/v1/webhooks/servicebinding_mutating_webhook.go
@@ -3,13 +3,10 @@ package webhooks
 import (
 	"context"
 	"encoding/json"
-	"fmt"
 	"net/http"
 
 	"github.com/SAP/sap-btp-service-operator/api"
 
-	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
-
 	servicesv1 "github.com/SAP/sap-btp-service-operator/api/v1"
 	v1admission "k8s.io/api/admission/v1"
 	v1 "k8s.io/api/authentication/v1"
@@ -33,11 +30,6 @@ func (s *ServiceBindingDefaulter) Handle(_ context.Context, req admission.Reques
 		return admission.Errored(http.StatusBadRequest, err)
 	}
 
-	if binding.DeletionTimestamp.IsZero() && !controllerutil.ContainsFinalizer(binding, api.FinalizerName) {
-		controllerutil.AddFinalizer(binding, api.FinalizerName)
-		bindinglog.Info(fmt.Sprintf("added finalizer '%s' to service binding", api.FinalizerName))
-	}
-
 	// mutate the fields
 	if len(binding.Spec.ExternalName) == 0 {
 		bindinglog.Info("externalName not provided, defaulting to k8s name", "name", binding.Name)

diff --git a/api/v1/webhooks/serviceinstance_mutating_webhook.go b/api/v1/webhooks/serviceinstance_mutating_webhook.go
@@ -3,17 +3,12 @@ package webhooks
 import (
 	"context"
 	"encoding/json"
-	"fmt"
 	"net/http"
 	"reflect"
 
-	"github.com/SAP/sap-btp-service-operator/api"
-
 	v1admission "k8s.io/api/admission/v1"
 	v1 "k8s.io/api/authentication/v1"
 
-	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
-
 	servicesv1 "github.com/SAP/sap-btp-service-operator/api/v1"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
@@ -35,11 +30,6 @@ func (s *ServiceInstanceDefaulter) Handle(_ context.Context, req admission.Reque
 		return admission.Errored(http.StatusBadRequest, err)
 	}
 
-	if instance.DeletionTimestamp.IsZero() && !controllerutil.ContainsFinalizer(instance, api.FinalizerName) {
-		controllerutil.AddFinalizer(instance, api.FinalizerName)
-		instancelog.Info(fmt.Sprintf("added finalizer '%s' to service instance", api.FinalizerName))
-	}
-
 	// mutate the fields
 	if len(instance.Spec.ExternalName) == 0 {
 		instancelog.Info("externalName not provided, defaulting to k8s name", "name", instance.Name)

diff --git a/controllers/servicebinding_controller.go b/controllers/servicebinding_controller.go
@@ -95,6 +95,14 @@ func (r *ServiceBindingReconciler) Reconcile(ctx context.Context, req ctrl.Reque
 		return r.delete(ctx, smClient, serviceBinding)
 	}
 
+	if !controllerutil.ContainsFinalizer(serviceBinding, api.FinalizerName) {
+		controllerutil.AddFinalizer(serviceBinding, api.FinalizerName)
+		log.Info(fmt.Sprintf("added finalizer '%s' to service binding", api.FinalizerName))
+		if err := r.Update(ctx, serviceBinding); err != nil {
+			return ctrl.Result{}, err
+		}
+	}
+
 	if serviceBinding.Status.Ready == metav1.ConditionTrue {
 		if r.isStaleServiceBinding(serviceBinding) {
 			return ctrl.Result{}, r.Delete(ctx, serviceBinding)

diff --git a/controllers/serviceinstance_controller.go b/controllers/serviceinstance_controller.go
@@ -85,6 +85,14 @@ func (r *ServiceInstanceReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 		return r.deleteInstance(ctx, smClient, serviceInstance)
 	}
 
+	if !controllerutil.ContainsFinalizer(serviceInstance, api.FinalizerName) {
+		controllerutil.AddFinalizer(serviceInstance, api.FinalizerName)
+		log.Info(fmt.Sprintf("added finalizer '%s' to service instance", api.FinalizerName))
+		if err := r.Update(ctx, serviceInstance); err != nil {
+			return ctrl.Result{}, err
+		}
+	}
+
 	if serviceInstance.Generation == serviceInstance.Status.ObservedGeneration && !isInProgress(serviceInstance) {
 		log.Info(fmt.Sprintf("Spec is not changed - ignoring... Generation is - %v", serviceInstance.Generation))
 		return ctrl.Result{}, nil