Merge pull request #26 from cwiklik/fix-hardcoded-tag

🐛 Fixed hardcoded image tag
kubestellar · Oct 9, 2024 · 0a9f84f · 0a9f84f
2 parents cab6068 + ee3ae62
commit 0a9f84f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/charts/kueue-ks/templates/operator.yaml b/charts/kueue-ks/templates/operator.yaml
@@ -610,7 +610,7 @@ spec:
         - --health-probe-bind-address=:8085
         - --metrics-bind-address=127.0.0.1:8080
         - --leader-elect
-        image: ko.local/kueue-ks:e559205
+        image: {{.Values.image}}
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/kueue-ks/Makefile b/kueue-ks/Makefile
@@ -5,6 +5,11 @@ IMAGE_TAG ?= $(shell git rev-parse --short HEAD)
 #IMAGE_TAG ?= 0.0.1
 CMD_NAME ?= kueue-ks
 IMG ?= ${KO_DOCKER_REPO}/${CMD_NAME}:${IMAGE_TAG}
+HELM_IMG := --set image=${IMG}
+HELM_OPTS := ${HELM_OPTS} ${HELM_IMG}
+@echo ${HELM_OPTS}
+
+#FOO ?= " --set image=${IMG}"
 # Image URL to use all building/pushing image targets
 #IMG ?= controller:latest
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
@@ -142,7 +147,7 @@ k3d-load-image:
 
 .PHONY: k3d-install-local-chart
 k3d-install-local-chart: k3d-load-image
-	if [ ! -n "$(CONTEXT)" ] ; then helm  upgrade --install --create-namespace -n kueue-ks-system kueue-ks ../charts/kueue-ks ${HELM_OPTS} ; else helm  --kube-context ${CONTEXT} upgrade --install --create-namespace -n kueue-ks-system kueue-ks ../charts/kueue-ks ${HELM_OPTS} ; fi
+	if [ ! -n "$(CONTEXT)" ] ; then helm  upgrade --install --create-namespace -n kueue-ks-system kueue-ks ../charts/kueue-ks ${HELM_OPTS} ; else helm  --kube-context ${CONTEXT} upgrade --install --create-namespace -n kueue-ks-system kueue-ks ../charts/kueue-ks ${HELM_OPTS}; fi
 
 ##@ Build Dependencies