Update makefiles to use specific helm version

Helm is now called by HELM_BIN variable which by default is set to helm
and makefiles use helm from path. HELM_BIN can be overwritten so user
can have two version of helm in system and choose which one to use.

Signed-off-by: Jakub Latusek <j.latusek@samsung.com>
Issue-ID: OOM-2562
Change-Id: I0917796aafe234e87afa0ac3c4c15720296276d5

diff --git a/docs/oom_quickstart_guide.rst b/docs/oom_quickstart_guide.rst
index bc4329e..5c0d512 100644 (file)
--- a/docs/oom_quickstart_guide.rst
+++ b/docs/oom_quickstart_guide.rst
@@ -157,7 +157,11 @@ follows::
 
 **Step 6.** Build a local Helm repository (from the kubernetes directory)::
 
 
 **Step 6.** Build a local Helm repository (from the kubernetes directory)::
 

-  > make SKIP_LINT=TRUE all; make SKIP_LINT=TRUE onap
+  > make SKIP_LINT=TRUE [HELM_BIN=<HELM_PATH>] all ; make SKIP_LINT=TRUE [HELM_BIN=<HELM_PATH>] onap
+
+`HELM_BIN`
+  Sets the helm binary to be used. The default value use helm from PATH. Allow the user to have
+  multiple version of helm in operating system and choose which one to use.

 
 **Step 7.** Display the onap charts that available to be deployed::
 
 
 **Step 7.** Display the onap charts that available to be deployed::
 

diff --git a/docs/oom_user_guide.rst b/docs/oom_user_guide.rst
index 8a7ebfc..74f24da 100644 (file)
--- a/docs/oom_user_guide.rst
+++ b/docs/oom_user_guide.rst
@@ -139,7 +139,11 @@ To get a list of all of the available Helm chart repositories::
 
 Then build your local Helm repository::
 
 
 Then build your local Helm repository::
 

-  > make SKIP_LINT=TRUE all
+  > make SKIP_LINT=TRUE [HELM_BIN=<HELM_PATH>] all
+
+`HELM_BIN`
+  Sets the helm binary to be used. The default value use helm from PATH. Allow the user to have
+  multiple version of helm in operating system and choose which one to use.

 
 The Helm search command reads through all of the repositories configured on the
 system, and looks for matches::
 
 The Helm search command reads through all of the repositories configured on the
 system, and looks for matches::

diff --git a/kubernetes/Makefile b/kubernetes/Makefile
index dfad45f..db361fb 100644 (file)
--- a/kubernetes/Makefile
+++ b/kubernetes/Makefile
@@ -19,10 +19,11 @@ ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 OUTPUT_DIR := $(ROOT_DIR)/dist
 PACKAGE_DIR := $(OUTPUT_DIR)/packages
 SECRET_DIR := $(OUTPUT_DIR)/secrets
 OUTPUT_DIR := $(ROOT_DIR)/dist
 PACKAGE_DIR := $(OUTPUT_DIR)/packages
 SECRET_DIR := $(OUTPUT_DIR)/secrets

-HELM_VER := $(shell helm version --template "{{.Version}}")
+HELM_BIN := helm
+HELM_VER := $(shell $(HELM_BIN) version --template "{{.Version}}")

 
 ifneq ($(SKIP_LINT),TRUE)
 
 ifneq ($(SKIP_LINT),TRUE)

-       HELM_LINT_CMD := helm lint
+       HELM_LINT_CMD := $(HELM_BIN) lint

 else
        HELM_LINT_CMD := echo "Skipping linting of"
 endif
 else
        HELM_LINT_CMD := echo "Skipping linting of"
 endif


@@ -59,7 +60,7 @@ make-%:
        @if [ -f $*/Makefile ]; then make -C $*; fi
 
 dep-%: make-%
        @if [ -f $*/Makefile ]; then make -C $*; fi
 
 dep-%: make-%

-       @if [ -f $*/requirements.yaml ]; then helm dep up $*; fi
+       @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi

 
 lint-%: dep-%
        @if [ -f $*/Chart.yaml ]; then $(HELM_LINT_CMD) $*; fi
 
 lint-%: dep-%
        @if [ -f $*/Chart.yaml ]; then $(HELM_LINT_CMD) $*; fi


@@ -67,12 +68,12 @@ lint-%: dep-%
 package-%: lint-%
        @mkdir -p $(PACKAGE_DIR)
 ifeq "$(findstring v3,$(HELM_VER))" "v3"
 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
+       @if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) push -f $$PACKAGE_NAME local; fi

 else
 else

-       @if [ -f $*/Chart.yaml ]; then helm package -d $(PACKAGE_DIR) $*; fi
+       @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) package -d $(PACKAGE_DIR) $*; fi

 endif
 
 endif
 

-       @helm repo index $(PACKAGE_DIR)
+       @$(HELM_BIN) repo index $(PACKAGE_DIR)

 
 clean:
        @rm -f */requirements.lock
 
 clean:
        @rm -f */requirements.lock


@@ -81,19 +82,19 @@ clean:
 
 # publish helm plugins via distrubtion directory
 plugins:
 
 # publish helm plugins via distrubtion directory
 plugins:

-       @cp -R helm $(PACKAGE_DIR)/
+       @cp -R $(HELM_BIN) $(PACKAGE_DIR)/

 
 # start up a local helm repo to serve up helm chart packages
 repo:
        @mkdir -p $(PACKAGE_DIR)
 
 # start up a local helm repo to serve up helm chart packages
 repo:
        @mkdir -p $(PACKAGE_DIR)

-       @helm serve --repo-path $(PACKAGE_DIR) &
+       @$(HELM_BIN) serve --repo-path $(PACKAGE_DIR) &

        @sleep 3
        @sleep 3

-       @helm repo index $(PACKAGE_DIR)
-       @helm repo add local http://127.0.0.1:8879
+       @$(HELM_BIN) repo index $(PACKAGE_DIR)
+       @$(HELM_BIN) repo add local http://127.0.0.1:8879

 
 # stop local helm repo
 repo-stop:
 
 # stop local helm repo
 repo-stop:

-       @pkill helm
-       @helm repo remove local
+       @pkill $(HELM_BIN)
+       @$(HELM_BIN) repo remove local

 %:
        @:
 %:
        @:

diff --git a/kubernetes/aaf/Makefile b/kubernetes/aaf/Makefile
index 9396001..764533e 100644 (file)
--- a/kubernetes/aaf/Makefile
+++ b/kubernetes/aaf/Makefile
@@ -18,6 +18,7 @@ PACKAGE_DIR := $(OUTPUT_DIR)/packages
 SECRET_DIR := $(OUTPUT_DIR)/secrets
 
 EXCLUDES := dist resources templates charts
 SECRET_DIR := $(OUTPUT_DIR)/secrets
 
 EXCLUDES := dist resources templates charts

+HELM_BIN := helm

 HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
 
 .PHONY: $(EXCLUDES) $(HELM_CHARTS)
 HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
 
 .PHONY: $(EXCLUDES) $(HELM_CHARTS)


@@ -32,15 +33,15 @@ make-%:
        @if [ -f $*/Makefile ]; then make -C $*; fi
 
 dep-%: make-%
        @if [ -f $*/Makefile ]; then make -C $*; fi
 
 dep-%: make-%

-       @if [ -f $*/requirements.yaml ]; then helm dep up $*; fi
+       @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi

 
 lint-%: dep-%
 
 lint-%: dep-%

-       @if [ -f $*/Chart.yaml ]; then helm lint $*; fi
+       @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi

 
 package-%: lint-%
        @mkdir -p $(PACKAGE_DIR)
 
 package-%: lint-%
        @mkdir -p $(PACKAGE_DIR)

-       @if [ -f $*/Chart.yaml ]; then helm package -d $(PACKAGE_DIR) $*; fi
-       @helm repo index $(PACKAGE_DIR)
+       @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) package -d $(PACKAGE_DIR) $*; fi
+       @$(HELM_BIN) repo index $(PACKAGE_DIR)

 
 clean:
        @rm -f */requirements.lock
 
 clean:
        @rm -f */requirements.lock

diff --git a/kubernetes/aaf/components/Makefile b/kubernetes/aaf/components/Makefile
index 2fc0cbe..bf267b7 100644 (file)
--- a/kubernetes/aaf/components/Makefile
+++ b/kubernetes/aaf/components/Makefile
@@ -18,6 +18,7 @@ PACKAGE_DIR := $(OUTPUT_DIR)/packages
 SECRET_DIR := $(OUTPUT_DIR)/secrets
 
 EXCLUDES :=
 SECRET_DIR := $(OUTPUT_DIR)/secrets
 
 EXCLUDES :=

