From: Fiete Ostkamp Date: Fri, 27 Mar 2026 14:11:25 +0000 (+0100) Subject: Improve build time for charts X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F90%2F143690%2F5;p=oom.git Improve build time for charts - remove the 3 second sleeps for each module - fix parallelised build issue in submodule by changing the syntax how child makes are called Issue-ID: OOM-3387 Change-Id: I6bf2c1d62779cee5ae6382ef9a9180564dd173d8 Signed-off-by: Fiete Ostkamp --- diff --git a/kubernetes/Makefile b/kubernetes/Makefile index b92d41fe3f..4aad32e3ff 100644 --- a/kubernetes/Makefile +++ b/kubernetes/Makefile @@ -45,23 +45,23 @@ all: print_helm_bin $(COMMON_CHARTS_DIR) $(SUBMODS) $(HELM_CHARTS) $(PARENT_CHAR $(COMMON_CHARTS_DIR): @echo "\n[$@]" - @make package-$@ + @$(MAKE) package-$@ $(HELM_CHARTS): $(COMMON_CHARTS_DIR) @echo "\n[$@]" - @make package-$@ + @$(MAKE) package-$@ $(SUBMODS): $(COMMON_CHARTS_DIR) @echo "\n[$@]" - @make submod-$@ - @make package-$@ + @$(MAKE) submod-$@ + @$(MAKE) package-$@ $(PARENT_CHART): $(HELM_CHARTS) @echo "\n[$@]" - @make package-$@ + @$(MAKE) package-$@ submod-%: - @make $*/Chart.yaml + @$(MAKE) $*/Chart.yaml %/Chart.yaml: $(error Submodule $* needs to be retrieved from gerrit. See https://wiki.onap.org/display/DW/OOM+-+Development+workflow+after+code+transfer+to+tech+teams ); fi @@ -70,7 +70,7 @@ print_helm_bin: $(info Using Helm binary ${HELM_BIN} which is helm version ${HELM_VER}) make-%: - @if [ -f $*/Makefile ]; then make -C $*; fi + @if [ -f $*/Makefile ]; then $(MAKE) -C $*; fi dep-%: make-% @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi @@ -81,7 +81,7 @@ lint-%: dep-% package-%: lint-% @mkdir -p $(PACKAGE_DIR) @if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) cm-push -f $$PACKAGE_NAME $(HELM_REPO); fi - @sleep 3 + @$(HELM_BIN) repo update local clean: @rm -f */Chart.lock diff --git a/kubernetes/aai/Makefile b/kubernetes/aai/Makefile index c483a02eab..de96349571 100644 --- a/kubernetes/aai/Makefile +++ b/kubernetes/aai/Makefile @@ -33,10 +33,10 @@ all: $(HELM_CHARTS) $(HELM_CHARTS): @echo "\n[$@]" - @make package-$@ + @$(MAKE) package-$@ make-%: - @if [ -f $*/Makefile ]; then make -C $*; fi + @if [ -f $*/Makefile ]; then $(MAKE) -C $*; fi dep-%: make-% @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi @@ -47,7 +47,7 @@ lint-%: dep-% package-%: lint-% @mkdir -p $(PACKAGE_DIR) @if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) cm-push -f $$PACKAGE_NAME local; fi - @sleep 3 + @$(HELM_BIN) repo update local #@$(HELM_BIN) repo index $(PACKAGE_DIR) clean: diff --git a/kubernetes/aai/components/Makefile b/kubernetes/aai/components/Makefile index fa3c4b9af9..d73fa1e08e 100644 --- a/kubernetes/aai/components/Makefile +++ b/kubernetes/aai/components/Makefile @@ -33,10 +33,10 @@ all: $(HELM_CHARTS) $(HELM_CHARTS): @echo "\n[$@]" - @make package-$@ + @$(MAKE) package-$@ make-%: - @if [ -f $*/Makefile ]; then make -C $*; fi + @if [ -f $*/Makefile ]; then $(MAKE) -C $*; fi dep-%: make-% @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi @@ -47,7 +47,7 @@ lint-%: dep-% package-%: lint-% @mkdir -p $(PACKAGE_DIR) @if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) cm-push -f $$PACKAGE_NAME local; fi - @sleep 3 + @$(HELM_BIN) repo update local #@$(HELM_BIN) repo index $(PACKAGE_DIR) clean: diff --git a/kubernetes/authentication/Makefile b/kubernetes/authentication/Makefile index f47666e135..ade87880ea 100644 --- a/kubernetes/authentication/Makefile +++ b/kubernetes/authentication/Makefile @@ -35,10 +35,10 @@ all: $(HELM_CHARTS) $(HELM_CHARTS): @echo "\n[$@]" - @make package-$@ + @$(MAKE) package-$@ make-%: - @if [ -f $*/Makefile ]; then make -C $*; fi + @if [ -f $*/Makefile ]; then $(MAKE) -C $*; fi dep-%: make-% @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi @@ -49,7 +49,7 @@ lint-%: dep-% package-%: lint-% @mkdir -p $(PACKAGE_DIR) @if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) cm-push -f $$PACKAGE_NAME local; fi - @sleep 3 + @$(HELM_BIN) repo update local #@$(HELM_BIN) repo index $(PACKAGE_DIR) clean: diff --git a/kubernetes/authentication/components/Makefile b/kubernetes/authentication/components/Makefile index 4ecfbc53cc..13b66fca22 100644 --- a/kubernetes/authentication/components/Makefile +++ b/kubernetes/authentication/components/Makefile @@ -34,10 +34,10 @@ all: $(HELM_CHARTS) $(HELM_CHARTS): @echo "\n[$@]" - @make package-$@ + @$(MAKE) package-$@ make-%: - @if [ -f $*/Makefile ]; then make -C $*; fi + @if [ -f $*/Makefile ]; then $(MAKE) -C $*; fi dep-%: make-% @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi @@ -48,7 +48,7 @@ lint-%: dep-% package-%: lint-% @mkdir -p $(PACKAGE_DIR) @if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) cm-push -f $$PACKAGE_NAME local; fi - @sleep 3 + @$(HELM_BIN) repo update local #@$(HELM_BIN) repo index $(PACKAGE_DIR) clean: diff --git a/kubernetes/cds/Makefile b/kubernetes/cds/Makefile index 08ed7cb9da..b94f24af84 100644 --- a/kubernetes/cds/Makefile +++ b/kubernetes/cds/Makefile @@ -33,10 +33,10 @@ all: $(HELM_CHARTS) $(HELM_CHARTS): @echo "\n[$@]" - @make package-$@ + @$(MAKE) package-$@ make-%: - @if [ -f $*/Makefile ]; then make -C $*; fi + @if [ -f $*/Makefile ]; then $(MAKE) -C $*; fi dep-%: make-% @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi @@ -47,7 +47,7 @@ lint-%: dep-% package-%: lint-% @mkdir -p $(PACKAGE_DIR) @if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) cm-push -f $$PACKAGE_NAME local; fi - @sleep 3 + @$(HELM_BIN) repo update local #@$(HELM_BIN) repo index $(PACKAGE_DIR) clean: diff --git a/kubernetes/cds/components/Makefile b/kubernetes/cds/components/Makefile index 9544d70f33..0eca362739 100644 --- a/kubernetes/cds/components/Makefile +++ b/kubernetes/cds/components/Makefile @@ -33,10 +33,10 @@ all: $(HELM_CHARTS) $(HELM_CHARTS): @echo "\n[$@]" - @make package-$@ + @$(MAKE) package-$@ make-%: - @if [ -f $*/Makefile ]; then make -C $*; fi + @if [ -f $*/Makefile ]; then $(MAKE) -C $*; fi dep-%: make-% @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi @@ -47,7 +47,7 @@ lint-%: dep-% package-%: lint-% @mkdir -p $(PACKAGE_DIR) @if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) cm-push -f $$PACKAGE_NAME local; fi - @sleep 3 + @$(HELM_BIN) repo update local #@$(HELM_BIN) repo index $(PACKAGE_DIR) clean: diff --git a/kubernetes/common/Makefile b/kubernetes/common/Makefile index 2fce88fe84..c17dafc5bc 100644 --- a/kubernetes/common/Makefile +++ b/kubernetes/common/Makefile @@ -40,22 +40,25 @@ all: $(COMMON_CHARTS_DIR) $(PROCESSED_FIRST) $(HELM_CHARTS) $(PROCESSED_LAST) $(COMMON_CHARTS_DIR): @echo "\n[$@]" - @make package-$@ + @$(MAKE) package-$@ $(PROCESSED_FIRST): $(COMMON_CHARTS_DIR) @echo "\n[$@]" - @make package-$@ + @$(MAKE) package-$@ + +# readinessCheck depends on repositoryGenerator at the Chart.yaml level +readinessCheck: repositoryGenerator $(HELM_CHARTS): $(PROCESSED_FIRST) @echo "\n[$@]" - @make package-$@ + @$(MAKE) package-$@ $(PROCESSED_LAST): $(HELM_CHARTS) @echo "\n[$@]" - @make package-$@ + @$(MAKE) package-$@ make-%: - @if [ -f $*/Makefile ]; then make -C $*; fi + @if [ -f $*/Makefile ]; then $(MAKE) -C $*; fi dep-%: make-% @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi @@ -66,7 +69,7 @@ lint-%: dep-% package-%: lint-% @mkdir -p $(PACKAGE_DIR) @if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) cm-push -f $$PACKAGE_NAME local; fi - @sleep 3 + @$(HELM_BIN) repo update local #@$(HELM_BIN) repo index $(PACKAGE_DIR) clean: diff --git a/kubernetes/common/elasticsearch/Makefile b/kubernetes/common/elasticsearch/Makefile index ef273d0e9b..85e640b469 100644 --- a/kubernetes/common/elasticsearch/Makefile +++ b/kubernetes/common/elasticsearch/Makefile @@ -33,10 +33,10 @@ all: $(HELM_CHARTS) $(HELM_CHARTS): @echo "\n[$@]" - @make package-$@ + @$(MAKE) package-$@ make-%: - @if [ -f $*/Makefile ]; then make -C $*; fi + @if [ -f $*/Makefile ]; then $(MAKE) -C $*; fi dep-%: make-% @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi @@ -47,7 +47,7 @@ lint-%: dep-% package-%: lint-% @mkdir -p $(PACKAGE_DIR) @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) package -d $(PACKAGE_DIR) $*; fi - @sleep 3 + @$(HELM_BIN) repo update local #@$(HELM_BIN) repo index $(PACKAGE_DIR) clean: diff --git a/kubernetes/common/elasticsearch/components/Makefile b/kubernetes/common/elasticsearch/components/Makefile index 79ba2fb47e..5b4869f2bc 100644 --- a/kubernetes/common/elasticsearch/components/Makefile +++ b/kubernetes/common/elasticsearch/components/Makefile @@ -33,10 +33,10 @@ all: $(HELM_CHARTS) $(HELM_CHARTS): @echo "\n[$@]" - @make package-$@ + @$(MAKE) package-$@ make-%: - @if [ -f $*/Makefile ]; then make -C $*; fi + @if [ -f $*/Makefile ]; then $(MAKE) -C $*; fi dep-%: make-% @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi @@ -47,7 +47,7 @@ lint-%: dep-% package-%: lint-% @mkdir -p $(PACKAGE_DIR) @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) package -d $(PACKAGE_DIR) $*; fi - @sleep 3 + @$(HELM_BIN) repo update local #@$(HELM_BIN) repo index $(PACKAGE_DIR) clean: diff --git a/kubernetes/cps/Makefile b/kubernetes/cps/Makefile index 5617b0d816..3df7aa7562 100644 --- a/kubernetes/cps/Makefile +++ b/kubernetes/cps/Makefile @@ -36,10 +36,10 @@ all: $(HELM_CHARTS) $(HELM_CHARTS): @echo "\n[$@]" - @make package-$@ + @$(MAKE) package-$@ make-%: - @if [ -f $*/Makefile ]; then make -C $*; fi + @if [ -f $*/Makefile ]; then $(MAKE) -C $*; fi dep-%: make-% @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi @@ -50,7 +50,7 @@ lint-%: dep-% package-%: lint-% @mkdir -p $(PACKAGE_DIR) @if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) cm-push -f $$PACKAGE_NAME local; fi - @sleep 3 + @$(HELM_BIN) repo update local #@$(HELM_BIN) repo index $(PACKAGE_DIR) clean: diff --git a/kubernetes/cps/components/Makefile b/kubernetes/cps/components/Makefile index 616a5fc5ea..ca6dd88bf4 100644 --- a/kubernetes/cps/components/Makefile +++ b/kubernetes/cps/components/Makefile @@ -43,10 +43,10 @@ all: $(HELM_CHARTS) helm-repo-update $(HELM_CHARTS): @echo "\n[$@]" - @make package-$@ + @$(MAKE) package-$@ make-%: - @if [ -f $*/Makefile ]; then make -C $*; fi + @if [ -f $*/Makefile ]; then $(MAKE) -C $*; fi dep-%: make-% @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi @@ -57,7 +57,7 @@ lint-%: dep-% package-%: lint-% @mkdir -p $(PACKAGE_DIR) @if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) cm-push -f $$PACKAGE_NAME $(HELM_REPO); fi - @sleep 3 + @$(HELM_BIN) repo update local #@$(HELM_BIN) repo index $(PACKAGE_DIR) clean: diff --git a/kubernetes/dcaegen2-services/Makefile b/kubernetes/dcaegen2-services/Makefile index 501ab2c0da..3af4ac73d4 100644 --- a/kubernetes/dcaegen2-services/Makefile +++ b/kubernetes/dcaegen2-services/Makefile @@ -36,10 +36,13 @@ all: $(HELM_CHARTS) $(HELM_CHARTS): @echo "\n[$@]" - @make package-$@ + @$(MAKE) package-$@ + +# components depend on common/dcaegen2-services-common via @local +components: common make-%: - @if [ -f $*/Makefile ]; then make -C $*; fi + @if [ -f $*/Makefile ]; then $(MAKE) -C $*; fi dep-%: make-% @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi @@ -50,7 +53,7 @@ lint-%: dep-% package-%: lint-% @mkdir -p $(PACKAGE_DIR) @if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) cm-push -f $$PACKAGE_NAME $(HELM_REPO); fi - @sleep 3 + @$(HELM_BIN) repo update local #@$(HELM_BIN) repo index $(PACKAGE_DIR) clean: diff --git a/kubernetes/dcaegen2-services/common/Makefile b/kubernetes/dcaegen2-services/common/Makefile index 616a5fc5ea..ca6dd88bf4 100644 --- a/kubernetes/dcaegen2-services/common/Makefile +++ b/kubernetes/dcaegen2-services/common/Makefile @@ -43,10 +43,10 @@ all: $(HELM_CHARTS) helm-repo-update $(HELM_CHARTS): @echo "\n[$@]" - @make package-$@ + @$(MAKE) package-$@ make-%: - @if [ -f $*/Makefile ]; then make -C $*; fi + @if [ -f $*/Makefile ]; then $(MAKE) -C $*; fi dep-%: make-% @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi @@ -57,7 +57,7 @@ lint-%: dep-% package-%: lint-% @mkdir -p $(PACKAGE_DIR) @if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) cm-push -f $$PACKAGE_NAME $(HELM_REPO); fi - @sleep 3 + @$(HELM_BIN) repo update local #@$(HELM_BIN) repo index $(PACKAGE_DIR) clean: diff --git a/kubernetes/dcaegen2-services/components/Makefile b/kubernetes/dcaegen2-services/components/Makefile index 7a8d304690..b79637a9da 100644 --- a/kubernetes/dcaegen2-services/components/Makefile +++ b/kubernetes/dcaegen2-services/components/Makefile @@ -36,10 +36,10 @@ all: $(HELM_CHARTS) helm-repo-update $(HELM_CHARTS): @echo "\n[$@]" - @make package-$@ + @$(MAKE) package-$@ make-%: - @if [ -f $*/Makefile ]; then make -C $*; fi + @if [ -f $*/Makefile ]; then $(MAKE) -C $*; fi dep-%: make-% @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi @@ -50,7 +50,7 @@ lint-%: dep-% package-%: lint-% @mkdir -p $(PACKAGE_DIR) @if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) cm-push -f $$PACKAGE_NAME $(HELM_REPO); fi - @sleep 3 + @$(HELM_BIN) repo update local #@$(HELM_BIN) repo index $(PACKAGE_DIR) clean: diff --git a/kubernetes/make_all.py b/kubernetes/make_all.py index f7aa5487cc..2ff093aa74 100755 --- a/kubernetes/make_all.py +++ b/kubernetes/make_all.py @@ -84,7 +84,7 @@ pushed_packages = set() def check_helm_version(helm_bin: str) -> bool: """ - Check if the Helm version starts with 3.7 + Check if the Helm version is 3.x or 4.x Args: helm_bin: Path to the Helm binary @@ -106,12 +106,12 @@ def check_helm_version(helm_bin: str) -> bool: # Extract just the version number (remove leading 'v' if present) version_clean = version_output.lstrip('v') - # Check if the version starts with "3.7" - if version_clean.startswith("3.7"): - logger.info(f"Helm version {version_output} is compatible (starts with 3.7)") + # Check if the version starts with "3." or "4." + if version_clean.startswith("3.") or version_clean.startswith("4."): + logger.info(f"Helm version {version_output} is compatible") return True else: - logger.error(f"Helm version {version_output} does not start with 3.7 as required") + logger.error(f"Helm version {version_output} is not supported (requires 3.x or 4.x)") return False except Exception as e: @@ -284,6 +284,9 @@ def push_to_chartmuseum(chart_path: Union[str, Path], package_name: str, helm_bi return False else: logger.info(f"Successfully pushed {package_path_obj} to chart museum") + # Refresh local repo index so subsequent charts can resolve this as a dependency + repo_update_cmd = [helm_bin, "repo", "update", "local"] + subprocess.run(repo_update_cmd, check=False, capture_output=True, text=True) return True @@ -710,8 +713,7 @@ Examples: # Check Helm version compatibility at startup if not check_helm_version(helm_bin): - print("ERROR: Helm version 3.7.x or compatible is required to build charts.") - print("Using an incompatible version will result in hardcoded size limits preventing successful builds.") + print("ERROR: Helm version 3.x or 4.x is required to build charts.") print(f"You can specify an alternative Helm binary using the --helm-bin parameter. Current binary: {helm_bin}") return sys.exit(1) diff --git a/kubernetes/multicloud/Makefile b/kubernetes/multicloud/Makefile index 08ed7cb9da..b94f24af84 100644 --- a/kubernetes/multicloud/Makefile +++ b/kubernetes/multicloud/Makefile @@ -33,10 +33,10 @@ all: $(HELM_CHARTS) $(HELM_CHARTS): @echo "\n[$@]" - @make package-$@ + @$(MAKE) package-$@ make-%: - @if [ -f $*/Makefile ]; then make -C $*; fi + @if [ -f $*/Makefile ]; then $(MAKE) -C $*; fi dep-%: make-% @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi @@ -47,7 +47,7 @@ lint-%: dep-% package-%: lint-% @mkdir -p $(PACKAGE_DIR) @if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) cm-push -f $$PACKAGE_NAME local; fi - @sleep 3 + @$(HELM_BIN) repo update local #@$(HELM_BIN) repo index $(PACKAGE_DIR) clean: diff --git a/kubernetes/multicloud/components/Makefile b/kubernetes/multicloud/components/Makefile index 9544d70f33..0eca362739 100644 --- a/kubernetes/multicloud/components/Makefile +++ b/kubernetes/multicloud/components/Makefile @@ -33,10 +33,10 @@ all: $(HELM_CHARTS) $(HELM_CHARTS): @echo "\n[$@]" - @make package-$@ + @$(MAKE) package-$@ make-%: - @if [ -f $*/Makefile ]; then make -C $*; fi + @if [ -f $*/Makefile ]; then $(MAKE) -C $*; fi dep-%: make-% @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi @@ -47,7 +47,7 @@ lint-%: dep-% package-%: lint-% @mkdir -p $(PACKAGE_DIR) @if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) cm-push -f $$PACKAGE_NAME local; fi - @sleep 3 + @$(HELM_BIN) repo update local #@$(HELM_BIN) repo index $(PACKAGE_DIR) clean: diff --git a/kubernetes/platform/Makefile b/kubernetes/platform/Makefile index 4ecfbc53cc..13b66fca22 100644 --- a/kubernetes/platform/Makefile +++ b/kubernetes/platform/Makefile @@ -34,10 +34,10 @@ all: $(HELM_CHARTS) $(HELM_CHARTS): @echo "\n[$@]" - @make package-$@ + @$(MAKE) package-$@ make-%: - @if [ -f $*/Makefile ]; then make -C $*; fi + @if [ -f $*/Makefile ]; then $(MAKE) -C $*; fi dep-%: make-% @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi @@ -48,7 +48,7 @@ lint-%: dep-% package-%: lint-% @mkdir -p $(PACKAGE_DIR) @if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) cm-push -f $$PACKAGE_NAME local; fi - @sleep 3 + @$(HELM_BIN) repo update local #@$(HELM_BIN) repo index $(PACKAGE_DIR) clean: diff --git a/kubernetes/platform/components/Makefile b/kubernetes/platform/components/Makefile index 5970a97115..fb5568a0f1 100644 --- a/kubernetes/platform/components/Makefile +++ b/kubernetes/platform/components/Makefile @@ -35,10 +35,10 @@ all: $(HELM_CHARTS) $(HELM_CHARTS): @echo "\n[$@]" - @make package-$@ + @$(MAKE) package-$@ make-%: - @if [ -f $*/Makefile ]; then make -C $*; fi + @if [ -f $*/Makefile ]; then $(MAKE) -C $*; fi dep-%: make-% @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi @@ -49,7 +49,7 @@ lint-%: dep-% package-%: lint-% @mkdir -p $(PACKAGE_DIR) @if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) cm-push -f $$PACKAGE_NAME local; fi - @sleep 3 + @$(HELM_BIN) repo update local #@$(HELM_BIN) repo index $(PACKAGE_DIR) clean: diff --git a/kubernetes/policy/Makefile b/kubernetes/policy/Makefile index 08ed7cb9da..b94f24af84 100755 --- a/kubernetes/policy/Makefile +++ b/kubernetes/policy/Makefile @@ -33,10 +33,10 @@ all: $(HELM_CHARTS) $(HELM_CHARTS): @echo "\n[$@]" - @make package-$@ + @$(MAKE) package-$@ make-%: - @if [ -f $*/Makefile ]; then make -C $*; fi + @if [ -f $*/Makefile ]; then $(MAKE) -C $*; fi dep-%: make-% @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi @@ -47,7 +47,7 @@ lint-%: dep-% package-%: lint-% @mkdir -p $(PACKAGE_DIR) @if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) cm-push -f $$PACKAGE_NAME local; fi - @sleep 3 + @$(HELM_BIN) repo update local #@$(HELM_BIN) repo index $(PACKAGE_DIR) clean: diff --git a/kubernetes/policy/components/Makefile b/kubernetes/policy/components/Makefile index 9544d70f33..0eca362739 100755 --- a/kubernetes/policy/components/Makefile +++ b/kubernetes/policy/components/Makefile @@ -33,10 +33,10 @@ all: $(HELM_CHARTS) $(HELM_CHARTS): @echo "\n[$@]" - @make package-$@ + @$(MAKE) package-$@ make-%: - @if [ -f $*/Makefile ]; then make -C $*; fi + @if [ -f $*/Makefile ]; then $(MAKE) -C $*; fi dep-%: make-% @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi @@ -47,7 +47,7 @@ lint-%: dep-% package-%: lint-% @mkdir -p $(PACKAGE_DIR) @if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) cm-push -f $$PACKAGE_NAME local; fi - @sleep 3 + @$(HELM_BIN) repo update local #@$(HELM_BIN) repo index $(PACKAGE_DIR) clean: diff --git a/kubernetes/portal-ng/Makefile b/kubernetes/portal-ng/Makefile index 08ed7cb9da..b94f24af84 100644 --- a/kubernetes/portal-ng/Makefile +++ b/kubernetes/portal-ng/Makefile @@ -33,10 +33,10 @@ all: $(HELM_CHARTS) $(HELM_CHARTS): @echo "\n[$@]" - @make package-$@ + @$(MAKE) package-$@ make-%: - @if [ -f $*/Makefile ]; then make -C $*; fi + @if [ -f $*/Makefile ]; then $(MAKE) -C $*; fi dep-%: make-% @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi @@ -47,7 +47,7 @@ lint-%: dep-% package-%: lint-% @mkdir -p $(PACKAGE_DIR) @if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) cm-push -f $$PACKAGE_NAME local; fi - @sleep 3 + @$(HELM_BIN) repo update local #@$(HELM_BIN) repo index $(PACKAGE_DIR) clean: diff --git a/kubernetes/portal-ng/components/Makefile b/kubernetes/portal-ng/components/Makefile index 08ed7cb9da..b94f24af84 100644 --- a/kubernetes/portal-ng/components/Makefile +++ b/kubernetes/portal-ng/components/Makefile @@ -33,10 +33,10 @@ all: $(HELM_CHARTS) $(HELM_CHARTS): @echo "\n[$@]" - @make package-$@ + @$(MAKE) package-$@ make-%: - @if [ -f $*/Makefile ]; then make -C $*; fi + @if [ -f $*/Makefile ]; then $(MAKE) -C $*; fi dep-%: make-% @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi @@ -47,7 +47,7 @@ lint-%: dep-% package-%: lint-% @mkdir -p $(PACKAGE_DIR) @if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) cm-push -f $$PACKAGE_NAME local; fi - @sleep 3 + @$(HELM_BIN) repo update local #@$(HELM_BIN) repo index $(PACKAGE_DIR) clean: diff --git a/kubernetes/sdc/Makefile b/kubernetes/sdc/Makefile index d0b2b1fef6..619e68d45e 100644 --- a/kubernetes/sdc/Makefile +++ b/kubernetes/sdc/Makefile @@ -35,10 +35,10 @@ all: $(HELM_CHARTS) $(HELM_CHARTS): @echo "\n[$@]" - @make package-$@ + @$(MAKE) package-$@ make-%: - @if [ -f $*/Makefile ]; then make -C $*; fi + @if [ -f $*/Makefile ]; then $(MAKE) -C $*; fi dep-%: make-% @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi @@ -49,7 +49,7 @@ lint-%: dep-% package-%: lint-% @mkdir -p $(PACKAGE_DIR) @if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) cm-push -f $$PACKAGE_NAME local; fi - @sleep 3 + @$(HELM_BIN) repo update local #@$(HELM_BIN) repo index $(PACKAGE_DIR) clean: diff --git a/kubernetes/sdc/components/Makefile b/kubernetes/sdc/components/Makefile index 497e2b4cf9..2940bc6896 100644 --- a/kubernetes/sdc/components/Makefile +++ b/kubernetes/sdc/components/Makefile @@ -34,10 +34,10 @@ all: $(HELM_CHARTS) $(HELM_CHARTS): @echo "\n[$@]" - @make package-$@ + @$(MAKE) package-$@ make-%: - @if [ -f $*/Makefile ]; then make -C $*; fi + @if [ -f $*/Makefile ]; then $(MAKE) -C $*; fi dep-%: make-% @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi @@ -48,7 +48,7 @@ lint-%: dep-% package-%: lint-% @mkdir -p $(PACKAGE_DIR) @if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) cm-push -f $$PACKAGE_NAME local; fi - @sleep 3 + @$(HELM_BIN) repo update local #@$(HELM_BIN) repo index $(PACKAGE_DIR) clean: diff --git a/kubernetes/sdnc/Makefile b/kubernetes/sdnc/Makefile index 47f9c9f109..9440933eef 100644 --- a/kubernetes/sdnc/Makefile +++ b/kubernetes/sdnc/Makefile @@ -35,10 +35,10 @@ all: $(HELM_CHARTS) $(HELM_CHARTS): @echo "\n[$@]" - @make package-$@ + @$(MAKE) package-$@ make-%: - @if [ -f $*/Makefile ]; then make -C $*; fi + @if [ -f $*/Makefile ]; then $(MAKE) -C $*; fi dep-%: make-% @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi @@ -49,7 +49,7 @@ lint-%: dep-% package-%: lint-% @mkdir -p $(PACKAGE_DIR) @if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) cm-push -f $$PACKAGE_NAME local; fi - @sleep 3 + @$(HELM_BIN) repo update local #@$(HELM_BIN) repo index $(PACKAGE_DIR) clean: diff --git a/kubernetes/sdnc/components/Makefile b/kubernetes/sdnc/components/Makefile index 4938b2ec26..94073ce5b4 100644 --- a/kubernetes/sdnc/components/Makefile +++ b/kubernetes/sdnc/components/Makefile @@ -35,10 +35,10 @@ all: $(HELM_CHARTS) $(HELM_CHARTS): @echo "\n[$@]" - @make package-$@ + @$(MAKE) package-$@ make-%: - @if [ -f $*/Makefile ]; then make -C $*; fi + @if [ -f $*/Makefile ]; then $(MAKE) -C $*; fi dep-%: make-% @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi @@ -49,7 +49,7 @@ lint-%: dep-% package-%: lint-% @mkdir -p $(PACKAGE_DIR) @if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) cm-push -f $$PACKAGE_NAME local; fi - @sleep 3 + @$(HELM_BIN) repo update local #@$(HELM_BIN) repo index $(PACKAGE_DIR) clean: diff --git a/kubernetes/so/Makefile b/kubernetes/so/Makefile index 08ed7cb9da..b94f24af84 100644 --- a/kubernetes/so/Makefile +++ b/kubernetes/so/Makefile @@ -33,10 +33,10 @@ all: $(HELM_CHARTS) $(HELM_CHARTS): @echo "\n[$@]" - @make package-$@ + @$(MAKE) package-$@ make-%: - @if [ -f $*/Makefile ]; then make -C $*; fi + @if [ -f $*/Makefile ]; then $(MAKE) -C $*; fi dep-%: make-% @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi @@ -47,7 +47,7 @@ lint-%: dep-% package-%: lint-% @mkdir -p $(PACKAGE_DIR) @if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) cm-push -f $$PACKAGE_NAME local; fi - @sleep 3 + @$(HELM_BIN) repo update local #@$(HELM_BIN) repo index $(PACKAGE_DIR) clean: diff --git a/kubernetes/so/components/Makefile b/kubernetes/so/components/Makefile index d07f55ba37..efb8abe724 100644 --- a/kubernetes/so/components/Makefile +++ b/kubernetes/so/components/Makefile @@ -33,14 +33,14 @@ all: $(HELM_CHARTS) soHelpers: @echo "\n[$@]" - @make package-$@ + @$(MAKE) package-$@ $(HELM_CHARTS): soHelpers @echo "\n[$@]" - @make package-$@ + @$(MAKE) package-$@ make-%: - @if [ -f $*/Makefile ]; then make -C $*; fi + @if [ -f $*/Makefile ]; then $(MAKE) -C $*; fi dep-%: make-% @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi @@ -51,7 +51,7 @@ lint-%: dep-% package-%: lint-% @mkdir -p $(PACKAGE_DIR) @if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) cm-push -f $$PACKAGE_NAME local; fi - @sleep 3 + @$(HELM_BIN) repo update local #@$(HELM_BIN) repo index $(PACKAGE_DIR) clean: diff --git a/kubernetes/strimzi/Makefile b/kubernetes/strimzi/Makefile index 08ed7cb9da..b94f24af84 100644 --- a/kubernetes/strimzi/Makefile +++ b/kubernetes/strimzi/Makefile @@ -33,10 +33,10 @@ all: $(HELM_CHARTS) $(HELM_CHARTS): @echo "\n[$@]" - @make package-$@ + @$(MAKE) package-$@ make-%: - @if [ -f $*/Makefile ]; then make -C $*; fi + @if [ -f $*/Makefile ]; then $(MAKE) -C $*; fi dep-%: make-% @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi @@ -47,7 +47,7 @@ lint-%: dep-% package-%: lint-% @mkdir -p $(PACKAGE_DIR) @if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) cm-push -f $$PACKAGE_NAME local; fi - @sleep 3 + @$(HELM_BIN) repo update local #@$(HELM_BIN) repo index $(PACKAGE_DIR) clean: diff --git a/kubernetes/strimzi/components/strimzi-kafka-bridge/Makefile b/kubernetes/strimzi/components/strimzi-kafka-bridge/Makefile index ef273d0e9b..85e640b469 100644 --- a/kubernetes/strimzi/components/strimzi-kafka-bridge/Makefile +++ b/kubernetes/strimzi/components/strimzi-kafka-bridge/Makefile @@ -33,10 +33,10 @@ all: $(HELM_CHARTS) $(HELM_CHARTS): @echo "\n[$@]" - @make package-$@ + @$(MAKE) package-$@ make-%: - @if [ -f $*/Makefile ]; then make -C $*; fi + @if [ -f $*/Makefile ]; then $(MAKE) -C $*; fi dep-%: make-% @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi @@ -47,7 +47,7 @@ lint-%: dep-% package-%: lint-% @mkdir -p $(PACKAGE_DIR) @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) package -d $(PACKAGE_DIR) $*; fi - @sleep 3 + @$(HELM_BIN) repo update local #@$(HELM_BIN) repo index $(PACKAGE_DIR) clean: diff --git a/kubernetes/uui/Makefile b/kubernetes/uui/Makefile index 08ed7cb9da..b94f24af84 100644 --- a/kubernetes/uui/Makefile +++ b/kubernetes/uui/Makefile @@ -33,10 +33,10 @@ all: $(HELM_CHARTS) $(HELM_CHARTS): @echo "\n[$@]" - @make package-$@ + @$(MAKE) package-$@ make-%: - @if [ -f $*/Makefile ]; then make -C $*; fi + @if [ -f $*/Makefile ]; then $(MAKE) -C $*; fi dep-%: make-% @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi @@ -47,7 +47,7 @@ lint-%: dep-% package-%: lint-% @mkdir -p $(PACKAGE_DIR) @if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) cm-push -f $$PACKAGE_NAME local; fi - @sleep 3 + @$(HELM_BIN) repo update local #@$(HELM_BIN) repo index $(PACKAGE_DIR) clean: diff --git a/kubernetes/uui/components/Makefile b/kubernetes/uui/components/Makefile index 9544d70f33..0eca362739 100644 --- a/kubernetes/uui/components/Makefile +++ b/kubernetes/uui/components/Makefile @@ -33,10 +33,10 @@ all: $(HELM_CHARTS) $(HELM_CHARTS): @echo "\n[$@]" - @make package-$@ + @$(MAKE) package-$@ make-%: - @if [ -f $*/Makefile ]; then make -C $*; fi + @if [ -f $*/Makefile ]; then $(MAKE) -C $*; fi dep-%: make-% @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi @@ -47,7 +47,7 @@ lint-%: dep-% package-%: lint-% @mkdir -p $(PACKAGE_DIR) @if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) cm-push -f $$PACKAGE_NAME local; fi - @sleep 3 + @$(HELM_BIN) repo update local #@$(HELM_BIN) repo index $(PACKAGE_DIR) clean: