github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Automatic merge from submit-queue

Update the Kubernetes version in sample federation deployment config to 1.4.0.

cc @kubernetes/sig-cluster-federation
This commit is contained in:
Kubernetes Submit Queue 2016-09-21 03:38:10 -07:00 committed by GitHub
commit f2bfa543f0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
federation/deploy/config.json.sample
View File

@ -16,7 +16,7 @@
}, },
"phase2": { "phase2": {
"docker_registry": "gcr.io/google-containers", "docker_registry": "gcr.io/google-containers",
"kubernetes_version": "v1.3.0" "kubernetes_version": "v1.4.0"
}, },
"phase3": { "phase3": {
"run_addons": true, "run_addons": true,
@ -43,7 +43,7 @@
}, },
"phase2": { "phase2": {
"docker_registry": "gcr.io/google-containers", "docker_registry": "gcr.io/google-containers",
"kubernetes_version": "v1.3.0" "kubernetes_version": "v1.4.0"
}, },
"phase3": { "phase3": {
"run_addons": true, "run_addons": true,
@ -70,7 +70,7 @@
}, },
"phase2": { "phase2": {
"docker_registry": "gcr.io/google-containers", "docker_registry": "gcr.io/google-containers",
"kubernetes_version": "v1.3.0" "kubernetes_version": "v1.4.0"
}, },
"phase3": { "phase3": {
"run_addons": true, "run_addons": true,