Makefile: charts now point to OBS Dev images by default

we may want to review this commit once we review our github release process (in particular the tag rewrite on the images). Signed-off-by: Francesco Giudici <[email protected]>
rancher · Aug 11, 2023 · 26909b7 · 26909b7
1 parent ef5c89f
commit 26909b7
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ GIT_TAG?=$(shell git describe --abbrev=0 --tags 2>/dev/null || echo "v0.0.0" )
 TAG?=${GIT_TAG}-${GIT_COMMIT_SHORT}
 REPO?=quay.io/costoolkit/elemental-operator-ci
 REPO_REGISTER?=quay.io/costoolkit/elemental-register-ci
-REGISTRY_URL?=registry.opensuse.org/isv/rancher/elemental/dev/containers/
+REGISTRY_URL?=registry.opensuse.org/isv/rancher/elemental/dev/containers
 TAG_SEEDIMAGE?=${TAG}
 REPO_SEEDIMAGE?=quay.io/costoolkit/seedimage-builder-ci
 export ROOT_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
@@ -129,9 +129,9 @@ chart:
 	helm package --version ${CHART_VERSION} --app-version ${GIT_TAG} -d $(ROOT_DIR)/build/ $(ROOT_DIR)/build/crds
 	rm -Rf $(ROOT_DIR)/build/crds
 	cp -rf $(ROOT_DIR)/charts/operator $(ROOT_DIR)/build/operator
-	yq -i '.image.tag = "${TAG}"' $(ROOT_DIR)/build/operator/values.yaml
 	yq -i '.registry_url = "${REGISTRY_URL}"' $(ROOT_DIR)/build/operator/values.yaml
-	yq -i '.seedImage.tag = "${TAG_SEEDIMAGE}"' $(ROOT_DIR)/build/operator/values.yaml
+	yq -i '.image.tag = "${CHART_VERSION}"' $(ROOT_DIR)/build/operator/values.yaml
+	yq -i '.seedImage.tag = "${CHART_VERSION}"' $(ROOT_DIR)/build/operator/values.yaml
 	helm package --version ${CHART_VERSION} --app-version ${GIT_TAG} -d $(ROOT_DIR)/build/ $(ROOT_DIR)/build/operator
 	rm -Rf $(ROOT_DIR)/build/operator