Merge pull request #1442 from Sispheor/fix_kublet_options

Fix enforce-node-allocatable option
This commit is contained in:
Spencer Smith 2017-07-31 09:00:42 -04:00 committed by GitHub
commit a2534e03bd
3 changed files with 14 additions and 2 deletions

View file

@ -152,3 +152,15 @@ efk_enabled: false
# Helm deployment
helm_enabled: false
# dnsmasq
# dnsmasq_upstream_dns_servers:
# - /resolvethiszone.with/10.0.4.250
# - 8.8.8.8
# Enable creation of QoS cgroup hierarchy, if true top level QoS and pod cgroups are created. (default true)
# kubelet_cgroups_per_qos: true
# A comma separated list of levels of node allocatable enforcement to be enforced by kubelet.
# Acceptible options are 'pods', 'system-reserved', 'kube-reserved' and ''. Default is "".
# kubelet_enforce_node_allocatable: pods

View file

@ -18,7 +18,7 @@ kube_proxy_masquerade_all: false
kubelet_enable_cri: false
kubelet_cgroups_per_qos: false
# Set to empty to avoid cgroup creation
kubelet_enforce_node_allocatable: ""
kubelet_enforce_node_allocatable: "\"\""
# Limits for kube components and nginx load balancer app

View file

@ -19,7 +19,7 @@ KUBELET_HOSTNAME="--hostname-override={{ ansible_hostname }}"
--enable-cri={{ kubelet_enable_cri }} \
{% endif %}
--cgroups-per-qos={{ kubelet_cgroups_per_qos }} \
--enforce-node-allocatable='{{ kubelet_enforce_node_allocatable }}' {% endif %}{% endset %}
--enforce-node-allocatable={{ kubelet_enforce_node_allocatable }} {% endif %}{% endset %}
{# DNS settings for kubelet #}
{% if dns_mode == 'kubedns' %}