[GLOBAL] Migrate to helm v3

[oom.git] / kubernetes / common / Makefile

diff --git a/kubernetes/common/Makefile b/kubernetes/common/Makefile
index 817a2e2..6d5d936 100644 (file)
--- a/kubernetes/common/Makefile
+++ b/kubernetes/common/Makefile
@@ -20,11 +20,12 @@ SECRET_DIR := $(OUTPUT_DIR)/secrets
 COMMON_CHARTS_DIR := common
 
 EXCLUDES :=
-PROCESSED_LAST := cert-wrapper
-TO_FILTER := $(EXCLUDES) $(PROCESSED_LAST)
+PROCESSED_LAST := cert-wrapper repository-wrapper
+PROCESSED_FIRST := repositoryGenerator readinessCheck serviceAccount certInitializer
+TO_FILTER := $(PROCESSED_FIRST) $(EXCLUDES) $(PROCESSED_LAST)
 
 HELM_BIN := helm
-HELM_CHARTS := $(filter-out $(TO_FILTER), $(sort $(patsubst %/.,%,$(wildcard */.)))) $(PROCESSED_LAST)
+HELM_CHARTS := $(PROCESSED_FIRST) $(filter-out $(TO_FILTER), $(sort $(patsubst %/.,%,$(wildcard */.)))) $(PROCESSED_LAST)
 HELM_VER := $(shell $(HELM_BIN) version --template "{{.Version}}")
 
 .PHONY: $(HELM_CHARTS) $(TO_FILTER)
@@ -39,7 +40,7 @@ make-%:
        @if [ -f $*/Makefile ]; then make -C $*; fi
 
 dep-%: make-%
-       @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+       @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
 
 lint-%: dep-%
        @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -54,7 +55,7 @@ endif
        @$(HELM_BIN) repo index $(PACKAGE_DIR)
 
 clean:
-       @rm -f */requirements.lock
+       @rm -f */Chart.lock
        @rm -f *tgz */charts/*tgz
        @rm -rf $(PACKAGE_DIR)
 %: