diff options
| author |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-09-25 08:55:01 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-09-25 08:55:01 +0000 |
| commit | e346a97490358e693ae8ee7869745887e8fc3824 (patch) | |
| tree | 799d50546a194b3e17ba2e9f48412d56b44eaba1 | |
| parent | c6cbd3fe1e6ce85ff00a7e6a07aa39353dbf9fc9 (diff) | |
| parent | 75b38e2fc9243e0291b32034ce84588d258726ae (diff) | |
Merge "[CLAMP] Use helm-push plugin in clamp"
| -rw-r--r-- | kubernetes/clamp/Makefile | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/kubernetes/clamp/Makefile b/kubernetes/clamp/Makefile index 8af301d7ae..248fb056ab 100644 --- a/kubernetes/clamp/Makefile +++ b/kubernetes/clamp/Makefile @@ -19,6 +19,7 @@ SECRET_DIR := $(OUTPUT_DIR)/secrets EXCLUDES := dist resources templates charts docker HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.)))) +HELM_VER := $(shell helm version --template "{{.Version}}") .PHONY: $(EXCLUDES) $(HELM_CHARTS) @@ -39,7 +40,11 @@ lint-%: dep-% 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 +else @if [ -f $*/Chart.yaml ]; then helm package -d $(PACKAGE_DIR) $*; fi +endif @helm repo index $(PACKAGE_DIR) clean: |