github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-10 12:32:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #25029 from mikedanese/dns-fix

Browse Source 
Automatic merge from submit-queue

revert the vsphere change to skydns plugin

Fixes #25020
This commit is contained in:
k8s-merge-robot 2016-05-03 01:25:42 -07:00
commit 9ded9cd936
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cluster/addons/dns/skydns-rc.yaml.in
View File

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