From 803d52ffceb030eac0ad878cc509efa9a602804f Mon Sep 17 00:00:00 2001
From: Hans Feldt <2808287+hafe@users.noreply.github.com>
Date: Fri, 4 Sep 2020 13:53:56 +0200
Subject: [PATCH] kubernetes: remove unused variables (#6601)

---
 docs/vars.md                                   |  6 ------
 inventory/sample/group_vars/all/all.yml        |  5 -----
 roles/kubernetes/master/defaults/main/main.yml | 17 -----------------
 roles/kubernetes/node/defaults/main.yml        |  2 --
 4 files changed, 30 deletions(-)

diff --git a/docs/vars.md b/docs/vars.md
index d46d789ce..53e55b91c 100644
--- a/docs/vars.md
+++ b/docs/vars.md
@@ -72,8 +72,6 @@ following default cluster parameters:
   on the CoreDNS service.
 * *cloud_provider* - Enable extra Kubelet option if operating inside GCE or
   OpenStack (default is unset)
-* *kube_hostpath_dynamic_provisioner* - Required for use of PetSets type in
-  Kubernetes
 * *kube_feature_gates* - A list of key=value pairs that describe feature gates for
   alpha/experimental Kubernetes features. (defaults is `[]`)
 * *authorization_modes* - A list of [authorization mode](
@@ -119,10 +117,6 @@ Stack](https://github.com/kubernetes-sigs/kubespray/blob/master/docs/dns-stack.m
   is unlikely to work on newer releases. Starting with Kubernetes v1.7
   series, this now defaults to ``host``. Before v1.7, the default was Docker.
   This is because of cgroup [issues](https://github.com/kubernetes/kubernetes/issues/43704).
-* *kubelet_load_modules* - 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 processes.  For example, ceph and rbd backed volumes.  Set this variable to
-  true to let kubelet load kernel modules.
 * *kubelet_cgroup_driver* - Allows manual override of the
   cgroup-driver option for Kubelet. By default autodetection is used
   to match Docker configuration.
diff --git a/inventory/sample/group_vars/all/all.yml b/inventory/sample/group_vars/all/all.yml
index 87a764c37..4fe7c461a 100644
--- a/inventory/sample/group_vars/all/all.yml
+++ b/inventory/sample/group_vars/all/all.yml
@@ -35,11 +35,6 @@ loadbalancer_apiserver_port: 6443
 loadbalancer_apiserver_healthcheck_port: 8081
 
 ### OTHER OPTIONAL VARIABLES
-## 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
-## processes.  For example, ceph and rbd backed volumes.  Set to true to allow kubelet to load kernel
-## modules.
-# kubelet_load_modules: false
 
 ## Upstream dns servers
 # upstream_dns_servers:
diff --git a/roles/kubernetes/master/defaults/main/main.yml b/roles/kubernetes/master/defaults/main/main.yml
index a9696388c..4a176e901 100644
--- a/roles/kubernetes/master/defaults/main/main.yml
+++ b/roles/kubernetes/master/defaults/main/main.yml
@@ -8,10 +8,6 @@ kubeadm_control_plane: false
 # Experimental kubeadm etcd deployment mode. Available only for new deployment
 etcd_kubeadm_enabled: false
 
-# An experimental dev/test only dynamic volumes provisioner,
-# for PetSets. Works for kube>=v1.3 only.
-kube_hostpath_dynamic_provisioner: "false"
-
 # change to 0.0.0.0 to enable insecure access from anywhere (not recommended)
 kube_apiserver_insecure_bind_address: 127.0.0.1
 
@@ -83,23 +79,10 @@ audit_webhook_mode: batch
 audit_webhook_batch_max_size: 100
 audit_webhook_batch_max_wait: 1s
 
-# Limits for kube components
-kube_controller_memory_limit: 512M
-kube_controller_cpu_limit: 250m
-kube_controller_memory_requests: 100M
-kube_controller_cpu_requests: 100m
 kube_controller_node_monitor_grace_period: 40s
 kube_controller_node_monitor_period: 5s
 kube_controller_pod_eviction_timeout: 5m0s
 kube_controller_terminated_pod_gc_threshold: 12500
-kube_scheduler_memory_limit: 512M
-kube_scheduler_cpu_limit: 250m
-kube_scheduler_memory_requests: 170M
-kube_scheduler_cpu_requests: 80m
-kube_apiserver_memory_limit: 2000M
-kube_apiserver_cpu_limit: 800m
-kube_apiserver_memory_requests: 256M
-kube_apiserver_cpu_requests: 100m
 kube_apiserver_request_timeout: "1m0s"
 
 # 1.10+ admission plugins
diff --git a/roles/kubernetes/node/defaults/main.yml b/roles/kubernetes/node/defaults/main.yml
index acacb4c24..e0adc0beb 100644
--- a/roles/kubernetes/node/defaults/main.yml
+++ b/roles/kubernetes/node/defaults/main.yml
@@ -51,8 +51,6 @@ loadbalancer_apiserver_keepalive_timeout: 5m
 # Inclusive at both ends of the range.
 kube_apiserver_node_port_range: "30000-32767"
 
-kubelet_load_modules: false
-
 # Configure the amount of pods able to run on single node
 # default is equal to application default
 kubelet_max_pods: 110