From 0c51352a74052455cc6014c5394eaf36316ddfda Mon Sep 17 00:00:00 2001
From: spaced <spaced.wombat@gmail.com>
Date: Tue, 7 Apr 2020 20:51:44 +0200
Subject: [PATCH] remove unused kubelet options (#5903)
---
inventory/sample/group_vars/k8s-cluster/k8s-cluster.yml | 4 ----
roles/kubernetes/node/defaults/main.yml | 8 --------
2 files changed, 12 deletions(-)
diff --git a/inventory/sample/group_vars/k8s-cluster/k8s-cluster.yml b/inventory/sample/group_vars/k8s-cluster/k8s-cluster.yml
index 233c050e8..a95bf0f42 100644
--- a/inventory/sample/group_vars/k8s-cluster/k8s-cluster.yml
+++ b/inventory/sample/group_vars/k8s-cluster/k8s-cluster.yml
@@ -227,10 +227,6 @@ podsecuritypolicy_enabled: false
# Download kubectl onto the host that runs Ansible in {{ bin_dir }}
# kubectl_localhost: false
-
-# 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.
# Acceptable options are 'pods', 'system-reserved', 'kube-reserved' and ''. Default is "".
# kubelet_enforce_node_allocatable: pods
diff --git a/roles/kubernetes/node/defaults/main.yml b/roles/kubernetes/node/defaults/main.yml
index 9ee1f23c8..28a72e365 100644
--- a/roles/kubernetes/node/defaults/main.yml
+++ b/roles/kubernetes/node/defaults/main.yml
@@ -11,10 +11,6 @@ kubelet_bind_address: "{{ ip | default('0.0.0.0') }}"
# resolv.conf to base dns config
kube_resolv_conf: "/etc/resolv.conf"
-# These options reflect limitations of running kubelet in a container.
-# Modify at your own risk
-kubelet_enable_cri: true
-kubelet_cgroups_per_qos: true
# Set to empty to avoid cgroup creation
kubelet_enforce_node_allocatable: "\"\""
@@ -23,10 +19,6 @@ kubelet_runtime_cgroups: "/systemd/system.slice"
# Set kubelet cgroups
kubelet_kubelet_cgroups: "/systemd/system.slice"
-# Set false to enable sharing a pid namespace between containers in a pod.
-# Note that PID namespace sharing requires docker >= 1.13.1.
-kubelet_disable_shared_pid: true
-
### fail with swap on (default true)
kubelet_fail_swap_on: true
--
GitLab