controllers: remove code that deploys CSI and retain delegation of CSI

Signed-off-by: Leela Venkaiah G <[email protected]>
red-hat-storage · Oct 21, 2024 · fb722c5 · fb722c5
1 parent 68317e1
commit fb722c5
Show file tree

Hide file tree

Showing 12 changed files with 67 additions and 562 deletions.
diff --git a/Makefile b/Makefile
@@ -37,15 +37,6 @@ manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and Cust
 generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
 	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
 
-csi-images-manifest: ## Generates the YAML manifest of CSI images for each supported environment.
-	./hack/gen-csi-images-manifest.sh
-
-verify-csi-images-manifest: csi-images-manifest ## Verify csi-images-manifest has been run, if required.
-	@if [[ -n "$$(git status --porcelain $${CSI_IMAGES_MANIFEST})" ]]; then \
-		echo -e "\n\033[1;31mError:\033[0m Uncommitted changes to CSI images manifest found. Run \033[1m'make csi-images-manifest'\033[0m and commit the results.\n"; \
-		git diff -u $${CSI_IMAGES_MANIFEST}; \
-		exit 1; \
-	fi
 fmt: ## Run go fmt against code.
 	go fmt ./...
 

diff --git a/bundle/manifests/ocs-client-operator-csi-images_v1_configmap.yaml b/bundle/manifests/ocs-client-operator-csi-images_v1_configmap.yaml
diff --git a/bundle/manifests/ocs-client-operator.clusterserviceversion.yaml b/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-10-14T12:21:27Z"
+    createdAt: "2024-10-21T04:48:51Z"
     description: OpenShift Data Foundation client operator enables consumption of
       storage services from a remote centralized OpenShift Data Foundation provider
       cluster.
@@ -106,42 +106,13 @@ spec:
           - get
           - list
           - watch
-        - apiGroups:
-          - apps
-          resources:
-          - daemonsets
-          verbs:
-          - create
-          - delete
-          - get
-          - list
-          - patch
-          - update
-          - watch
-        - apiGroups:
-          - apps
-          resources:
-          - daemonsets/finalizers
-          verbs:
-          - update
         - apiGroups:
           - apps
           resources:
           - deployments
           verbs:
-          - create
-          - delete
           - get
           - list
-          - patch
-          - update
-          - watch
-        - apiGroups:
-          - apps
-          resources:
-          - deployments/finalizers
-          verbs:
-          - update
         - apiGroups:
           - batch
           resources:
@@ -823,8 +794,6 @@ spec:
                 securityContext:
                   allowPrivilegeEscalation: false
                 volumeMounts:
-                - mountPath: /opt/config
-                  name: csi-images
                 - mountPath: /etc/tls/private
                   name: webhook-cert-secret
               initContainers:
@@ -848,9 +817,6 @@ spec:
                 operator: Equal
                 value: "true"
               volumes:
-              - configMap:
-                  name: ocs-client-operator-csi-images
-                name: csi-images
               - name: webhook-cert-secret
                 secret:
                   secretName: webhook-cert-secret

diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -9,9 +9,6 @@ configMapGenerator:
 - files:
   - controller_manager_config.yaml
   name: manager-config
-- files:
-  - csi-images.yaml=csi-images.yaml
-  name: csi-images
 - name: config
 
 apiVersion: kustomize.config.k8s.io/v1beta1

diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -47,8 +47,6 @@ spec:
         image: controller:latest
         name: manager
         volumeMounts:
-        - name: csi-images
-          mountPath: /opt/config
         - mountPath: /etc/tls/private
           name: webhook-cert-secret
         env:
@@ -88,9 +86,6 @@ spec:
             cpu: 10m
             memory: 256Mi
       volumes:
-      - name: csi-images
-        configMap:
-          name: csi-images
       - name: webhook-cert-secret
         secret:
           secretName: webhook-cert-secret

diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -63,42 +63,13 @@ rules:
   - get
   - list
   - watch
-- apiGroups:
-  - apps
-  resources:
-  - daemonsets
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - apps
-  resources:
-  - daemonsets/finalizers
-  verbs:
-  - update
 - apiGroups:
   - apps
   resources:
   - deployments
   verbs:
-  - create
-  - delete
   - get
   - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - apps
-  resources:
-  - deployments/finalizers
-  verbs:
-  - update
 - apiGroups:
   - batch
   resources:

diff --git a/hack/make-bundle-vars.mk b/hack/make-bundle-vars.mk
@@ -108,11 +108,6 @@ endif
 CSI_ADDONS_PACKAGE_NAME ?= csi-addons
 CSI_ADDONS_PACKAGE_VERSION ?= 0.9.1
 
-## CSI driver images
-# The following variables define the default CSI container images to deploy
-# and the supported versions of OpenShift.
-CSI_IMAGES_MANIFEST ?= config/manager/csi-images.yaml
-
 # The following variables are here as a convenience for developers so we don't have
 # to retype things, because we're lazy.
 IMAGE_LOCATION_SIG_STORAGE ?= registry.k8s.io/sig-storage