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

Make master-addon service depend on both docker and kubelet service

Browse Source 
in salt.
This commit is contained in:
Dawn Chen 2015-06-22 23:12:34 -07:00
parent 23200d303f
commit 8d76d4ee57
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,10 +37,19 @@ master-docker-image-tags:
file.touch: file.touch:
- name: /srv/pillar/docker-images.sls - name: /srv/pillar/docker-images.sls
# Current containervm image by default has both docker and kubelet
# running. But during cluster creation stage, docker and kubelet
# could be overwritten completely, or restarted due flag changes.
# The ordering of salt states for service docker, kubelet and
# master-addon below is very important to avoid the race between
# salt restart docker or kubelet and kubelet start master components.
kube-master-addons: kube-master-addons:
service.running: service.running:
- enable: True - enable: True
- restart: True - restart: True
- require:
- service: docker
- service: kubelet
- watch: - watch:
- file: master-docker-image-tags - file: master-docker-image-tags
- file: /etc/kubernetes/kube-master-addons.sh - file: /etc/kubernetes/kube-master-addons.sh