Moved params to manager altered make file

Author: Bobbins228

Makefile

@@ -198,7 +198,7 @@ uninstall: manifests kustomize ## Uninstall CRDs from the K8s cluster specified
 
 .PHONY: deploy
 deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config.
-	cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
+	cd config/manager && IMAGE=$(IMG) perl -i -pe 's/odh-codeflare-operator-controller-image=(.*)$$/odh-codeflare-operator-controller-image=$$ENV{"IMAGE"}/' params.env
 	$(KUSTOMIZE) build config/${ENV} | kubectl apply -f -
 	git restore config/*
 
@@ -283,7 +283,7 @@ validate-bundle: install-operator-sdk
 
 .PHONY: bundle
 bundle: manifests kustomize install-operator-sdk ## Generate bundle manifests and metadata, then validate generated files.
-	cd config/manager && $(KUSTOMIZE) edit set image controller=$(IMG)
+	cd config/manager && IMAGE=$(IMG) perl -i -pe 's/odh-codeflare-operator-controller-image=(.*)$$/odh-codeflare-operator-controller-image=$$ENV{"IMAGE"}/' params.env
 	$(KUSTOMIZE) build config/manifests | $(OPERATOR_SDK) generate bundle $(BUNDLE_GEN_FLAGS)
 	$(MAKE) validate-bundle
 	git restore config/*

config/manager/kustomization.yaml

@@ -3,3 +3,19 @@ resources:
 
 generatorOptions:
   disableNameSuffixHash: true
+
+configMapGenerator:
+- name: codeflare-stack-config
+  envs:
+    - params.env
+configurations:
+  - params.yaml
+
+vars:
+- name: odh_codeflare_operator_controller_image
+  objref:
+    kind: ConfigMap
+    name: codeflare-stack-config
+    apiVersion: v1
+  fieldref:
+    fieldpath: data.odh-codeflare-operator-controller-image

config/manager/manager.yaml

@@ -34,7 +34,7 @@ spec:
       containers:
       - command:
         - /manager
-        image: controller:latest
+        image: $(odh_codeflare_operator_controller_image)
         imagePullPolicy: Always
         name: manager
         securityContext:

config/manifests/params.env renamed to config/manager/params.env

@@ -1 +1 @@
-odh-codeflare-operator-controller-image=quay.io/opendatahub/codeflare-operator:v1.0.0
+odh-codeflare-operator-controller-image=quay.io/opendatahub/codeflare-operator:v1.0.1

config/manifests/params.yaml renamed to config/manager/params.yaml

@@ -3,22 +3,7 @@
 resources:
 - ../default
 - ../scorecard
+- codeflare-operator.clusterserviceversion.yaml
 
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-
-configMapGenerator:
-- name: codeflare-stack-config
-  envs:
-    - params.env
-configurations:
-  - params.yaml
-
-vars:
-- name: odh-codeflare-operator-controller-image
-  objref:
-    kind: ConfigMap
-    name: codeflare-stack-config
-    apiVersion: v1
-  fieldref:
-    fieldpath: data.odh-codeflare-operator-controller-image