+HELM_BIN := helm

 HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
 
 .PHONY: $(EXCLUDES) $(HELM_CHARTS)
 HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
 
 .PHONY: $(EXCLUDES) $(HELM_CHARTS)


@@ -32,15 +33,15 @@ make-%:
        @if [ -f $*/Makefile ]; then make -C $*; fi
 
 dep-%: make-%
        @if [ -f $*/Makefile ]; then make -C $*; fi
 
 dep-%: make-%

-       @if [ -f $*/requirements.yaml ]; then helm dep up $*; fi
+       @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi

 
 lint-%: dep-%
 
 lint-%: dep-%

-       @if [ -f $*/Chart.yaml ]; then helm lint $*; fi
+       @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi

 
 package-%: lint-%
        @mkdir -p $(PACKAGE_DIR)
 
 package-%: lint-%
        @mkdir -p $(PACKAGE_DIR)

-       @if [ -f $*/Chart.yaml ]; then helm package -d $(PACKAGE_DIR) $*; fi
-       @helm repo index $(PACKAGE_DIR)
+       @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) package -d $(PACKAGE_DIR) $*; fi
+       @$(HELM_BIN) repo index $(PACKAGE_DIR)

 
 clean:
        @rm -f */requirements.lock
 
 clean:
        @rm -f */requirements.lock

diff --git a/kubernetes/clamp/Makefile b/kubernetes/clamp/Makefile
index 248fb05..89b2f46 100644 (file)
--- a/kubernetes/clamp/Makefile
+++ b/kubernetes/clamp/Makefile
@@ -18,8 +18,9 @@ PACKAGE_DIR := $(OUTPUT_DIR)/packages
 SECRET_DIR := $(OUTPUT_DIR)/secrets
 
 EXCLUDES := dist resources templates charts docker
 SECRET_DIR := $(OUTPUT_DIR)/secrets
 
 EXCLUDES := dist resources templates charts docker

+HELM_BIN := helm

 HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
 HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))

-HELM_VER := $(shell helm version --template "{{.Version}}")
+HELM_VER := $(shell $(HELM_BIN) version --template "{{.Version}}")

 
 .PHONY: $(EXCLUDES) $(HELM_CHARTS)
 
 
 .PHONY: $(EXCLUDES) $(HELM_CHARTS)
 


@@ -33,19 +34,19 @@ make-%:
        @if [ -f $*/Makefile ]; then make -C $*; fi
 
 dep-%: make-%
        @if [ -f $*/Makefile ]; then make -C $*; fi
 
 dep-%: make-%

-       @if [ -f $*/requirements.yaml ]; then helm dep up $*; fi
+       @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi

 
 lint-%: dep-%
 
 lint-%: dep-%

-       @if [ -f $*/Chart.yaml ]; then helm lint $*; fi
+       @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi

 
 package-%: lint-%
        @mkdir -p $(PACKAGE_DIR)
 ifeq "$(findstring v3,$(HELM_VER))" "v3"
 
 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
+       @if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) push -f $$PACKAGE_NAME local; fi

 else
 else

-       @if [ -f $*/Chart.yaml ]; then helm package -d $(PACKAGE_DIR) $*; fi
+       @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) package -d $(PACKAGE_DIR) $*; fi

 endif
 endif

-       @helm repo index $(PACKAGE_DIR)
+       @$(HELM_BIN) repo index $(PACKAGE_DIR)

 
 clean:
        @rm -f */requirements.lock
 
 clean:
        @rm -f */requirements.lock

diff --git a/kubernetes/clamp/components/Makefile b/kubernetes/clamp/components/Makefile
index acaf7fb..bf267b7 100644 (file)
--- a/kubernetes/clamp/components/Makefile
+++ b/kubernetes/clamp/components/Makefile
@@ -18,6 +18,7 @@ PACKAGE_DIR := $(OUTPUT_DIR)/packages
 SECRET_DIR := $(OUTPUT_DIR)/secrets
 
 EXCLUDES :=
 SECRET_DIR := $(OUTPUT_DIR)/secrets
 
 EXCLUDES :=

+HELM_BIN := helm

 HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
 
 .PHONY: $(EXCLUDES) $(HELM_CHARTS)
 HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
 
 .PHONY: $(EXCLUDES) $(HELM_CHARTS)


@@ -32,19 +33,19 @@ make-%:
        @if [ -f $*/Makefile ]; then make -C $*; fi
 
 dep-%: make-%
        @if [ -f $*/Makefile ]; then make -C $*; fi
 
 dep-%: make-%

-       @if [ -f $*/requirements.yaml ]; then helm dep up $*; fi
+       @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi

 
 lint-%: dep-%
 
 lint-%: dep-%

-       @if [ -f $*/Chart.yaml ]; then helm lint $*; fi
+       @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi

 
 package-%: lint-%
        @mkdir -p $(PACKAGE_DIR)
 
 package-%: lint-%
        @mkdir -p $(PACKAGE_DIR)

-       @if [ -f $*/Chart.yaml ]; then helm package -d $(PACKAGE_DIR) $*; fi
-       @helm repo index $(PACKAGE_DIR)
+       @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) package -d $(PACKAGE_DIR) $*; fi
+       @$(HELM_BIN) repo index $(PACKAGE_DIR)

 
 clean:
        @rm -f */requirements.lock
        @rm -f *tgz */charts/*tgz
        @rm -rf $(PACKAGE_DIR)
 %:
 
 clean:
        @rm -f */requirements.lock
        @rm -f *tgz */charts/*tgz
        @rm -rf $(PACKAGE_DIR)
 %:

-       @:
\ No newline at end of file
+       @:

diff --git a/kubernetes/common/Makefile b/kubernetes/common/Makefile
index 0e923b7..58125f8 100644 (file)
--- a/kubernetes/common/Makefile
+++ b/kubernetes/common/Makefile
@@ -20,9 +20,10 @@ SECRET_DIR := $(OUTPUT_DIR)/secrets
 COMMON_CHARTS_DIR := common
 
 EXCLUDES :=
 COMMON_CHARTS_DIR := common
 
 EXCLUDES :=

-HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))

 
 

-HELM_VER := $(shell helm version --template "{{.Version}}")
+HELM_BIN := helm
+HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
+HELM_VER := $(shell $(HELM_BIN) version --template "{{.Version}}")

 
 .PHONY: $(EXCLUDES) $(HELM_CHARTS)
 
 
 .PHONY: $(EXCLUDES) $(HELM_CHARTS)
 


@@ -36,19 +37,19 @@ make-%:
        @if [ -f $*/Makefile ]; then make -C $*; fi
 
 dep-%: make-%
        @if [ -f $*/Makefile ]; then make -C $*; fi
 
 dep-%: make-%

-       @if [ -f $*/requirements.yaml ]; then helm dep up $*; fi
+       @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi

 
 lint-%: dep-%
 
 lint-%: dep-%

-       @if [ -f $*/Chart.yaml ]; then helm lint $*; fi
+       @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi

 
 package-%: lint-%
        @mkdir -p $(PACKAGE_DIR)
 ifeq "$(findstring v3,$(HELM_VER))" "v3"
 
 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
+       @if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) push -f $$PACKAGE_NAME local; fi

 else
 else

-       @if [ -f $*/Chart.yaml ]; then helm package -d $(PACKAGE_DIR) $*; fi
+       @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) package -d $(PACKAGE_DIR) $*; fi

 endif
 endif

-       @helm repo index $(PACKAGE_DIR)
+       @$(HELM_BIN) repo index $(PACKAGE_DIR)

 
 clean:
        @rm -f */requirements.lock
 
 clean:
        @rm -f */requirements.lock

diff --git a/kubernetes/contrib/Makefile b/kubernetes/contrib/Makefile
index eb9f025..32386fc 100644 (file)
--- a/kubernetes/contrib/Makefile
+++ b/kubernetes/contrib/Makefile
@@ -11,20 +11,21 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.

+HELM_BIN := helm

 
 make-contrib: make-contrib-awx make-contrib-netbox make-contrib-ejbca make-contrib-core
 
 make-contrib-awx:
 
 make-contrib: make-contrib-awx make-contrib-netbox make-contrib-ejbca make-contrib-core
 
 make-contrib-awx:

