mirror of https://github.com/k3s-io/k3s
docker does not provision a docker group anymore, so do not add vagrant user to it
parent
a84e94574f
commit
46eb657722
|
@ -58,8 +58,10 @@ kubelet:
|
||||||
- gid_from_name: True
|
- gid_from_name: True
|
||||||
- shell: /sbin/nologin
|
- shell: /sbin/nologin
|
||||||
- home: /var/lib/kubelet
|
- home: /var/lib/kubelet
|
||||||
|
{% if grains['os_family'] != 'RedHat' %}
|
||||||
- groups:
|
- groups:
|
||||||
- docker
|
- docker
|
||||||
|
{% endif %}
|
||||||
- require:
|
- require:
|
||||||
- group: kubelet
|
- group: kubelet
|
||||||
service.running:
|
service.running:
|
||||||
|
|
|
@ -45,7 +45,3 @@ base:
|
||||||
'roles:kubernetes-pool-vsphere':
|
'roles:kubernetes-pool-vsphere':
|
||||||
- match: grain
|
- match: grain
|
||||||
- static-routes
|
- 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")'
|
apiservers: '$(echo "$MASTER_IP" | sed -e "s/'/''/g")'
|
||||||
roles:
|
roles:
|
||||||
- kubernetes-pool
|
- kubernetes-pool
|
||||||
- kubernetes-pool-vagrant
|
|
||||||
cbr-cidr: '$(echo "$CONTAINER_SUBNET" | sed -e "s/'/''/g")'
|
cbr-cidr: '$(echo "$CONTAINER_SUBNET" | sed -e "s/'/''/g")'
|
||||||
minion_ip: '$(echo "$MINION_IP" | sed -e "s/'/''/g")'
|
minion_ip: '$(echo "$MINION_IP" | sed -e "s/'/''/g")'
|
||||||
EOF
|
EOF
|
||||||
|
|
Loading…
Reference in New Issue