From 75b38e2fc9243e0291b32034ce84588d258726ae Mon Sep 17 00:00:00 2001 From: Jakub Latusek Date: Mon, 21 Sep 2020 23:41:02 +0200 Subject: [PATCH] [CLAMP] Use helm-push plugin in clamp this is done in order to make OOM compatible with helm3 Signed-off-by: Jakub Latusek Issue-ID: OOM-2562 Change-Id: Ideb4e113bd9fb977e2d64621a68ea0ac8e656d76 --- kubernetes/clamp/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/kubernetes/clamp/Makefile b/kubernetes/clamp/Makefile index 8af301d7ae..248fb056ab 100644 --- a/kubernetes/clamp/Makefile +++ b/kubernetes/clamp/Makefile @@ -19,6 +19,7 @@ SECRET_DIR := $(OUTPUT_DIR)/secrets EXCLUDES := dist resources templates charts docker HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.)))) +HELM_VER := $(shell helm version --template "{{.Version}}") .PHONY: $(EXCLUDES) $(HELM_CHARTS) @@ -39,7 +40,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: -- 2.16.6