-       cd components && helm dep up awx && helm lint awx
+       cd components && $(HELM_BIN) dep up awx && $(HELM_BIN) lint awx

 
 make-contrib-ejbca:
 
 make-contrib-ejbca:

-       cd components && helm dep up ejbca && helm lint ejbca
+       cd components && $(HELM_BIN) dep up ejbca && $(HELM_BIN) lint ejbca

 
 make-contrib-netbox:
 
 make-contrib-netbox:

-       cd components && helm dep up netbox && helm lint netbox
+       cd components && $(HELM_BIN) dep up netbox && $(HELM_BIN) lint netbox

 
 make-contrib-core:
 
 make-contrib-core:

-       helm dep up . && helm lint .
+       $(HELM_BIN) dep up . && $(HELM_BIN) lint .

 
 clean:
        @find . -type f -name '*.tgz' -delete
 
 clean:
        @find . -type f -name '*.tgz' -delete

diff --git a/kubernetes/contrib/components/awx/Makefile b/kubernetes/contrib/components/awx/Makefile
index d8a5033..cb88b57 100644 (file)
--- a/kubernetes/contrib/components/awx/Makefile
+++ b/kubernetes/contrib/components/awx/Makefile
@@ -11,6 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.

+HELM_BIN := helm

 
 make-awx:
 
 make-awx:

-       cd charts && helm dep up awx-postgres
+       cd charts && $(HELM_BIN) dep up awx-postgres

diff --git a/kubernetes/contrib/components/netbox/Makefile b/kubernetes/contrib/components/netbox/Makefile
index 3194d40..da18203 100644 (file)
--- a/kubernetes/contrib/components/netbox/Makefile
+++ b/kubernetes/contrib/components/netbox/Makefile
@@ -11,6 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.

+HELM_BIN := helm

 
 make-netbox:
 
 make-netbox:

-       cd charts && helm dep up netbox-postgres && helm dep up netbox-nginx && helm dep up netbox-app
+       cd charts && $(HELM_BIN) dep up netbox-postgres && $(HELM_BIN) dep up netbox-nginx && $(HELM_BIN) dep up netbox-app

diff --git a/kubernetes/dcaegen2/Makefile b/kubernetes/dcaegen2/Makefile
index 0561f20..bf20455 100644 (file)
--- a/kubernetes/dcaegen2/Makefile
+++ b/kubernetes/dcaegen2/Makefile
@@ -11,34 +11,36 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.

+HELM_BIN := helm
+

 make-dcaegen2: make-dcae-bootstrap make-dcae-cloudify-manager make-dcae-config-binding-service make-dcae-healthcheck make-dcae-servicechange-handler make-dcae-inventory-api make-dcae-deployment-handler make-dcae-policy-handler make-dcae-dashboard
 
 make-dcae-bootstrap:
 make-dcaegen2: make-dcae-bootstrap make-dcae-cloudify-manager make-dcae-config-binding-service make-dcae-healthcheck make-dcae-servicechange-handler make-dcae-inventory-api make-dcae-deployment-handler make-dcae-policy-handler make-dcae-dashboard
 
 make-dcae-bootstrap:

-       cd components && helm dep up dcae-bootstrap && helm lint dcae-bootstrap
+       cd components && $(HELM_BIN) dep up dcae-bootstrap && $(HELM_BIN) lint dcae-bootstrap

 
 make-dcae-cloudify-manager:
 
 make-dcae-cloudify-manager:

-       cd components && helm dep up dcae-cloudify-manager && helm lint dcae-cloudify-manager
+       cd components && $(HELM_BIN) dep up dcae-cloudify-manager && $(HELM_BIN) lint dcae-cloudify-manager

 
 make-dcae-config-binding-service:
 
 make-dcae-config-binding-service:

-       cd components && helm dep up dcae-config-binding-service && helm lint dcae-config-binding-service
+       cd components && $(HELM_BIN) dep up dcae-config-binding-service && $(HELM_BIN) lint dcae-config-binding-service

 
 make-dcae-healthcheck:
 
 make-dcae-healthcheck:

-       cd components && helm dep up dcae-healthcheck && helm lint dcae-healthcheck
+       cd components && $(HELM_BIN) dep up dcae-healthcheck && $(HELM_BIN) lint dcae-healthcheck

 
 make-dcae-servicechange-handler:
 
 make-dcae-servicechange-handler:

-       cd components && helm dep up dcae-servicechange-handler && helm lint dcae-servicechange-handler
+       cd components && $(HELM_BIN) dep up dcae-servicechange-handler && $(HELM_BIN) lint dcae-servicechange-handler

 
 make-dcae-inventory-api:
 
 make-dcae-inventory-api:

-       cd components && helm dep up dcae-inventory-api && helm lint dcae-inventory-api
+       cd components && $(HELM_BIN) dep up dcae-inventory-api && $(HELM_BIN) lint dcae-inventory-api

 
 make-dcae-deployment-handler:
 
 make-dcae-deployment-handler:

-       cd components && helm dep up dcae-deployment-handler && helm lint dcae-deployment-handler
+       cd components && $(HELM_BIN) dep up dcae-deployment-handler && $(HELM_BIN) lint dcae-deployment-handler

 
 make-dcae-policy-handler:
 
 make-dcae-policy-handler:

-       cd components && helm dep up dcae-policy-handler && helm lint dcae-policy-handler
+       cd components && $(HELM_BIN) dep up dcae-policy-handler && $(HELM_BIN) lint dcae-policy-handler

 
 make-dcae-dashboard:
 
 make-dcae-dashboard:

-       cd components && helm dep up dcae-dashboard && helm lint dcae-dashboard
+       cd components && $(HELM_BIN) dep up dcae-dashboard && $(HELM_BIN) lint dcae-dashboard

 
 clean:
        @find . -type f -name '*.tgz' -delete
 
 clean:
        @find . -type f -name '*.tgz' -delete

diff --git a/kubernetes/dcaemod/Makefile b/kubernetes/dcaemod/Makefile
index b7cf1a6..044e0cd 100644 (file)
--- a/kubernetes/dcaemod/Makefile
+++ b/kubernetes/dcaemod/Makefile
@@ -11,28 +11,30 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.

+HELM_BIN := helm
+

 make-dcaemod: make-dcaemod-distributor-api make-dcaemod-genprocessor make-dcaemod-designtool make-dcaemod-onboarding-api make-dcaemod-runtime-api make-dcaemod-nifi-registry make-dcaemod-healthcheck
 
 make-dcaemod-distributor-api:
 make-dcaemod: make-dcaemod-distributor-api make-dcaemod-genprocessor make-dcaemod-designtool make-dcaemod-onboarding-api make-dcaemod-runtime-api make-dcaemod-nifi-registry make-dcaemod-healthcheck
 
 make-dcaemod-distributor-api:

-       cd components && helm dep up dcaemod-genprocessor && helm lint dcaemod-genprocessor
+       cd components && $(HELM_BIN) dep up dcaemod-genprocessor && $(HELM_BIN) lint dcaemod-genprocessor

 
 make-dcaemod-genprocessor:
 
 make-dcaemod-genprocessor:

-       cd components && helm dep up dcaemod-distributor-api && helm lint dcaemod-distributor-api
+       cd components && $(HELM_BIN) dep up dcaemod-distributor-api && $(HELM_BIN) lint dcaemod-distributor-api

 
 make-dcaemod-designtool:
 
 make-dcaemod-designtool:

-       cd components && helm dep up dcaemod-designtool && helm lint dcaemod-designtool
+       cd components && $(HELM_BIN) dep up dcaemod-designtool && $(HELM_BIN) lint dcaemod-designtool

 
 make-dcaemod-onboarding-api:
 
 make-dcaemod-onboarding-api:

-       cd components && helm dep up dcaemod-onboarding-api && helm lint dcaemod-onboarding-api
+       cd components && $(HELM_BIN) dep up dcaemod-onboarding-api && $(HELM_BIN) lint dcaemod-onboarding-api

 
 make-dcaemod-runtime-api:
 
 make-dcaemod-runtime-api:

-       cd components && helm dep up dcaemod-runtime-api && helm lint dcaemod-runtime-api
+       cd components && $(HELM_BIN) dep up dcaemod-runtime-api && $(HELM_BIN) lint dcaemod-runtime-api

 
 make-dcaemod-nifi-registry:
 
 make-dcaemod-nifi-registry:

