Merge pull request #464 from openshift-cherrypick-robot/cherry-pick-4…

…62-to-release-4.16

Bug 2304074:[release-4.16] controllers: delete the webhook created by the ocs-client-operator

bundle/manifests/odf-operator.clusterserviceversion.yaml

@@ -158,6 +158,12 @@ spec:
           - patch
           - update
           - watch
+        - apiGroups:
+          - admissionregistration.k8s.io
+          resources:
+          - validatingwebhookconfigurations
+          verbs:
+          - delete
         - apiGroups:
           - apiextensions.k8s.io
           resources:

config/rbac/role.yaml

@@ -16,6 +16,12 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - admissionregistration.k8s.io
+  resources:
+  - validatingwebhookconfigurations
+  verbs:
+  - delete
 - apiGroups:
   - apiextensions.k8s.io
   resources:

controllers/storagesystem_controller.go

@@ -63,6 +63,7 @@ type StorageSystemReconciler struct {
 //+kubebuilder:rbac:groups=operators.coreos.com,resources=subscriptions/finalizers,verbs=update
 //+kubebuilder:rbac:groups=console.openshift.io,resources=consolequickstarts,verbs=get;list;create;update;delete
 //+kubebuilder:rbac:groups=apiextensions.k8s.io,resources=customresourcedefinitions,verbs=get;list;watch;create;update
+//+kubebuilder:rbac:groups=admissionregistration.k8s.io,resources=validatingwebhookconfigurations,verbs=delete
 
 // For more details, check Reconcile and its Result here:
 // - https://pkg.go.dev/sigs.k8s.io/[email protected]/pkg/reconcile

controllers/subscriptions.go

@@ -24,6 +24,7 @@ import (
 	"strings"
 
 	"go.uber.org/multierr"
+	admv1 "k8s.io/api/admissionregistration/v1"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
@@ -354,6 +355,16 @@ func EnsureVendorCsv(cli client.Client, csvName string) (*operatorv1alpha1.Clust
 			for i := range csvObj.Spec.InstallStrategy.StrategySpec.DeploymentSpecs {
 				csvObj.Spec.InstallStrategy.StrategySpec.DeploymentSpecs[i].Spec.Replicas = &replicas
 			}
+
+			if replicas == 0 {
+				// delete the subscription webhook created by the ocs-client-operator
+				// we can not delete the webhook by the ocs-client-operator itself because the client operator is down
+				webhook := &admv1.ValidatingWebhookConfiguration{}
+				webhook.Name = "subscription.ocs.openshift.io"
+				if err = cli.Delete(context.TODO(), webhook); err != nil && !errors.IsNotFound(err) {
+					return err
+				}
+			}
 		}
 
 		return SetOdfSubControllerReference(cli, csvObj)