Skip to content

Commit 7d0aae9

Browse files
authored
ci: changed chart version source (#35)
1 parent 000a4c2 commit 7d0aae9

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ SHELL := bash -eu -o pipefail
99
# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
1010
# - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
1111
VERSION ?= $(shell cat VERSION)
12-
HELM_VERSION ?= $(shell cat VERSION)
1312
GIT_HASH_SHORT ?= $(shell git rev-parse --short=8 HEAD)
1413
VERSION_DEV_SUFFIX := ${GIT_HASH_SHORT}
1514
CLUSTERCTL_VERSION ?= v1.9.5
@@ -26,6 +25,8 @@ ifeq ($(findstring -dev,$(VERSION)), -dev)
2625
VERSION := $(VERSION)-$(VERSION_DEV_SUFFIX)
2726
endif
2827

28+
HELM_VERSION ?= ${VERSION}
29+
2930
REGISTRY ?= 080137407410.dkr.ecr.us-west-2.amazonaws.com
3031
REGISTRY_NO_AUTH ?= edge-orch
3132
REPOSITORY ?= cluster
@@ -303,7 +304,7 @@ helm-build: ## Package helm charts.
303304
yq eval -i '.annotations.created = "${LABEL_CREATED}"' $$d/Chart.yaml; \
304305
helm package --app-version=${VERSION} --version=${HELM_VERSION} --debug -u $$d -d $(BUILD_DIR); \
305306
done
306-
# revert the temporary changes done in Chart.yaml
307+
# revert the temporary changes done in charts
307308
git checkout deployment/charts/cluster-template-crd/Chart.yaml deployment/charts/cluster-manager/Chart.yaml
308309

309310
.PHONY: helm-list

0 commit comments

Comments
 (0)