Merge pull request #30859 from wojtek-t/allow_custom_etcd_in_e2e

Automatic merge from submit-queue Add possibility to run non-default etcd image in tests Ref #20504 @lavalamp @hongchaodeng @timothysc - FYI
2016-08-20 09:32:35 -07:00
parent eaa2b6f528 315d9f3689
commit 9030a3234f
6 changed files with 24 additions and 1 deletions
--- a/cluster/saltbase/salt/etcd/etcd.manifest
+++ b/cluster/saltbase/salt/etcd/etcd.manifest
@@ -28,7 +28,7 @@
 "containers":[
    {
    "name": "etcd-container",
-    "image": "gcr.io/google_containers/etcd:3.0.4",
+    "image": "gcr.io/google_containers/etcd:{{ pillar.get('etcd_docker_tag', '3.0.4') }}",
    "resources": {
      "requests": {
        "cpu": {{ cpulimit }}