Merge pull request #34610 from wojtek-t/set_target_version

Automatic merge from submit-queue Set target version env in etcd manifest Ref https://github.com/kubernetes/kubernetes/issues/20504 @lavalamp

Merge pull request #34610 from wojtek-t/set_target_version
5c9ac89b · Kubernetes Submit Queue · GitHub · ff06372a · e6084bf7 · 5c9ac89b
Commit 5c9ac89b authored Oct 13, 2016 by Kubernetes Submit Queue Committed by GitHub Oct 13, 2016
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

etcd.manifest cluster/saltbase/salt/etcd/etcd.manifest +3 -0

No files found.
--- a/cluster/saltbase/salt/etcd/etcd.manifest
+++ b/cluster/saltbase/salt/etcd/etcd.manifest
@@ -43,6 +43,9 @@
      { "name": "TARGET_STORAGE",
        "value": "{{ storage_backend }}"
      },
+      { "name": "TARGET_VERSION",
+        "value": "{{ pillar.get('etcd_docker_tag', '2.2.1') }}"
+      },
      { "name": "DATA_DIRECTORY",
        "value": "/var/etcd/data{{ suffix }}"
      }