From 3f10b02a9c3caf2782261f5aff8c6c999681e3fd Mon Sep 17 00:00:00 2001 From: Bobbins228 Date: Mon, 13 Nov 2023 17:04:04 +0000 Subject: [PATCH] Altered Makefile to use passed image --- Makefile | 3 ++- config/manager/kustomization.yaml | 6 ------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 527cedd46..9da6cf6cf 100644 --- 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 index 71872b16d..4fe5ccaa3 100644 --- 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