Merge pull request #18351 from pavolloffay/helm-version-parameter

Automatic merge from submit-queue (batch tested with PRs 18225, 18351, 18331, 18340, 18326). Add helm version to tiller template Fixes #18350 Signed-off-by: Pavol Loffay <[email protected]>
openshift · Jan 31, 2018 · 1710344 · 1710344
2 parents f2b1e42 + 8fd6b52
commit 1710344
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/examples/helm/tiller-template.yaml b/examples/helm/tiller-template.yaml
@@ -57,7 +57,7 @@ objects:
       spec:
         containers:
         - name: tiller
-          image: gcr.io/kubernetes-helm/tiller:v2.6.1
+          image: gcr.io/kubernetes-helm/tiller:${HELM_VERSION}
           env:
           - name: TILLER_NAMESPACE
             valueFrom:
@@ -77,5 +77,8 @@ objects:
         serviceAccountName: tiller
 
 parameters:
+- name: HELM_VERSION
+  value: v2.6.1
+  required: true
 - name: TILLER_NAMESPACE
   required: true