diff options
| author |   Krzysztof Opasiak <k.opasiak@samsung.com> | 2020-10-20 09:29:47 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-10-20 09:29:47 +0000 |
| commit | b61ad49e3b97eadebccbf76bcebefa638ef10c05 (patch) | |
| tree | 967e0dadadfcb9e3f89f43e12c5bf8fe73b1506a /kubernetes/so/Makefile | |
| parent | 4c2291ab1f569482b06ea7d1339bfca047012ae5 (diff) | |
| parent | db52a6ddbb5e1f459d59051de6e54279fd095f06 (diff) | |
Merge "Update makefiles to use specific helm version"
Diffstat (limited to 'kubernetes/so/Makefile')
| -rw-r--r-- | kubernetes/so/Makefile | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/kubernetes/so/Makefile b/kubernetes/so/Makefile index 8af301d7ae..4c79718d02 100644 --- a/kubernetes/so/Makefile +++ b/kubernetes/so/Makefile @@ -18,6 +18,7 @@ PACKAGE_DIR := $(OUTPUT_DIR)/packages SECRET_DIR := $(OUTPUT_DIR)/secrets EXCLUDES := dist resources templates charts docker +HELM_BIN := helm HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.)))) .PHONY: $(EXCLUDES) $(HELM_CHARTS) @@ -32,15 +33,15 @@ 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) - @if [ -f $*/Chart.yaml ]; then helm package -d $(PACKAGE_DIR) $*; fi - @helm repo index $(PACKAGE_DIR) + @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) package -d $(PACKAGE_DIR) $*; fi + @$(HELM_BIN) repo index $(PACKAGE_DIR) clean: @rm -f */requirements.lock |