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

Merge pull request #26902 from girishkalele/cvm-dns-fix

Browse Source 
Automatic merge from submit-queue

Fix Kube DNS addon staging for Container VMs
This commit is contained in:
k8s-merge-robot 2016-06-07 14:09:50 -07:00
commit e49e367cd1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cluster/saltbase/salt/kube-addons/init.sls
View File

@ -73,17 +73,17 @@ addon-dir-create:
{% endif %} {% endif %}
{% if pillar.get('enable_cluster_dns', '').lower() == 'true' %} {% if pillar.get('enable_cluster_dns', '').lower() == 'true' %}
/etc/kubernetes/addons/dns/kubedns-svc.yaml: /etc/kubernetes/addons/dns/skydns-svc.yaml:
file.managed: file.managed:
- source: salt://kube-dns/kubedns-svc.yaml.in - source: salt://kube-dns/skydns-svc.yaml.in
- template: jinja - template: jinja
- group: root - group: root
- dir_mode: 755 - dir_mode: 755
- makedirs: True - makedirs: True
/etc/kubernetes/addons/dns/kubedns-rc.yaml: /etc/kubernetes/addons/dns/skydns-rc.yaml:
file.managed: file.managed:
- source: salt://kube-dns/kubedns-rc.yaml.in - source: salt://kube-dns/skydns-rc.yaml.in
- template: jinja - template: jinja
- group: root - group: root
- dir_mode: 755 - dir_mode: 755