X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2FMakefile;h=ef913e33a9a9c28b238bc147d443602f76b192e5;hb=7348724b2641bd661e8ce3f678c2f3dc81d88e95;hp=ca46ad8fe072555fb633369864616e052bbe38d8;hpb=d5936d4446ba47fc04e2f1ce56672233460af1a2;p=oom.git

diff --git a/kubernetes/Makefile b/kubernetes/Makefile
index ca46ad8fe0..ef913e33a9 100644
--- a/kubernetes/Makefile
+++ b/kubernetes/Makefile
@@ -20,7 +20,18 @@ OUTPUT_DIR := $(ROOT_DIR)/dist
 PACKAGE_DIR := $(OUTPUT_DIR)/packages
 SECRET_DIR := $(OUTPUT_DIR)/secrets
 HELM_BIN := helm
-HELM_VER := $(shell $(HELM_BIN) version --template "{{.Version}}")
+
+# Helm v2 and helm v3 uses different version format so we first try in helm v3 format
+# and if it fails then we fallback to helm v2 one
+HELM_VER := $(shell $(HELM_BIN) version --template "{{.Version}}" 2>/dev/null)
+ifneq "$(findstring v3,$(HELM_VER))" "v3"
+	HELM_VER := $(shell $(HELM_BIN) version -c --template "{{.Client.SemVer}}")
+endif
+
+# use this if you would like to push onap charts to repo with other name
+# WARNING: Helm v3+ only
+# WARNING: Make sure to edit also requirements files
+HELM_REPO := local
 
 ifneq ($(SKIP_LINT),TRUE)
 	HELM_LINT_CMD := $(HELM_BIN) lint
@@ -28,13 +39,13 @@ else
 	HELM_LINT_CMD := echo "Skipping linting of"
 endif
 
-SUBMODS := robot aai
+SUBMODS := robot
 EXCLUDES := config oneclick readiness test dist helm $(PARENT_CHART) dcae $(SUBMODS)
 HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.)))) $(PARENT_CHART)
 
 .PHONY: $(EXCLUDES) $(HELM_CHARTS) check-for-staging-images
 
-all: $(COMMON_CHARTS_DIR) $(SUBMODS) $(HELM_CHARTS) plugins
+all: $(COMMON_CHARTS_DIR) $(SUBMODS) $(HELM_CHARTS) helm-repo-update plugins
 
 $(COMMON_CHARTS):
 	@echo "\n[$@]"
@@ -68,12 +79,11 @@ lint-%: dep-%
 package-%: lint-%
 	@mkdir -p $(PACKAGE_DIR)
 ifeq "$(findstring v3,$(HELM_VER))" "v3"
-	@if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) 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 $(HELM_REPO); fi
 else
 	@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) package -d $(PACKAGE_DIR) $*; fi
-endif
-
 	@$(HELM_BIN) repo index $(PACKAGE_DIR)
+endif
 
 clean:
 	@rm -f */requirements.lock
@@ -82,9 +92,10 @@ clean:
 
 # publish helm plugins via distrubtion directory
 plugins:
-	@cp -R $(HELM_BIN) $(PACKAGE_DIR)/
+	@cp -R helm $(PACKAGE_DIR)/
 
 # start up a local helm repo to serve up helm chart packages
+# WARNING: Only helm < v3 supported
 repo:
 	@mkdir -p $(PACKAGE_DIR)
 	@$(HELM_BIN) serve --repo-path $(PACKAGE_DIR) &
@@ -93,6 +104,7 @@ repo:
 	@$(HELM_BIN) repo add local http://127.0.0.1:8879
 
 # stop local helm repo
+# WARNING: Only helm < v3 supported
 repo-stop:
 	@pkill $(HELM_BIN)
 	@$(HELM_BIN) repo remove local
@@ -100,6 +112,10 @@ repo-stop:
 check-for-staging-images:
 	$(ROOT_DIR)/contrib/tools/check-for-staging-images.sh
 
+helm-repo-update:
+ifeq "$(findstring v3,$(HELM_VER))" "v3"
+	@$(HELM_BIN) repo update
+endif
+
 %:
 	@:
-