C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove modprobe binary from kubelet rkt deployment (#2917)

Browse source
This commit is contained in:
Matthew Mosesohn 2018-07-02 15:37:24 +03:00 committed by GitHub
parent f6a15b1829
commit c20196f9a0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roles/kubernetes/node/templates/kubelet.rkt.service.j2
View file

@ -18,7 +18,6 @@ EnvironmentFile={{kube_config_dir}}/kubelet.env
# stage1-fly mounts /proc /sys /dev so no need to duplicate the mounts # stage1-fly mounts /proc /sys /dev so no need to duplicate the mounts
ExecStart=/usr/bin/rkt run \ ExecStart=/usr/bin/rkt run \
{% if kubelet_load_modules == true %} {% if kubelet_load_modules == true %}
--volume modprobe,kind=host,source=/usr/sbin/modprobe \
--volume lib-modules,kind=host,source=/lib/modules \ --volume lib-modules,kind=host,source=/lib/modules \
{% endif %} {% endif %}
--volume os-release,kind=host,source=/etc/os-release,readOnly=true \ --volume os-release,kind=host,source=/etc/os-release,readOnly=true \
@ -51,7 +50,6 @@ ExecStart=/usr/bin/rkt run \
{% endif %} {% endif %}
{% endif %} {% endif %}
{% if kubelet_load_modules == true %} {% if kubelet_load_modules == true %}
--mount volume=modprobe,target=/usr/sbin/modprobe \
--mount volume=lib-modules,target=/lib/modules \ --mount volume=lib-modules,target=/lib/modules \
{% endif %} {% endif %}
--mount volume=etc-cni,target=/etc/cni \ --mount volume=etc-cni,target=/etc/cni \