makefile: update makefile to add additional SA to csv

Signed-off-by: Nitin Goyal <nigoyal@redhat.com>

Makefile.Downstream.mk

@@ -36,13 +36,22 @@ BUNDLE_CHANNELS := --channels=$(CHANNELS)
 OPERATOR_SDK ?= $(LOCALBIN)/operator-sdk-$(OPERATOR_SDK_VERSION)
 OPERATOR_SDK_VERSION ?= 1.34.1
 
+NAME_PREFIX = ocscsi-
+
+EXTRA_SERVICE_ACCOUNTS := '$(NAME_PREFIX)cephfs-ctrlplugin-sa,$(NAME_PREFIX)cephfs-nodeplugin-sa,$(NAME_PREFIX)rbd-ctrlplugin-sa,$(NAME_PREFIX)rbd-nodeplugin-sa'
 
 .PHONY: bundle
 bundle: kustomize operator-sdk manifests
-	cd config/manager && $(KUSTOMIZE) edit set image controller=$(IMG)
 	cd config/manifests/bases && $(KUSTOMIZE) edit add annotation --force 'olm.skipRange':"$(SKIP_RANGE)"
+	rm -f config/manifests/kustomization.yaml
+	cd config/manifests && $(KUSTOMIZE) create --resources bases,../default --nameprefix $(NAME_PREFIX)
+	cd config/manifests && $(KUSTOMIZE) edit set image controller=$(IMG)
+	cd config/manifests && $(KUSTOMIZE) edit add patch --name controller-manager --kind Deployment --patch \
+		'[{"op": "add", "path": "/spec/template/spec/containers/1/env/-", "value": {"name":"CSI_SERVICE_ACCOUNT_PREFIX", "value":"$(NAME_PREFIX)"}}]'
+	rm -rf bundle
 	$(KUSTOMIZE) build config/manifests | $(OPERATOR_SDK) generate bundle \
-		--overwrite --manifests --metadata --package $(PACKAGE_NAME) --version $(BUNDLE_VERSION) $(BUNDLE_METADATA_OPTS)
+		--overwrite --manifests --metadata --package $(PACKAGE_NAME) --version $(BUNDLE_VERSION) $(BUNDLE_METADATA_OPTS) \
+		--extra-service-accounts $(EXTRA_SERVICE_ACCOUNTS)
 
 .PHONY: bundle-build
 bundle-build: bundle ## Build the bundle image.

config/manifests/kustomization.yaml

@@ -1,6 +1,16 @@
----
-# These resources constitute the fully configured set of manifests
-# used to generate the 'manifests/' directory in a bundle.
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 resources:
-  - bases
-  - ../default
+- bases
+- ../default
+namePrefix: ocscsi-
+images:
+- name: controller
+  newName: quay.io/ocs-dev/cephcsi-operator
+  newTag: latest
+patches:
+- patch: '[{"op": "add", "path": "/spec/template/spec/containers/1/env/-", "value":
+    {"name":"CSI_SERVICE_ACCOUNT_PREFIX", "value":"ocscsi-"}}]'
+  target:
+    kind: Deployment
+    name: controller-manager