-       cd components && helm dep up dcaemod-nifi-registry && helm lint dcaemod-nifi-registry
+       cd components && $(HELM_BIN) dep up dcaemod-nifi-registry && $(HELM_BIN) lint dcaemod-nifi-registry

 
 make-dcaemod-healthcheck:
 
 make-dcaemod-healthcheck:

-       cd components && helm dep up dcaemod-healthcheck && helm lint dcaemod-healthcheck
+       cd components && $(HELM_BIN) dep up dcaemod-healthcheck && $(HELM_BIN) lint dcaemod-healthcheck

 
 clean:
        @find . -type f -name '*.tgz' -delete
 
 clean:
        @find . -type f -name '*.tgz' -delete

diff --git a/kubernetes/dmaap/Makefile b/kubernetes/dmaap/Makefile
index 3a19311..92291c6 100644 (file)
--- a/kubernetes/dmaap/Makefile
+++ b/kubernetes/dmaap/Makefile
@@ -11,20 +11,21 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.

+HELM_BIN := helm

 
 make-dmaap: make-dmaap-bc make-message-router make-dmaap-dr-node make-dmaap-dr-prov
 
 make-dmaap-bc:
 
 make-dmaap: make-dmaap-bc make-message-router make-dmaap-dr-node make-dmaap-dr-prov
 
 make-dmaap-bc:

-       cd components && helm dep up dmaap-bc && helm lint dmaap-bc
+       cd components && $(HELM_BIN) dep up dmaap-bc && $(HELM_BIN) lint dmaap-bc

 
 make-message-router:
 
 make-message-router:

-       cd components && helm dep up message-router && helm lint message-router
+       cd components && $(HELM_BIN) dep up message-router && $(HELM_BIN) lint message-router

 
 make-dmaap-dr-node:
 
 make-dmaap-dr-node:

-       cd components && helm dep up dmaap-dr-node && helm lint dmaap-dr-node
+       cd components && $(HELM_BIN) dep up dmaap-dr-node && $(HELM_BIN) lint dmaap-dr-node

 
 make-dmaap-dr-prov:
 
 make-dmaap-dr-prov:

-       cd components && helm dep up dmaap-dr-prov && helm lint dmaap-dr-prov
+       cd components && $(HELM_BIN) dep up dmaap-dr-prov && $(HELM_BIN) lint dmaap-dr-prov

 
 clean:
        @find . -type f -name '*.tgz' -delete
 
 clean:
        @find . -type f -name '*.tgz' -delete

diff --git a/kubernetes/modeling/Makefile b/kubernetes/modeling/Makefile
index 82f7cf4..94a9462 100644 (file)
--- a/kubernetes/modeling/Makefile
+++ b/kubernetes/modeling/Makefile
@@ -11,11 +11,12 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.

+HELM_BIN := helm

 
 make-modeling: make-modeling-etsicatalog
 
 make-modeling-etsicatalog:
 
 make-modeling: make-modeling-etsicatalog
 
 make-modeling-etsicatalog:

-       cd charts && helm dep up modeling-etsicatalog && helm lint modeling-etsicatalog
+       cd charts && $(HELM_BIN) dep up modeling-etsicatalog && $(HELM_BIN) lint modeling-etsicatalog

 clean:
        @find . -type f -name '*.tgz' -delete
        @find . -type f -name '*.lock' -delete
 clean:
        @find . -type f -name '*.tgz' -delete
        @find . -type f -name '*.lock' -delete

diff --git a/kubernetes/multicloud/Makefile b/kubernetes/multicloud/Makefile
index fde2990..027e2af 100644 (file)
--- a/kubernetes/multicloud/Makefile
+++ b/kubernetes/multicloud/Makefile
@@ -11,8 +11,9 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.

+HELM_BIN := helm

 
 make-multicloud: make-multicloud-k8s
 
 make-multicloud-k8s:
 
 make-multicloud: make-multicloud-k8s
 
 make-multicloud-k8s:

-       cd charts && helm dep up multicloud-k8s && helm lint multicloud-k8s
+       cd charts && $(HELM_BIN) dep up multicloud-k8s && $(HELM_BIN) lint multicloud-k8s

diff --git a/kubernetes/oof/Makefile b/kubernetes/oof/Makefile
index 4628206..ad7fad7 100644 (file)
--- a/kubernetes/oof/Makefile
+++ b/kubernetes/oof/Makefile
@@ -18,8 +18,9 @@ PACKAGE_DIR := $(OUTPUT_DIR)/packages
 SECRET_DIR := $(OUTPUT_DIR)/secrets
 
 EXCLUDES := dist resources templates charts docker
 SECRET_DIR := $(OUTPUT_DIR)/secrets
 
 EXCLUDES := dist resources templates charts docker

+HELM_BIN := helm

 HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
 HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))

-HELM_VER := $(shell helm version --template "{{.Version}}")
+HELM_VER := $(shell $(HELM_BIN) version --template "{{.Version}}")

 
 .PHONY: $(EXCLUDES) $(HELM_CHARTS)
 
 
 .PHONY: $(EXCLUDES) $(HELM_CHARTS)
 


@@ -33,20 +34,20 @@ make-%:
        @if [ -f $*/Makefile ]; then make -C $*; fi
 
 dep-%: make-%
        @if [ -f $*/Makefile ]; then make -C $*; fi
 
 dep-%: make-%

-       @if [ -f $*/requirements.yaml ]; then helm dep up $*; fi
+       @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi

 
 lint-%: dep-%
 
 lint-%: dep-%

-       @if [ -f $*/Chart.yaml ]; then helm lint $*; fi
+       @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi

 
 package-%: lint-%
        @mkdir -p $(PACKAGE_DIR)
 ifeq "$(findstring v3,$(HELM_VER))" "v3"
 
 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
+       @if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) push -f $$PACKAGE_NAME local; fi

 else
 else

-       @if [ -f $*/Chart.yaml ]; then helm package -d $(PACKAGE_DIR) $*; fi
+       @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) package -d $(PACKAGE_DIR) $*; fi

 endif
 
 endif
 

-       @helm repo index $(PACKAGE_DIR)
+       @$(HELM_BIN) repo index $(PACKAGE_DIR)

 
 clean:
        @rm -f */requirements.lock
 
 clean:
        @rm -f */requirements.lock

diff --git a/kubernetes/oof/components/Makefile b/kubernetes/oof/components/Makefile
index 0237136..d62cb0b 100755 (executable)
--- a/kubernetes/oof/components/Makefile
+++ b/kubernetes/oof/components/Makefile
@@ -18,8 +18,9 @@ PACKAGE_DIR := $(OUTPUT_DIR)/packages
 SECRET_DIR := $(OUTPUT_DIR)/secrets
 
 EXCLUDES :=
 SECRET_DIR := $(OUTPUT_DIR)/secrets
 
 EXCLUDES :=

+HELM_BIN := helm

 HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
 HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))

-HELM_VER := $(shell helm version --template "{{.Version}}")
+HELM_VER := $(shell $(HELM_BIN) version --template "{{.Version}}")

 
 .PHONY: $(EXCLUDES) $(HELM_CHARTS)
 
 
 .PHONY: $(EXCLUDES) $(HELM_CHARTS)
 


@@ -33,19 +34,19 @@ make-%:
        @if [ -f $*/Makefile ]; then make -C $*; fi
 
 dep-%: make-%
        @if [ -f $*/Makefile ]; then make -C $*; fi
 
 dep-%: make-%

-       @if [ -f $*/requirements.yaml ]; then helm dep up $*; fi
+       @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi

 
 lint-%: dep-%
 
 lint-%: dep-%

-       @if [ -f $*/Chart.yaml ]; then helm lint $*; fi
+       @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi

 
 package-%: lint-%
        @mkdir -p $(PACKAGE_DIR)
 ifeq "$(findstring v3,$(HELM_VER))" "v3"
 
 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
+       @if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) push -f $$PACKAGE_NAME local; fi

 else
 else

-       @if [ -f $*/Chart.yaml ]; then helm package -d $(PACKAGE_DIR) $*; fi
+       @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) package -d $(PACKAGE_DIR) $*; fi

 endif
 endif

-       @helm repo index $(PACKAGE_DIR)
+       @$(HELM_BIN) repo index $(PACKAGE_DIR)

 
 clean:
        @rm -f */requirements.lock
 
 clean:
        @rm -f */requirements.lock

