Merge pull request #1442 from Sispheor/fix_kublet_options

Fix enforce-node-allocatable option

inventory/group_vars/k8s-cluster.yml

@@ -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

roles/kubernetes/node/defaults/main.yml

@@ -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

roles/kubernetes/node/templates/kubelet.j2

@@ -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' %}