Add image/tag variables in chart (#677)

voyagermesh · Nov 2, 2017 · 82ea7fe · 82ea7fe
1 parent 2db53f8
commit 82ea7fe
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 5 deletions.
diff --git a/chart/voyager/README.md b/chart/voyager/README.md
@@ -42,8 +42,14 @@ The following tables lists the configurable parameters of the Voyager chart and
 
 | Parameter                 | Description                                                   | Default            |
 | --------------------------| ------------------------------------------------------------- | ------------------ |
-| `image`                   | Container image to run                                        | `appscode/voyager` |
-| `imageTag`                | Image tag of container                                        | `5.0.0-rc.3`      |
+| `operator.image`          | Name of Voyager operator image                                | `appscode/voyager` |
+| `operator.imageTag`       | Tag of Voyager operator image                                 | `5.0.0-rc.3`       |
+| `haproxy.image`           | Name of HAProxy container image                               | `appscode/haproxy` |
+| `haproxy.imageTag`        | Tag of HAProxy container image                                | `1.7.9-5.0.0-rc.3` |
+| `exporter.image`          | Name of Prometheus exporter sidecar image                     | `appscode/voyager` |
+| `exporter.imageTag`       | Tag of Prometheus exporter sidecar image                      | `5.0.0-rc.3`       |
+| `imagePullSecrets`        | Specify image pull secrets                                    | `nil` (does not add image pull secrets to deployed pods) |
+| `imagePullPolicy`         | Image pull policy                                             | `IfNotPresent`     |
 | `cloudProvider`           | Name of cloud provider                                        | `nil`              |
 | `cloudConfig`             | Path to cloud config                                          | ``                 |
 | `criticalAddon`           | If true, installs voyager operator as critical addon          | `false`            |

diff --git a/chart/voyager/templates/deployment.yaml b/chart/voyager/templates/deployment.yaml
@@ -22,7 +22,12 @@ spec:
       serviceAccountName: {{ if .Values.rbac.create }}{{ template "fullname" . }}{{ else }}"{{ .Values.rbac.serviceAccountName }}"{{ end }}
       containers:
       - name: operator
-        image: {{ .Values.image }}:{{ .Values.imageTag }}
+        image: {{ .Values.operator.image }}:{{ .Values.operator.imageTag }}
+        imagePullPolicy: {{ default "" .Values.imagePullPolicy | quote }}
+        {{- if .Values.imagePullSecrets }}
+        imagePullSecrets:
+{{ toYaml .Values.imagePullSecrets | indent 8 }}
+        {{- end }}
         args:
         - run
         - --cloud-provider={{ .Values.cloudProvider }}
@@ -31,6 +36,8 @@ spec:
         - --rbac={{ .Values.rbac.create }}
         - --ingress-class={{ .Values.ingressClass }}
         - --operator-service={{ template "fullname" . }}
+        - --haproxy-image={{ .Values.haproxy.image }}:{{ .Values.haproxy.imageTag }}
+        - --exporter-sidecar-image={{ .Values.exporter.image }}:{{ .Values.exporter.imageTag }}
         ports:
         - containerPort: 56790
           name: ops

diff --git a/chart/voyager/values.yaml b/chart/voyager/values.yaml
@@ -1,8 +1,27 @@
 ##
 ## Voyager chart configuration
 ##
-image: appscode/voyager
-imageTag: 5.0.0-rc.3
+operator:
+  image: appscode/voyager
+  imageTag: 5.0.0-rc.3
+## Docker image containing HAProxy binary
+haproxy:
+  image: appscode/haproxy
+  imageTag: 1.7.9-5.0.0-rc.3
+## Docker image containing Prometheus exporter
+exporter:
+  image: appscode/voyager
+  imageTag: 5.0.0-rc.3
+## Optionally specify an array of imagePullSecrets.
+## Secrets must be manually created in the namespace.
+## ref: https://kubernetes.io/docs/concepts/containers/images/#specifying-imagepullsecrets-on-a-pod
+##
+# imagePullSecrets:
+#   - name: myRegistryKeySecretName
+## Specify a imagePullPolicy
+## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
+##
+imagePullPolicy: IfNotPresent
 ## Use cloud provider here. Read details https://github.com/appscode/voyager/blob/master/docs/user-guide/README.md
 cloudProvider:
 ## The path to the cloud provider configuration file. Empty string for no configuration file.