Merge pull request #25029 from mikedanese/dns-fix

Automatic merge from submit-queue

revert the vsphere change to skydns plugin

Fixes #25020
pull/6/head
k8s-merge-robot 2016-05-03 01:25:42 -07:00
commit 9ded9cd936
1 changed files with 0 additions and 3 deletions

View File

@ -19,9 +19,6 @@ spec:
version: v11
kubernetes.io/cluster-service: "true"
spec:
{% if grains['cloud'] is defined and grains['cloud'] in [ 'vsphere', 'photon-controller' ] %}
hostNetwork: true
{% endif %}
containers:
- name: etcd
image: gcr.io/google_containers/etcd-amd64:2.2.1