remove the init container that decides the allowing of reconciliation of manager

Dockerfile

@@ -28,7 +28,6 @@ FROM registry.access.redhat.com/ubi9/ubi-minimal
 WORKDIR /
 COPY --from=builder /workspace/bin/manager .
 COPY --from=builder /workspace/bin/status-reporter .
-COPY --from=builder /workspace/bin/deployment-guard .
 COPY --from=builder /workspace/hack/entrypoint.sh entrypoint
 USER 65532:65532
 

Makefile

@@ -93,11 +93,9 @@ uninstall: manifests kustomize ## Uninstall CRDs from the K8s cluster specified
 	$(KUSTOMIZE) build config/crd | kubectl delete -f -
 
 deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config.
-	cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG} && \
-		$(KUSTOMIZE) edit set image deployment-guard=$(IMG)
+	cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
 	cd config/default && $(KUSTOMIZE) edit set image kube-rbac-proxy=$(RBAC_PROXY_IMG)
-	cd config/console && $(KUSTOMIZE) edit set image ocs-client-operator-console=$(OCS_CLIENT_CONSOLE_IMG) && \
-		$(KUSTOMIZE) edit set image deployment-guard=$(IMG)
+	cd config/console && $(KUSTOMIZE) edit set image ocs-client-operator-console=$(OCS_CLIENT_CONSOLE_IMG)
 	$(KUSTOMIZE) build config/default | sed "s|STATUS_REPORTER_IMAGE_VALUE|$(IMG)|g" | awk '{print}' | kubectl apply -f -
 
 remove: ## Remove controller from the K8s cluster specified in ~/.kube/config.
@@ -114,10 +112,8 @@ remove-with-olm: ## Remove controller from the K8s cluster
 bundle: manifests kustomize operator-sdk yq ## Generate bundle manifests and metadata, then validate generated files.
 	rm -rf ./bundle
 	$(OPERATOR_SDK) generate kustomize manifests -q
-	cd config/manager && $(KUSTOMIZE) edit set image controller=$(IMG) && \
-		$(KUSTOMIZE) edit set image deployment-guard=$(IMG)
+	cd config/manager && $(KUSTOMIZE) edit set image controller=$(IMG)
 	cd config/console && $(KUSTOMIZE) edit set image ocs-client-operator-console=$(OCS_CLIENT_CONSOLE_IMG) && \
-		$(KUSTOMIZE) edit set image deployment-guard=$(IMG) && \
 		$(KUSTOMIZE) edit set nameprefix $(OPERATOR_NAMEPREFIX)
 	cd config/default && \
 		$(KUSTOMIZE) edit set image kube-rbac-proxy=$(RBAC_PROXY_IMG) && \

bundle/manifests/ocs-client-operator.clusterserviceversion.yaml

@@ -7,7 +7,7 @@ metadata:
     categories: Storage
     console.openshift.io/plugins: '["odf-client-console"]'
     containerImage: quay.io/ocs-dev/ocs-client-operator:latest
-    createdAt: "2024-11-27T03:54:42Z"
+    createdAt: "2025-02-06T12:49:53Z"
     description: OpenShift Data Foundation client operator enables consumption of
       storage services from a remote centralized OpenShift Data Foundation provider
       cluster.
@@ -308,13 +308,6 @@ spec:
           - get
           - patch
           - update
-        - apiGroups:
-          - ocs.openshift.io
-          resources:
-          - storageclusters
-          verbs:
-          - get
-          - list
         - apiGroups:
           - operators.coreos.com
           resources:
@@ -545,17 +538,6 @@ spec:
                 volumeMounts:
                 - mountPath: /etc/tls/private
                   name: webhook-cert-secret
-              initContainers:
-              - command:
-                - /deployment-guard
-                env:
-                - name: OPERATOR_NAMESPACE
-                  valueFrom:
-                    fieldRef:
-                      fieldPath: metadata.namespace
-                image: quay.io/ocs-dev/ocs-client-operator:latest
-                name: deployment-guard
-                resources: {}
               securityContext:
                 runAsNonRoot: true
               serviceAccountName: ocs-client-operator-controller-manager
