Merge pull request #33130 from madhusudancs/fed-default-image-tag

Automatic merge from submit-queue Update the Kubernetes version in sample federation deployment config to 1.4.0. cc @kubernetes/sig-cluster-federation

Merge pull request #33130 from madhusudancs/fed-default-image-tag
f2bfa543 · Kubernetes Submit Queue · GitHub · e362fe02 · dc5668b8 · f2bfa543
Commit f2bfa543 authored Sep 21, 2016 by Kubernetes Submit Queue Committed by GitHub Sep 21, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

config.json.sample federation/deploy/config.json.sample +3 -3

No files found.
--- a/federation/deploy/config.json.sample
+++ b/federation/deploy/config.json.sample
@@ -16,7 +16,7 @@
    },
    "phase2": {
      "docker_registry": "gcr.io/google-containers",
-      "kubernetes_version": "v1.3.0"
+      "kubernetes_version": "v1.4.0"
    },
    "phase3": {
      "run_addons": true,
@@ -43,7 +43,7 @@
    },
    "phase2": {
      "docker_registry": "gcr.io/google-containers",
-      "kubernetes_version": "v1.3.0"
+      "kubernetes_version": "v1.4.0"
    },
    "phase3": {
      "run_addons": true,
@@ -70,7 +70,7 @@
    },
    "phase2": {
      "docker_registry": "gcr.io/google-containers",
-      "kubernetes_version": "v1.3.0"
+      "kubernetes_version": "v1.4.0"
    },
    "phase3": {
      "run_addons": true,