diff options
| author |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-09-16 11:18:05 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-09-16 11:18:05 +0000 |
| commit | 396e69c958bca55aba094f1f909f8457fb83b779 (patch) | |
| tree | 538282a6f538c5ee0ea8aa068ffecd6aea0212f9 | |
| parent | b515ca37a99ec955fce6521928c8c1619a4dc118 (diff) | |
| parent | 6d0bb2a4b3a921991838e062d86ca029831882e0 (diff) | |
Merge "Use helm-push plugin"
| -rw-r--r-- | kubernetes/common/Makefile | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/kubernetes/common/Makefile b/kubernetes/common/Makefile index 941c2f84df..eb782b4fd8 100644 --- a/kubernetes/common/Makefile +++ b/kubernetes/common/Makefile @@ -22,6 +22,8 @@ COMMON_CHARTS_DIR := common EXCLUDES := HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.)))) +HELM_VER != helm version --template "{{.Version}}" + .PHONY: $(EXCLUDES) $(HELM_CHARTS) all: $(COMMON_CHARTS_DIR) $(HELM_CHARTS) @@ -41,7 +43,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: |