Set fetcher image through poolmgr env (#280)

Add a helm value for the fetcher image. Pass the fetcher image path to poolmgr through an env var.

charts/README.md

@@ -42,6 +42,8 @@ The following table lists the configurable parameters of the Fission chart and t
 | `serviceType`       | Type of service to use                     | `LoadBalancer`.          |
 | `image`             | Fission image                              | `fission/fission-bundle` |
 | `imageTag`          | Fission image tag                          | `alpha20170124`          |
+| `fetcherImage`      | Fission fetcher image                      | `fission/fetcher`        |
+| `fetcherImageTag`   | Fission fetcher image tag                  | `latest`                 |
 | `controllerPort`    | Fission Controller Service Port            | `31313`                  |
 | `routerPort`        | Fission Router Service Port                | `31314`                  |
 | `functionNamespace` | Namespace for Fission functions            | `fission-function`       |

charts/fission-all/templates/deployment.yaml

@@ -232,6 +232,9 @@ spec:
         image: "{{ .Values.image }}:{{ .Values.imageTag }}"
         command: ["/fission-bundle"]
         args: ["--poolmgrPort", "8888", "--namespace", "{{ .Values.functionNamespace }}", "--fission-namespace", "{{ .Release.Namespace }}"]
+        env:
+        - name: FETCHER_IMAGE
+          value: "{{ .Values.fetcherImage }}:{{ .Values.fetcherImageTag }}"
       serviceAccount: fission-svc
 
 ---

charts/fission-all/values.yaml

@@ -6,7 +6,7 @@
 ## For minikube, set this to NodePort, elsewhere use LoadBalancer.
 serviceType: LoadBalancer
 
-## Fission image repostiroy
+## Fission image repository
 image: fission/fission-bundle
 
 ## Image pull policy
@@ -15,6 +15,12 @@ pullPolicy: ifNotPresent
 ## Fission image version
 imageTag: nightly20170705
 
+## Fission fetcher repository
+fetcherImage: fission/fetcher
+
+## Fission fetcher image version
+fetcherImageTag: latest
+
 ## Port at which Fission controller service should be exposed
 controllerPort: 31313
 

charts/fission-core/templates/deployment.yaml

@@ -232,6 +232,9 @@ spec:
         image: "{{ .Values.image }}:{{ .Values.imageTag }}"
         command: ["/fission-bundle"]
         args: ["--poolmgrPort", "8888", "--namespace", "{{ .Values.functionNamespace }}", "--fission-namespace", "{{ .Release.Namespace }}"]
+        env:
+        - name: FETCHER_IMAGE
+          value: "{{ .Values.fetcherImage }}:{{ .Values.fetcherImageTag }}"
       serviceAccount: fission-svc
 
 ---

charts/fission-core/values.yaml

@@ -6,12 +6,18 @@
 ## For minikube, set this to NodePort, elsewhere use LoadBalancer.
 serviceType: LoadBalancer
 
-## Fission image repostiroy
+## Fission image repository
 image: fission/fission-bundle
 
 ## Fission image version
 imageTag: alpha20170124
 
+## Fission fetcher repository
+fetcherImage: fission/fetcher
+
+## Fission fetcher image version
+fetcherImageTag: latest
+
 ## Port at which Fission controller service should be exposed
 controllerPort: 31313