[GitHub] markusthoemmes closed pull request #270: set invoker's --uniqueName to $INVOKER_NAME; eliminate setting of COM…

[GitBox <gi...@apache.org>]

markusthoemmes closed pull request #270: set invoker's --uniqueName to $INVOKER_NAME; eliminate setting of COM…
URL: https://github.com/apache/incubator-openwhisk-deploy-kube/pull/270
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/helm/openwhisk/templates/controller.yaml b/helm/openwhisk/templates/controller.yaml
index 1871add..f3b28f7 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 9eddb2b..f34ccfe 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 }}


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services