diff options
author | 2020-10-20 09:29:47 +0000 | |
---|---|---|
committer | 2020-10-20 09:29:47 +0000 | |
commit | b61ad49e3b97eadebccbf76bcebefa638ef10c05 (patch) | |
tree | 967e0dadadfcb9e3f89f43e12c5bf8fe73b1506a /kubernetes/sdc/components/Makefile | |
parent | 4c2291ab1f569482b06ea7d1339bfca047012ae5 (diff) | |
parent | db52a6ddbb5e1f459d59051de6e54279fd095f06 (diff) |
Merge "Update makefiles to use specific helm version"
Diffstat (limited to 'kubernetes/sdc/components/Makefile')
-rw-r--r-- | kubernetes/sdc/components/Makefile | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/kubernetes/sdc/components/Makefile b/kubernetes/sdc/components/Makefile index 0d5b9e0c1f..577fd95b4c 100644 --- a/kubernetes/sdc/components/Makefile +++ b/kubernetes/sdc/components/Makefile @@ -18,8 +18,9 @@ PACKAGE_DIR := $(OUTPUT_DIR)/packages SECRET_DIR := $(OUTPUT_DIR)/secrets EXCLUDES := +HELM_BIN := helm HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.)))) -HELM_VER := $(shell helm version --template "{{.Version}}") +HELM_VER := $(shell $(HELM_BIN) version --template "{{.Version}}") .PHONY: $(EXCLUDES) $(HELM_CHARTS) @@ -33,19 +34,19 @@ make-%: @if [ -f $*/Makefile ]; then make -C $*; fi dep-%: make-% - @if [ -f $*/requirements.yaml ]; then helm dep up $*; fi + @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi lint-%: dep-% - @if [ -f $*/Chart.yaml ]; then helm lint $*; fi + @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi package-%: lint-% @mkdir -p $(PACKAGE_DIR) ifeq "$(findstring v3,$(HELM_VER))" "v3" - @if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$(helm package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && helm push -f $$PACKAGE_NAME local; fi + @if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) push -f $$PACKAGE_NAME local; fi else - @if [ -f $*/Chart.yaml ]; then helm package -d $(PACKAGE_DIR) $*; fi + @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) package -d $(PACKAGE_DIR) $*; fi endif - @helm repo index $(PACKAGE_DIR) + @$(HELM_BIN) repo index $(PACKAGE_DIR) clean: @rm -f */requirements.lock |