X-Git-Url: https://gerrit.onap.org/r/gitweb?p=oom.git;a=blobdiff_plain;f=kubernetes%2FMakefile;fp=kubernetes%2FMakefile;h=ef913e33a9a9c28b238bc147d443602f76b192e5;hp=3c5254ca27309dc6cdec00527d1c9d8ef30a9622;hb=2a4b47f9f332df8980a69f169361038f60dceb63;hpb=69e8c90cb3c8171d397319b4339b3ce79da07b9c

diff --git a/kubernetes/Makefile b/kubernetes/Makefile
index 3c5254ca27..ef913e33a9 100644
--- a/kubernetes/Makefile
+++ b/kubernetes/Makefile
@@ -20,7 +20,14 @@ 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