diff --git a/kubernetes/oof/components/oof-cmso/Makefile b/kubernetes/oof/components/oof-cmso/Makefile
index 48cebe9..33d6104 100644 (file)
--- a/kubernetes/oof/components/oof-cmso/Makefile
+++ b/kubernetes/oof/components/oof-cmso/Makefile
@@ -18,8 +18,9 @@ PACKAGE_DIR := $(OUTPUT_DIR)/packages
 SECRET_DIR := $(OUTPUT_DIR)/secrets
 
 EXCLUDES := dist resources templates charts docker
 SECRET_DIR := $(OUTPUT_DIR)/secrets
 
 EXCLUDES := dist resources templates charts docker

+HELM_BIN := helm

 HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
 HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))

-HELM_VER := $(shell helm version --template "{{.Version}}")
+HELM_VER := $(shell $(HELM_BIN) version --template "{{.Version}}")

 
 .PHONY: $(EXCLUDES) $(HELM_CHARTS)
 
 
 .PHONY: $(EXCLUDES) $(HELM_CHARTS)
 


@@ -33,19 +34,19 @@ make-%:
        @if [ -f $*/Makefile ]; then make -C $*; fi
 
 dep-%: make-%
        @if [ -f $*/Makefile ]; then make -C $*; fi
 
 dep-%: make-%

-       @if [ -f $*/requirements.yaml ]; then helm dep up $*; fi
+       @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi

 
 lint-%: dep-%
 
 lint-%: dep-%

-       @if [ -f $*/Chart.yaml ]; then helm lint $*; fi
+       @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi

 
 package-%: lint-%
        @mkdir -p $(PACKAGE_DIR)
 ifeq "$(findstring v3,$(HELM_VER))" "v3"
 
 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
+       @if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) push -f $$PACKAGE_NAME local; fi

 else
 else

-       @if [ -f $*/Chart.yaml ]; then helm package -d $(PACKAGE_DIR) $*; fi
+       @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) package -d $(PACKAGE_DIR) $*; fi

 endif
 endif

-       @helm repo index $(PACKAGE_DIR)
+       @$(HELM_BIN) repo index $(PACKAGE_DIR)

 
 clean:
        @rm -f */requirements.lock
 
 clean:
        @rm -f */requirements.lock

diff --git a/kubernetes/oof/components/oof-cmso/components/Makefile b/kubernetes/oof/components/oof-cmso/components/Makefile
index f7a698d..36ea7b6 100755 (executable)
--- a/kubernetes/oof/components/oof-cmso/components/Makefile
+++ b/kubernetes/oof/components/oof-cmso/components/Makefile
@@ -18,8 +18,9 @@ PACKAGE_DIR := $(OUTPUT_DIR)/packages
 SECRET_DIR := $(OUTPUT_DIR)/secrets
 
 EXCLUDES :=
 SECRET_DIR := $(OUTPUT_DIR)/secrets
 
 EXCLUDES :=

+HELM_BIN := helm

 HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
 HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))

-HELM_VER := $(shell helm version --template "{{.Version}}")
+HELM_VER := $(shell $(HELM_BIN) version --template "{{.Version}}")

 
 .PHONY: $(EXCLUDES) $(HELM_CHARTS)
 
 
 .PHONY: $(EXCLUDES) $(HELM_CHARTS)
 


@@ -33,19 +34,19 @@ make-%:
        @if [ -f $*/Makefile ]; then make -C $*; fi
 
 dep-%: make-%
        @if [ -f $*/Makefile ]; then make -C $*; fi
 
 dep-%: make-%

-       @if [ -f $*/requirements.yaml ]; then helm dep up $*; fi
+       @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi

 
 lint-%: dep-%
 
 lint-%: dep-%

-       @if [ -f $*/Chart.yaml ]; then helm lint $*; fi
+       @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi

 
 package-%: lint-%
        @mkdir -p $(PACKAGE_DIR)
 ifeq "$(findstring v3,$(HELM_VER))" "v3"
 
 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
+       @if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) push -f $$PACKAGE_NAME local; fi

 else
 else

-       @if [ -f $*/Chart.yaml ]; then helm package -d $(PACKAGE_DIR) $*; fi
+       @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) package -d $(PACKAGE_DIR) $*; fi

 endif
 endif

-       @helm repo index $(PACKAGE_DIR)
+       @$(HELM_BIN) repo index $(PACKAGE_DIR)

 
 clean:
        @rm -f */requirements.lock
 
 clean:
        @rm -f */requirements.lock

diff --git a/kubernetes/oof/components/oof-has/Makefile b/kubernetes/oof/components/oof-has/Makefile
index 48cebe9..33d6104 100644 (file)
--- a/kubernetes/oof/components/oof-has/Makefile
+++ b/kubernetes/oof/components/oof-has/Makefile
@@ -18,8 +18,9 @@ PACKAGE_DIR := $(OUTPUT_DIR)/packages
 SECRET_DIR := $(OUTPUT_DIR)/secrets
 
 EXCLUDES := dist resources templates charts docker
 SECRET_DIR := $(OUTPUT_DIR)/secrets
 
 EXCLUDES := dist resources templates charts docker

+HELM_BIN := helm

 HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
 HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))

-HELM_VER := $(shell helm version --template "{{.Version}}")
+HELM_VER := $(shell $(HELM_BIN) version --template "{{.Version}}")

 
 .PHONY: $(EXCLUDES) $(HELM_CHARTS)
 
 
 .PHONY: $(EXCLUDES) $(HELM_CHARTS)
 


@@ -33,19 +34,19 @@ make-%:
        @if [ -f $*/Makefile ]; then make -C $*; fi
 
 dep-%: make-%
        @if [ -f $*/Makefile ]; then make -C $*; fi
 
 dep-%: make-%

-       @if [ -f $*/requirements.yaml ]; then helm dep up $*; fi
+       @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi

 
 lint-%: dep-%
 
 lint-%: dep-%

-       @if [ -f $*/Chart.yaml ]; then helm lint $*; fi
+       @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi

 
 package-%: lint-%
        @mkdir -p $(PACKAGE_DIR)
 ifeq "$(findstring v3,$(HELM_VER))" "v3"
 
 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
+       @if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) push -f $$PACKAGE_NAME local; fi

 else
 else

-       @if [ -f $*/Chart.yaml ]; then helm package -d $(PACKAGE_DIR) $*; fi
+       @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) package -d $(PACKAGE_DIR) $*; fi

 endif
 endif

-       @helm repo index $(PACKAGE_DIR)
+       @$(HELM_BIN) repo index $(PACKAGE_DIR)

 
 clean:
        @rm -f */requirements.lock
 
 clean:
        @rm -f */requirements.lock

diff --git a/kubernetes/oof/components/oof-has/components/Makefile b/kubernetes/oof/components/oof-has/components/Makefile
index f7a698d..36ea7b6 100755 (executable)
--- a/kubernetes/oof/components/oof-has/components/Makefile
+++ b/kubernetes/oof/components/oof-has/components/Makefile
@@ -18,8 +18,9 @@ PACKAGE_DIR := $(OUTPUT_DIR)/packages
 SECRET_DIR := $(OUTPUT_DIR)/secrets
 
 EXCLUDES :=
 SECRET_DIR := $(OUTPUT_DIR)/secrets
 
 EXCLUDES :=

+HELM_BIN := helm

 HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
 HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))

-HELM_VER := $(shell helm version --template "{{.Version}}")
+HELM_VER := $(shell $(HELM_BIN) version --template "{{.Version}}")

 
 .PHONY: $(EXCLUDES) $(HELM_CHARTS)
 
 
 .PHONY: $(EXCLUDES) $(HELM_CHARTS)
 


@@ -33,19 +34,19 @@ make-%:
        @if [ -f $*/Makefile ]; then make -C $*; fi
 
 dep-%: make-%
        @if [ -f $*/Makefile ]; then make -C $*; fi
 
 dep-%: make-%

-       @if [ -f $*/requirements.yaml ]; then helm dep up $*; fi
+       @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi

 
 lint-%: dep-%
 
 lint-%: dep-%

-       @if [ -f $*/Chart.yaml ]; then helm lint $*; fi
+       @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi

 
 package-%: lint-%
        @mkdir -p $(PACKAGE_DIR)
 ifeq "$(findstring v3,$(HELM_VER))" "v3"
 
 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
