Altered Makefile to use passed image

Bobbins228 · Nov 13, 2023 · 3f10b02 · 3f10b02
1 parent b4b8048
commit 3f10b02
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -179,7 +179,8 @@ 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/e2e && IMAGE=$(IMG) perl -i -pe 's/odh-codeflare-operator-controller-image=(.*)$$/odh-codeflare-operator-controller-image=$$ENV{"IMAGE"}/' params.env
+	cd config/manifests && IMAGE=$(IMG) perl -i -pe 's/odh-codeflare-operator-controller-image=(.*)$$/odh-codeflare-operator-controller-image=$$ENV{"IMAGE"}/' bases/params.env
 	$(KUSTOMIZE) build config/${ENV} | kubectl apply -f -
 	git restore config/*
 

diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -3,9 +3,3 @@ resources:
 
 generatorOptions:
   disableNameSuffixHash: true
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-images:
-- name: controller
-  newName: quay.io/project-codeflare/codeflare-operator
-  newTag: v0.0.0-dev