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 #5242 from derekwaynecarr/fix_5043

Browse Source 
Provision network before kubelet
This commit is contained in:
Victor Marmol 2015-03-10 08:28:19 -07:00
commit b584f5b1da
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cluster/saltbase/salt/kubelet/init.sls
View File

@ -72,3 +72,6 @@ kubelet:
- file: /etc/init.d/kubelet - file: /etc/init.d/kubelet
{% endif %} {% endif %}
- file: /var/lib/kubelet/kubernetes_auth - file: /var/lib/kubelet/kubernetes_auth
{% if pillar.get('enable_node_monitoring', '').lower() == 'true' %}
- file: /etc/kubernetes/manifests/cadvisor.manifest
{% endif %}

10
cluster/saltbase/salt/top.sls
View File

@ -6,6 +6,11 @@ base:
'roles:kubernetes-pool': 'roles:kubernetes-pool':
- match: grain - match: grain
- docker - docker
{% if grains['cloud'] is defined and grains['cloud'] == 'azure' %}
- openvpn-client
{% else %}
- sdn
{% endif %}
- kubelet - kubelet
- kube-proxy - kube-proxy
{% if pillar.get('enable_node_monitoring', '').lower() == 'true' %} {% if pillar.get('enable_node_monitoring', '').lower() == 'true' %}
@ -20,11 +25,6 @@ base:
{% endif %} {% endif %}
{% endif %} {% endif %}
- logrotate - logrotate
{% if grains['cloud'] is defined and grains['cloud'] == 'azure' %}
- openvpn-client
{% else %}
- sdn
{% endif %}
- monit - monit
'roles:kubernetes-master': 'roles:kubernetes-master':