mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 11:21:47 +00:00
Merge pull request #4287 from derekwaynecarr/docker_group_gone
Docker 1.4.1 on Fedora no longer provisions a docker group
This commit is contained in:
commit
6b3bb763f0
@ -58,8 +58,10 @@ kubelet:
|
||||
- gid_from_name: True
|
||||
- shell: /sbin/nologin
|
||||
- home: /var/lib/kubelet
|
||||
{% if grains['os_family'] != 'RedHat' %}
|
||||
- groups:
|
||||
- docker
|
||||
{% endif %}
|
||||
- require:
|
||||
- group: kubelet
|
||||
service.running:
|
||||
|
@ -49,7 +49,3 @@ base:
|
||||
'roles:kubernetes-pool-vsphere':
|
||||
- match: grain
|
||||
- static-routes
|
||||
|
||||
'roles:kubernetes-pool-vagrant':
|
||||
- match: grain
|
||||
- vagrant
|
||||
|
@ -1,7 +0,0 @@
|
||||
vagrant:
|
||||
user.present:
|
||||
- optional_groups:
|
||||
- docker
|
||||
- remove_groups: False
|
||||
- require:
|
||||
- pkg: docker-io
|
@ -55,7 +55,6 @@ grains:
|
||||
apiservers: '$(echo "$MASTER_IP" | sed -e "s/'/''/g")'
|
||||
roles:
|
||||
- kubernetes-pool
|
||||
- kubernetes-pool-vagrant
|
||||
cbr-cidr: '$(echo "$CONTAINER_SUBNET" | sed -e "s/'/''/g")'
|
||||
minion_ip: '$(echo "$MINION_IP" | sed -e "s/'/''/g")'
|
||||
EOF
|
||||
|
Loading…
Reference in New Issue
Block a user