@@ -618,17 +600,6 @@ spec:
                   name: ocs-client-operator-console-nginx-log
                 - mountPath: /var/lib/nginx/tmp
                   name: ocs-client-operator-console-nginx-tmp
-              initContainers:
-              - command:
-                - /deployment-guard
-                env:
-                - name: OPERATOR_NAMESPACE
-                  valueFrom:
-                    fieldRef:
-                      fieldPath: metadata.namespace
-                image: quay.io/ocs-dev/ocs-client-operator:latest
-                name: deployment-guard
-                resources: {}
               securityContext:
                 runAsNonRoot: true
               serviceAccountName: ocs-client-operator-controller-manager

config/console/console_init.yaml

@@ -11,16 +11,6 @@ spec:
       labels:
         app.kubernetes.io/name: ocs-client-operator-console
     spec:
-      initContainers:
-      - name: deployment-guard
-        image: deployment-guard:latest
-        command:
-          - /deployment-guard
-        env:
-        - name: OPERATOR_NAMESPACE
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace
       containers:
         - name: ocs-client-operator-console
           image: ocs-client-operator-console:latest

config/console/kustomization.yaml

@@ -9,9 +9,6 @@ resources:
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
-- name: deployment-guard
-  newName: quay.io/ocs-dev/ocs-client-operator
-  newTag: latest
 - name: ocs-client-operator-console
   newName: quay.io/ocs-dev/ocs-client-console
   newTag: latest

config/manager/kustomization.yaml

@@ -19,6 +19,3 @@ images:
 - name: controller
   newName: quay.io/ocs-dev/ocs-client-operator
   newTag: latest
-- name: deployment-guard
-  newName: quay.io/ocs-dev/ocs-client-operator
-  newTag: latest

config/manager/manager.yaml

@@ -29,16 +29,6 @@ spec:
     spec:
       securityContext:
         runAsNonRoot: true
-      initContainers:
-      - name: deployment-guard
-        image: deployment-guard:latest
-        command:
-          - /deployment-guard
-        env:
-        - name: OPERATOR_NAMESPACE
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace
       containers:
       - command:
         - /entrypoint

config/rbac/role.yaml

@@ -265,13 +265,6 @@ rules:
   - get
   - patch
   - update
-- apiGroups:
-  - ocs.openshift.io
-  resources:
-  - storageclusters
-  verbs:
-  - get
-  - list
 - apiGroups:
   - operators.coreos.com
   resources:

hack/go-build.sh

@@ -9,4 +9,3 @@ set -x
 
 go build -a -o ${GOBIN:-bin}/manager cmd/main.go
 go build -a -o ${GOBIN:-bin}/status-reporter ./service/status-report/main.go
-go build -a -o ${GOBIN:-bin}/deployment-guard ./service/deployment-guard/main.go

internal/controller/operatorconfigmap_controller.go

@@ -191,7 +191,6 @@ func (c *OperatorConfigMapReconciler) SetupWithManager(mgr ctrl.Manager) error {
 //+kubebuilder:rbac:groups=console.openshift.io,resources=consoleplugins,verbs=*
 //+kubebuilder:rbac:groups=operators.coreos.com,resources=subscriptions,verbs=get;list;watch;update
 //+kubebuilder:rbac:groups=admissionregistration.k8s.io,resources=validatingwebhookconfigurations,verbs=get;list;update;create;watch;delete
-//+kubebuilder:rbac:groups=ocs.openshift.io,resources=storageclusters,verbs=get;list
 //+kubebuilder:rbac:groups=csi.ceph.io,resources=operatorconfigs,verbs=get;list;update;create;watch;delete
 //+kubebuilder:rbac:groups=csi.ceph.io,resources=drivers,verbs=get;list;update;create;watch;delete