Merge pull request #7461 from cjcullen/dns

Revert kube2sky from 1.2 back to 1.1 until we figure out why it's flaky.
This commit is contained in:
Zach Loafman 2015-04-28 17:23:55 -07:00
commit 89195b0a14

View File

@ -29,7 +29,7 @@ desiredState:
"-advertise-client-urls=http://127.0.0.1:4001",
]
- name: kube2sky
image: gcr.io/google_containers/kube2sky:1.2
image: gcr.io/google_containers/kube2sky:1.1
volumeMounts:
- name: dns-token
mountPath: /etc/dns_token
@ -37,7 +37,6 @@ desiredState:
command: [
# entrypoint = "/kube2sky",
"-domain={{ pillar['dns_domain'] }}",
"-kubecfg_file=/etc/dns_token/kubeconfig",
]
- name: skydns
image: gcr.io/google_containers/skydns:2015-03-11-001