+       @if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) push -f $$PACKAGE_NAME local; fi

 else
 else

-       @if [ -f $*/Chart.yaml ]; then helm package -d $(PACKAGE_DIR) $*; fi
+       @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) package -d $(PACKAGE_DIR) $*; fi

 endif
 endif

-       @helm repo index $(PACKAGE_DIR)
+       @$(HELM_BIN) repo index $(PACKAGE_DIR)

 
 clean:
        @rm -f */requirements.lock
 
 clean:
        @rm -f */requirements.lock

diff --git a/kubernetes/platform/Makefile b/kubernetes/platform/Makefile
index d3fa8b7..c5dd3f2 100644 (file)
--- a/kubernetes/platform/Makefile
+++ b/kubernetes/platform/Makefile
@@ -18,8 +18,9 @@ PACKAGE_DIR := $(OUTPUT_DIR)/packages
 SECRET_DIR := $(OUTPUT_DIR)/secrets
 
 EXCLUDES := dist resources templates charts
 SECRET_DIR := $(OUTPUT_DIR)/secrets
 
 EXCLUDES := dist resources templates charts

+HELM_BIN := helm

 HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
 HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))

-HELM_VER := $(shell helm version --template "{{.Version}}")
+HELM_VER := $(shell $(HELM_BIN) version --template "{{.Version}}")

 
 .PHONY: $(EXCLUDES) $(HELM_CHARTS)
 
 
 .PHONY: $(EXCLUDES) $(HELM_CHARTS)
 


@@ -33,19 +34,19 @@ make-%:
        @if [ -f $*/Makefile ]; then make -C $*; fi
 
 dep-%: make-%
        @if [ -f $*/Makefile ]; then make -C $*; fi
 
 dep-%: make-%

-       @if [ -f $*/requirements.yaml ]; then helm dep up $*; fi
+       @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi

 
 lint-%: dep-%
 
 lint-%: dep-%

-       @if [ -f $*/Chart.yaml ]; then helm lint $*; fi
+       @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi

 
 package-%: lint-%
        @mkdir -p $(PACKAGE_DIR)
 ifeq "$(findstring v3,$(HELM_VER))" "v3"
 
 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
+       @if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) push -f $$PACKAGE_NAME local; fi

 else
 else

-       @if [ -f $*/Chart.yaml ]; then helm package -d $(PACKAGE_DIR) $*; fi
+       @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) package -d $(PACKAGE_DIR) $*; fi

 endif
 endif

-       @helm repo index $(PACKAGE_DIR)
+       @$(HELM_BIN) repo index $(PACKAGE_DIR)

 
 clean:
        @rm -f */requirements.lock
 
 clean:
        @rm -f */requirements.lock

diff --git a/kubernetes/platform/components/Makefile b/kubernetes/platform/components/Makefile
index cf69fa6..2fd1980 100644 (file)
--- a/kubernetes/platform/components/Makefile
+++ b/kubernetes/platform/components/Makefile
@@ -19,8 +19,9 @@ PACKAGE_DIR := $(OUTPUT_DIR)/packages
 SECRET_DIR := $(OUTPUT_DIR)/secrets
 
 EXCLUDES :=
 SECRET_DIR := $(OUTPUT_DIR)/secrets
 
 EXCLUDES :=

+HELM_BIN := helm

 HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
 HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))

-HELM_VER := $(shell helm version --template "{{.Version}}")
+HELM_VER := $(shell $(HELM_BIN) version --template "{{.Version}}")

 
 .PHONY: $(EXCLUDES) $(HELM_CHARTS)
 
 
 .PHONY: $(EXCLUDES) $(HELM_CHARTS)
 


@@ -34,19 +35,19 @@ make-%:
        @if [ -f $*/Makefile ]; then make -C $*; fi
 
 dep-%: make-%
        @if [ -f $*/Makefile ]; then make -C $*; fi
 
 dep-%: make-%

-       @if [ -f $*/requirements.yaml ]; then helm dep up $*; fi
+       @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi

 
 lint-%: dep-%
 
 lint-%: dep-%

-       @if [ -f $*/Chart.yaml ]; then helm lint $*; fi
+       @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi

 
 package-%: lint-%
        @mkdir -p $(PACKAGE_DIR)
 ifeq "$(findstring v3,$(HELM_VER))" "v3"
 
 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
+       @if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) push -f $$PACKAGE_NAME local; fi

 else
 else

-       @if [ -f $*/Chart.yaml ]; then helm package -d $(PACKAGE_DIR) $*; fi
+       @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) package -d $(PACKAGE_DIR) $*; fi

 endif
 endif

-       @helm repo index $(PACKAGE_DIR)
+       @$(HELM_BIN) repo index $(PACKAGE_DIR)

 
 clean:
        @rm -f */requirements.lock
 
 clean:
        @rm -f */requirements.lock

diff --git a/kubernetes/policy/Makefile b/kubernetes/policy/Makefile
index 8af301d..4c79718 100755 (executable)
--- a/kubernetes/policy/Makefile
+++ b/kubernetes/policy/Makefile
@@ -18,6 +18,7 @@ PACKAGE_DIR := $(OUTPUT_DIR)/packages
 SECRET_DIR := $(OUTPUT_DIR)/secrets
 
 EXCLUDES := dist resources templates charts docker
 SECRET_DIR := $(OUTPUT_DIR)/secrets
 
 EXCLUDES := dist resources templates charts docker

+HELM_BIN := helm

 HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
 
 .PHONY: $(EXCLUDES) $(HELM_CHARTS)
 HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
 
 .PHONY: $(EXCLUDES) $(HELM_CHARTS)


@@ -32,15 +33,15 @@ make-%:
        @if [ -f $*/Makefile ]; then make -C $*; fi
 
 dep-%: make-%
        @if [ -f $*/Makefile ]; then make -C $*; fi
 
 dep-%: make-%

-       @if [ -f $*/requirements.yaml ]; then helm dep up $*; fi
+       @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi

 
 lint-%: dep-%
 
 lint-%: dep-%

-       @if [ -f $*/Chart.yaml ]; then helm lint $*; fi
+       @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi

 
 package-%: lint-%
        @mkdir -p $(PACKAGE_DIR)
 
 package-%: lint-%
        @mkdir -p $(PACKAGE_DIR)

-       @if [ -f $*/Chart.yaml ]; then helm package -d $(PACKAGE_DIR) $*; fi
-       @helm repo index $(PACKAGE_DIR)
+       @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) package -d $(PACKAGE_DIR) $*; fi
+       @$(HELM_BIN) repo index $(PACKAGE_DIR)

 
 clean:
        @rm -f */requirements.lock
 
 clean:
        @rm -f */requirements.lock

diff --git a/kubernetes/policy/components/Makefile b/kubernetes/policy/components/Makefile
index 2fc0cbe..bf267b7 100755 (executable)
--- a/kubernetes/policy/components/Makefile
+++ b/kubernetes/policy/components/Makefile
@@ -18,6 +18,7 @@ PACKAGE_DIR := $(OUTPUT_DIR)/packages
 SECRET_DIR := $(OUTPUT_DIR)/secrets
 
 EXCLUDES :=
 SECRET_DIR := $(OUTPUT_DIR)/secrets
 
 EXCLUDES :=

+HELM_BIN := helm

 HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
 
 .PHONY: $(EXCLUDES) $(HELM_CHARTS)
 HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
 
 .PHONY: $(EXCLUDES) $(HELM_CHARTS)


@@ -32,15 +33,15 @@ make-%:
        @if [ -f $*/Makefile ]; then make -C $*; fi
 
 dep-%: make-%
        @if [ -f $*/Makefile ]; then make -C $*; fi
 
 dep-%: make-%

-       @if [ -f $*/requirements.yaml ]; then helm dep up $*; fi
+       @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi

 
 lint-%: dep-%
 
 lint-%: dep-%

-       @if [ -f $*/Chart.yaml ]; then helm lint $*; fi
+       @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi

 
 package-%: lint-%
        @mkdir -p $(PACKAGE_DIR)
 
 package-%: lint-%
        @mkdir -p $(PACKAGE_DIR)

-       @if [ -f $*/Chart.yaml ]; then helm package -d $(PACKAGE_DIR) $*; fi
-       @helm repo index $(PACKAGE_DIR)
+       @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) package -d $(PACKAGE_DIR) $*; fi
+       @$(HELM_BIN) repo index $(PACKAGE_DIR)

 
 clean:
        @rm -f */requirements.lock
 
 clean:
        @rm -f */requirements.lock

