X-Git-Url: https://gerrit.onap.org/r/gitweb?p=oom.git;a=blobdiff_plain;f=kubernetes%2FMakefile;fp=kubernetes%2FMakefile;h=dfad45ff247a16d3f0aed3d94182b3b6c55c0695;hp=b25381fd816886da8f5974f78cf67d3e54839d65;hb=6a74e0d730e54ac285a8718a587e86a2f3447a10;hpb=7ba9cb9f6e9dd62210d42eb19e693293bab52042 diff --git a/kubernetes/Makefile b/kubernetes/Makefile index b25381fd81..dfad45ff24 100644 --- a/kubernetes/Makefile +++ b/kubernetes/Makefile @@ -19,6 +19,7 @@ ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))) OUTPUT_DIR := $(ROOT_DIR)/dist PACKAGE_DIR := $(OUTPUT_DIR)/packages SECRET_DIR := $(OUTPUT_DIR)/secrets +HELM_VER := $(shell helm version --template "{{.Version}}") ifneq ($(SKIP_LINT),TRUE) HELM_LINT_CMD := helm lint @@ -65,7 +66,12 @@ 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: