Moved params to manifests and fixed manager

Author: Bobbins228

.github/workflows/tag-and-build.yml

@@ -104,7 +104,7 @@ jobs:
 
     - name: Update image version in params.env
       run: |
-        VERSION=${{ github.event.inputs.version }} perl -i -pe 's/:(.*)$/:$ENV{"VERSION"}/' config/manager/params.env
+        VERSION=${{ github.event.inputs.version }} perl -i -pe 's/:(.*)$/:$ENV{"VERSION"}/' config/manifests/bases/params.env
       shell: bash
 
     - name: Login to Quay.io

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 && IMAGE=$(IMG) perl -i -pe 's/odh-codeflare-operator-controller-image=(.*)$$/odh-codeflare-operator-controller-image=$$ENV{"IMAGE"}/' params.env
+	cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
 	$(KUSTOMIZE) build config/${ENV} | kubectl apply -f -
 	git restore config/*
 

config/manager/kustomization.yaml

@@ -1,21 +1,5 @@
 resources:
 - manager.yaml
 
-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
-
 generatorOptions:
   disableNameSuffixHash: true

config/manager/manager.yaml

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

config/manager/params.env

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

config/manifests/bases/params.env

@@ -6,3 +6,19 @@ resources:
 - ../scorecard
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
+
+configMapGenerator:
+- name: codeflare-stack-config
+  envs:
+    - bases/params.env
+configurations:
+  - bases/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