[incubator-openwhisk-deploy-kube] branch master updated: set invoker's --uniqueName to $INVOKER_NAME; eliminate setting of COMPONENT_NAME (#270)

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

markusthoemmes pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-deploy-kube.git


The following commit(s) were added to refs/heads/master by this push:
     new 9e16267  set invoker's --uniqueName to $INVOKER_NAME; eliminate setting of COMPONENT_NAME (#270)
9e16267 is described below

commit 9e1626748e8da631c5c9134268db839d4d1a2b34
Author: David Grove <dg...@users.noreply.github.com>
AuthorDate: Mon Aug 6 11:24:11 2018 -0400

    set invoker's --uniqueName to $INVOKER_NAME; eliminate setting of COMPONENT_NAME (#270)
---
 helm/openwhisk/templates/controller.yaml | 2 +-
 helm/openwhisk/templates/invoker.yaml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/helm/openwhisk/templates/controller.yaml b/helm/openwhisk/templates/controller.yaml
index d257bb4..a4549dd 100644
--- a/helm/openwhisk/templates/controller.yaml
+++ b/helm/openwhisk/templates/controller.yaml
@@ -50,7 +50,7 @@ spec:
       - name: {{ .Values.controller.name | quote }}
         imagePullPolicy: {{ .Values.controller.imagePullPolicy | quote }}
         image: {{ .Values.controller.image | quote }}
-        command: ["/bin/bash", "-c", "COMPONENT_NAME=$(hostname | cut -d'-' -f2) /init.sh `hostname | cut -d'-' -f2`"]
+        command: ["/bin/bash", "-c", "/init.sh `hostname | cut -d'-' -f2`"]
         ports:
         - name: controller
           containerPort: {{ .Values.controller.port }}
diff --git a/helm/openwhisk/templates/invoker.yaml b/helm/openwhisk/templates/invoker.yaml
index 0b3481d..812df79 100644
--- a/helm/openwhisk/templates/invoker.yaml
+++ b/helm/openwhisk/templates/invoker.yaml
@@ -55,7 +55,7 @@ spec:
       - name: {{ .Values.invoker.name | quote }}
         imagePullPolicy: {{ .Values.invoker.imagePullPolicy | quote }}
         image: {{ .Values.invoker.image | quote }}
-        command: [ "/bin/bash", "-c", "COMPONENT_NAME=$(hostname | cut -d'-' -f2) && /init.sh --uniqueName $COMPONENT_NAME"]
+        command: [ "/bin/bash", "-c", "/init.sh --uniqueName $INVOKER_NAME" ]
         env:
           - name: "PORT"
             value: {{ .Values.invoker.port | quote }}