Make kubelet_load_modules always present but false.

Update code and docs for that assumption.
This commit is contained in:
Greg Althaus 2017-02-09 10:25:44 -06:00
parent 8f00a07bf6
commit d6f1f0c88b
3 changed files with 5 additions and 3 deletions

View file

@ -51,10 +51,10 @@ kube_api_anonymous_auth: false
# #
# For some things, kubelet needs to load kernel modules. For example, dynamic kernel services are needed # For some things, kubelet needs to load kernel modules. For example, dynamic kernel services are needed
# for mounting persistent volumes into containers. These may not be loaded by preinstall kubernetes # for mounting persistent volumes into containers. These may not be loaded by preinstall kubernetes
# processes. For example, ceph and rbd backed volumes. Uncomment to allow kubelet to load kernel # processes. For example, ceph and rbd backed volumes. Set to true to allow kubelet to load kernel
# modules. # modules.
# #
#kubelet_load_modules: true kubelet_load_modules: false
# Users to create for basic auth in Kubernetes API via HTTP # Users to create for basic auth in Kubernetes API via HTTP
kube_api_pwd: "changeme" kube_api_pwd: "changeme"

View file

@ -33,3 +33,5 @@ etcd_config_dir: /etc/ssl/etcd
# A port range to reserve for services with NodePort visibility. # A port range to reserve for services with NodePort visibility.
# Inclusive at both ends of the range. # Inclusive at both ends of the range.
kube_apiserver_node_port_range: "30000-32767" kube_apiserver_node_port_range: "30000-32767"
kubelet_load_modules: false

View file

@ -14,7 +14,7 @@
{% for dir in ssl_ca_dirs -%} {% for dir in ssl_ca_dirs -%}
-v {{ dir }}:{{ dir }}:ro \ -v {{ dir }}:{{ dir }}:ro \
{% endfor -%} {% endfor -%}
{% if kubelet_load_modules is defined and kubelet_load_modules == true -%} {% if kubelet_load_modules -%}
-v /lib/modules:/lib/modules:ro \ -v /lib/modules:/lib/modules:ro \
{% endif -%} {% endif -%}
-v /sys:/sys:ro \ -v /sys:/sys:ro \