diff --git a/kubernetes/portal/Makefile b/kubernetes/portal/Makefile
index 248fb05..89b2f46 100644 (file)
--- a/kubernetes/portal/Makefile
+++ b/kubernetes/portal/Makefile
@@ -18,8 +18,9 @@ PACKAGE_DIR := $(OUTPUT_DIR)/packages
 SECRET_DIR := $(OUTPUT_DIR)/secrets
 
 EXCLUDES := dist resources templates charts docker
 SECRET_DIR := $(OUTPUT_DIR)/secrets
 
 EXCLUDES := dist resources templates charts docker

+HELM_BIN := helm

 HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
 HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))

-HELM_VER := $(shell helm version --template "{{.Version}}")
+HELM_VER := $(shell $(HELM_BIN) version --template "{{.Version}}")

 
 .PHONY: $(EXCLUDES) $(HELM_CHARTS)
 
 
 .PHONY: $(EXCLUDES) $(HELM_CHARTS)
 


@@ -33,19 +34,19 @@ make-%:
        @if [ -f $*/Makefile ]; then make -C $*; fi
 
 dep-%: make-%
        @if [ -f $*/Makefile ]; then make -C $*; fi
 
 dep-%: make-%

-       @if [ -f $*/requirements.yaml ]; then helm dep up $*; fi
+       @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi

 
 lint-%: dep-%
 
 lint-%: dep-%

-       @if [ -f $*/Chart.yaml ]; then helm lint $*; fi
+       @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi

 
 package-%: lint-%
        @mkdir -p $(PACKAGE_DIR)
 ifeq "$(findstring v3,$(HELM_VER))" "v3"
 
 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
+       @if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) push -f $$PACKAGE_NAME local; fi

 else
 else

-       @if [ -f $*/Chart.yaml ]; then helm package -d $(PACKAGE_DIR) $*; fi
+       @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) package -d $(PACKAGE_DIR) $*; fi

 endif
 endif

-       @helm repo index $(PACKAGE_DIR)
+       @$(HELM_BIN) repo index $(PACKAGE_DIR)

 
 clean:
        @rm -f */requirements.lock
 
 clean:
        @rm -f */requirements.lock

diff --git a/kubernetes/portal/components/Makefile b/kubernetes/portal/components/Makefile
index 0237136..d62cb0b 100644 (file)
--- a/kubernetes/portal/components/Makefile
+++ b/kubernetes/portal/components/Makefile
@@ -18,8 +18,9 @@ PACKAGE_DIR := $(OUTPUT_DIR)/packages
 SECRET_DIR := $(OUTPUT_DIR)/secrets
 
 EXCLUDES :=
 SECRET_DIR := $(OUTPUT_DIR)/secrets
 
 EXCLUDES :=

+HELM_BIN := helm

 HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
 HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))

-HELM_VER := $(shell helm version --template "{{.Version}}")
+HELM_VER := $(shell $(HELM_BIN) version --template "{{.Version}}")

 
 .PHONY: $(EXCLUDES) $(HELM_CHARTS)
 
 
 .PHONY: $(EXCLUDES) $(HELM_CHARTS)
 


@@ -33,19 +34,19 @@ make-%:
        @if [ -f $*/Makefile ]; then make -C $*; fi
 
 dep-%: make-%
        @if [ -f $*/Makefile ]; then make -C $*; fi
 
 dep-%: make-%

-       @if [ -f $*/requirements.yaml ]; then helm dep up $*; fi
+       @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi

 
 lint-%: dep-%
 
 lint-%: dep-%

-       @if [ -f $*/Chart.yaml ]; then helm lint $*; fi
+       @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi

 
 package-%: lint-%
        @mkdir -p $(PACKAGE_DIR)
 ifeq "$(findstring v3,$(HELM_VER))" "v3"
 
 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
+       @if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) push -f $$PACKAGE_NAME local; fi

 else
 else

-       @if [ -f $*/Chart.yaml ]; then helm package -d $(PACKAGE_DIR) $*; fi
+       @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) package -d $(PACKAGE_DIR) $*; fi

 endif
 endif

-       @helm repo index $(PACKAGE_DIR)
+       @$(HELM_BIN) repo index $(PACKAGE_DIR)

 
 clean:
        @rm -f */requirements.lock
 
 clean:
        @rm -f */requirements.lock

diff --git a/kubernetes/sdc/Makefile b/kubernetes/sdc/Makefile
index 3dab31f..8737bd2 100644 (file)
--- a/kubernetes/sdc/Makefile
+++ b/kubernetes/sdc/Makefile
@@ -18,9 +18,10 @@ PACKAGE_DIR := $(OUTPUT_DIR)/packages
 SECRET_DIR := $(OUTPUT_DIR)/secrets
 
 EXCLUDES := dist resources templates charts docker
 SECRET_DIR := $(OUTPUT_DIR)/secrets
 
 EXCLUDES := dist resources templates charts docker

+HELM_BIN := helm

 HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
 
 HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
 

-HELM_VER := $(shell helm version --template "{{.Version}}")
+HELM_VER := $(shell $(HELM_BIN) version --template "{{.Version}}")

 
 .PHONY: $(EXCLUDES) $(HELM_CHARTS)
 
 
 .PHONY: $(EXCLUDES) $(HELM_CHARTS)
 


@@ -34,20 +35,20 @@ make-%:
        @if [ -f $*/Makefile ]; then make -C $*; fi
 
 dep-%: make-%
        @if [ -f $*/Makefile ]; then make -C $*; fi
 
 dep-%: make-%

-       @if [ -f $*/requirements.yaml ]; then helm dep up $*; fi
+       @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi

 
 lint-%: dep-%
 
 lint-%: dep-%

-       @if [ -f $*/Chart.yaml ]; then helm lint $*; fi
+       @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi

 
 package-%: lint-%
        @mkdir -p $(PACKAGE_DIR)
 ifeq "$(findstring v3,$(HELM_VER))" "v3"
 
 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
+       @if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) push -f $$PACKAGE_NAME local; fi

 else
 else

-       @if [ -f $*/Chart.yaml ]; then helm package -d $(PACKAGE_DIR) $*; fi
+       @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) package -d $(PACKAGE_DIR) $*; fi

 endif
 
 endif
 

-       @helm repo index $(PACKAGE_DIR)
+       @$(HELM_BIN) repo index $(PACKAGE_DIR)

 
 clean:
        @rm -f */requirements.lock
 
 clean:
        @rm -f */requirements.lock

diff --git a/kubernetes/sdc/components/Makefile b/kubernetes/sdc/components/Makefile
index 0d5b9e0..577fd95 100644 (file)
--- a/kubernetes/sdc/components/Makefile
+++ b/kubernetes/sdc/components/Makefile
@@ -18,8 +18,9 @@ PACKAGE_DIR := $(OUTPUT_DIR)/packages
 SECRET_DIR := $(OUTPUT_DIR)/secrets
 
 EXCLUDES :=
 SECRET_DIR := $(OUTPUT_DIR)/secrets
 
 EXCLUDES :=

+HELM_BIN := helm

 HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
 HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))

-HELM_VER := $(shell helm version --template "{{.Version}}")
+HELM_VER := $(shell $(HELM_BIN) version --template "{{.Version}}")

 
 .PHONY: $(EXCLUDES) $(HELM_CHARTS)
 
 
 .PHONY: $(EXCLUDES) $(HELM_CHARTS)
 


@@ -33,19 +34,19 @@ make-%:
        @if [ -f $*/Makefile ]; then make -C $*; fi
 
 dep-%: make-%
        @if [ -f $*/Makefile ]; then make -C $*; fi
 
 dep-%: make-%

-       @if [ -f $*/requirements.yaml ]; then helm dep up $*; fi
+       @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi

 
 lint-%: dep-%
 
 lint-%: dep-%

-       @if [ -f $*/Chart.yaml ]; then helm lint $*; fi
+       @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi

 
 package-%: lint-%
        @mkdir -p $(PACKAGE_DIR)
 ifeq "$(findstring v3,$(HELM_VER))" "v3"
 
 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
+       @if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) push -f $$PACKAGE_NAME local; fi

 else
 else

-       @if [ -f $*/Chart.yaml ]; then helm package -d $(PACKAGE_DIR) $*; fi
+       @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) package -d $(PACKAGE_DIR) $*; fi

 endif
 endif

-       @helm repo index $(PACKAGE_DIR)
+       @$(HELM_BIN) repo index $(PACKAGE_DIR)

 
 clean:
        @rm -f */requirements.lock
 
 clean:
        @rm -f */requirements.lock

diff --git a/kubernetes/sdnc/Makefile b/kubernetes/sdnc/Makefile
index 1518f3c..32b3b72 100644 (file)
--- a/kubernetes/sdnc/Makefile
+++ b/kubernetes/sdnc/Makefile
@@ -19,8 +19,9 @@ PACKAGE_DIR := $(OUTPUT_DIR)/packages
 SECRET_DIR := $(OUTPUT_DIR)/secrets
 
 EXCLUDES := dist resources templates charts
 SECRET_DIR := $(OUTPUT_DIR)/secrets
 
 EXCLUDES := dist resources templates charts

+HELM_BIN := helm

 HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
 HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))

-HELM_VER := $(shell helm version --template "{{.Version}}")
+HELM_VER := $(shell $(HELM_BIN) version --template "{{.Version}}")

 
 .PHONY: $(EXCLUDES) $(HELM_CHARTS)
 
 
 .PHONY: $(EXCLUDES) $(HELM_CHARTS)
 


@@ -34,19 +35,19 @@ make-%:
        @if [ -f $*/Makefile ]; then make -C $*; fi
 
 dep-%: make-%
        @if [ -f $*/Makefile ]; then make -C $*; fi
 
 dep-%: make-%

-       @if [ -f $*/requirements.yaml ]; then helm dep up $*; fi
+       @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi

 
 lint-%: dep-%
 
 lint-%: dep-%

-       @if [ -f $*/Chart.yaml ]; then helm lint $*; fi
+       @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi

 
 package-%: lint-%
        @mkdir -p $(PACKAGE_DIR)
 ifeq "$(findstring v3,$(HELM_VER))" "v3"
 
 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
+       @if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) push -f $$PACKAGE_NAME local; fi

 else
 else

-       @if [ -f $*/Chart.yaml ]; then helm package -d $(PACKAGE_DIR) $*; fi
+       @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) package -d $(PACKAGE_DIR) $*; fi

 endif
 endif

-       @helm repo index $(PACKAGE_DIR)
+       @$(HELM_BIN) repo index $(PACKAGE_DIR)

 
 clean:
        @rm -f */requirements.lock
 
 clean:
        @rm -f */requirements.lock

diff --git a/kubernetes/sdnc/components/Makefile b/kubernetes/sdnc/components/Makefile
index c38171c..313cca8 100644 (file)
--- a/kubernetes/sdnc/components/Makefile
+++ b/kubernetes/sdnc/components/Makefile
@@ -19,8 +19,9 @@ PACKAGE_DIR := $(OUTPUT_DIR)/packages
 SECRET_DIR := $(OUTPUT_DIR)/secrets
 
 EXCLUDES :=
 SECRET_DIR := $(OUTPUT_DIR)/secrets
 
 EXCLUDES :=

+HELM_BIN := helm

 HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
 HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))

-HELM_VER := $(shell helm version --template "{{.Version}}")
+HELM_VER := $(shell $(HELM_BIN) version --template "{{.Version}}")

 
 .PHONY: $(EXCLUDES) $(HELM_CHARTS)
 
 
 .PHONY: $(EXCLUDES) $(HELM_CHARTS)
 


@@ -34,19 +35,19 @@ make-%:
        @if [ -f $*/Makefile ]; then make -C $*; fi
 
 dep-%: make-%
        @if [ -f $*/Makefile ]; then make -C $*; fi
 
 dep-%: make-%

-       @if [ -f $*/requirements.yaml ]; then helm dep up $*; fi
+       @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi

 
 lint-%: dep-%
 
 lint-%: dep-%

-       @if [ -f $*/Chart.yaml ]; then helm lint $*; fi
+       @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi

 
 package-%: lint-%
        @mkdir -p $(PACKAGE_DIR)
 ifeq "$(findstring v3,$(HELM_VER))" "v3"
 
 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
+       @if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) push -f $$PACKAGE_NAME local; fi

 else
 else

-       @if [ -f $*/Chart.yaml ]; then helm package -d $(PACKAGE_DIR) $*; fi
+       @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) package -d $(PACKAGE_DIR) $*; fi

 endif
 endif

-       @helm repo index $(PACKAGE_DIR)
+       @$(HELM_BIN) repo index $(PACKAGE_DIR)

 
 clean:
        @rm -f */requirements.lock
 
 clean:
        @rm -f */requirements.lock

diff --git a/kubernetes/so/Makefile b/kubernetes/so/Makefile
index 8af301d..4c79718 100644 (file)
--- a/kubernetes/so/Makefile
+++ b/kubernetes/so/Makefile
@@ -18,6 +18,7 @@ PACKAGE_DIR := $(OUTPUT_DIR)/packages
 SECRET_DIR := $(OUTPUT_DIR)/secrets
 
 EXCLUDES := dist resources templates charts docker
 SECRET_DIR := $(OUTPUT_DIR)/secrets
 
 EXCLUDES := dist resources templates charts docker

+HELM_BIN := helm

 HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
 
 .PHONY: $(EXCLUDES) $(HELM_CHARTS)
 HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
 
 .PHONY: $(EXCLUDES) $(HELM_CHARTS)


@@ -32,15 +33,15 @@ make-%:
        @if [ -f $*/Makefile ]; then make -C $*; fi
 
 dep-%: make-%
        @if [ -f $*/Makefile ]; then make -C $*; fi
 
 dep-%: make-%

-       @if [ -f $*/requirements.yaml ]; then helm dep up $*; fi
+       @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi

 
 lint-%: dep-%
 
 lint-%: dep-%

-       @if [ -f $*/Chart.yaml ]; then helm lint $*; fi
+       @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi

 
 package-%: lint-%
        @mkdir -p $(PACKAGE_DIR)
 
 package-%: lint-%
        @mkdir -p $(PACKAGE_DIR)

-       @if [ -f $*/Chart.yaml ]; then helm package -d $(PACKAGE_DIR) $*; fi
-       @helm repo index $(PACKAGE_DIR)
+       @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) package -d $(PACKAGE_DIR) $*; fi
+       @$(HELM_BIN) repo index $(PACKAGE_DIR)

 
 clean:
        @rm -f */requirements.lock
 
 clean:
        @rm -f */requirements.lock

diff --git a/kubernetes/so/components/Makefile b/kubernetes/so/components/Makefile
index 4bf77ee..f2e7a1f 100644 (file)
--- a/kubernetes/so/components/Makefile
+++ b/kubernetes/so/components/Makefile
@@ -18,6 +18,7 @@ PACKAGE_DIR := $(OUTPUT_DIR)/packages
 SECRET_DIR := $(OUTPUT_DIR)/secrets
 
 EXCLUDES := soHelpers
 SECRET_DIR := $(OUTPUT_DIR)/secrets
 
 EXCLUDES := soHelpers

+HELM_BIN := helm

 HELM_CHARTS := soHelpers $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
 
 .PHONY: $(EXCLUDES) $(HELM_CHARTS)
 HELM_CHARTS := soHelpers $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
 
 .PHONY: $(EXCLUDES) $(HELM_CHARTS)


@@ -32,15 +33,15 @@ make-%:
        @if [ -f $*/Makefile ]; then make -C $*; fi
 
 dep-%: make-%
        @if [ -f $*/Makefile ]; then make -C $*; fi
 
 dep-%: make-%

-       @if [ -f $*/requirements.yaml ]; then helm dep up $*; fi
+       @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi

 
 lint-%: dep-%
 
 lint-%: dep-%

-       @if [ -f $*/Chart.yaml ]; then helm lint $*; fi
+       @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi

 
 package-%: lint-%
        @mkdir -p $(PACKAGE_DIR)
 
 package-%: lint-%
        @mkdir -p $(PACKAGE_DIR)

-       @if [ -f $*/Chart.yaml ]; then helm package -d $(PACKAGE_DIR) $*; fi
-       @helm repo index $(PACKAGE_DIR)
+       @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) package -d $(PACKAGE_DIR) $*; fi
+       @$(HELM_BIN) repo index $(PACKAGE_DIR)

 
 clean:
        @rm -f */requirements.lock
 
 clean:
        @rm -f */requirements.lock