From: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Date: Mon, 28 Jun 2021 19:19:25 +0000 (+0000)
Subject: Merge "[DCAE] Make sure to update index.yaml after pushing common chart"
X-Git-Tag: 9.0.0~213
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=c8a766a4fd2eda0b730cbe412d92d5a2c3092bec;hp=ae7b05560d7c7d59c7ceaa7d7e40bdce67e7d399;p=oom.git

Merge "[DCAE] Make sure to update index.yaml after pushing common chart"
---

diff --git a/kubernetes/dcaegen2-services/common/Makefile b/kubernetes/dcaegen2-services/common/Makefile
index 4a6491d8cc..db8704c2ca 100644
--- a/kubernetes/dcaegen2-services/common/Makefile
+++ b/kubernetes/dcaegen2-services/common/Makefile
@@ -22,11 +22,18 @@ HELM_REPO := local
 
 EXCLUDES :=
 HELM_BIN := helm
+# 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
+
 HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
 
 .PHONY: $(EXCLUDES) $(HELM_CHARTS)
 
-all: $(HELM_CHARTS)
+all: $(HELM_CHARTS) helm-repo-update
 
 $(HELM_CHARTS):
 	@echo "\n[$@]"
@@ -50,5 +57,11 @@ clean:
 	@rm -f */requirements.lock
 	@rm -f *tgz */charts/*tgz
 	@rm -rf $(PACKAGE_DIR)
+
+helm-repo-update:
+ifeq "$(findstring v3,$(HELM_VER))" "v3"
+	@$(HELM_BIN) repo update
+endif
+
 %:
 	@: