cleanup kubelet_deployment_type (#6815)

No longer used/supported
kubernetes-sigs · Oct 12, 2020 · 270f91e · 270f91e
1 parent 07858e8
commit 270f91e
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 10 deletions.
diff --git a/docs/cri-o.md b/docs/cri-o.md
@@ -19,7 +19,6 @@ skip_downloads: false
 ## k8s-cluster.yml
 
 ```yaml
-kubelet_deployment_type: host
 container_manager: crio
 ```
 

diff --git a/docs/vars.md b/docs/vars.md
@@ -112,11 +112,6 @@ Stack](https://github.com/kubernetes-sigs/kubespray/blob/master/docs/dns-stack.m
 * *http_proxy/https_proxy/no_proxy/no_proxy_exclude_workers/additional_no_proxy* - Proxy variables for deploying behind a
   proxy. Note that no_proxy defaults to all internal cluster IPs and hostnames
   that correspond to each node.
-* *kubelet_deployment_type* - Controls which platform to deploy kubelet on.
-  Available options are ``host`` and ``docker``. ``docker`` mode
-  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_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/k8s-cluster/k8s-cluster.yml b/inventory/sample/group_vars/k8s-cluster/k8s-cluster.yml
@@ -204,8 +204,6 @@ kata_containers_enabled: false
 # containerd_untrusted_runtime_engine: ''
 # containerd_untrusted_runtime_root: ''
 
-## Settings for containerized control plane (kubelet/secrets)
-kubelet_deployment_type: host
 helm_deployment_type: host
 
 kubeadm_certificate_key: "{{ lookup('password', credentials_dir + '/kubeadm_certificate_key.creds length=64 chars=hexdigits') | lower }}"

diff --git a/tests/files/packet_centos7-crio.yml b/tests/files/packet_centos7-crio.yml
@@ -11,4 +11,3 @@ container_manager: crio
 # CRI-O requirements
 download_container: false
 etcd_deployment_type: host
-kubelet_deployment_type: host
diff --git a/tests/files/packet_ubuntu18-crio.yml b/tests/files/packet_ubuntu18-crio.yml
@@ -11,4 +11,3 @@ container_manager: crio
 # CRI-O requirements
 download_container: false
 etcd_deployment_type: host
-kubelet_deployment_type: host
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,7 +19,6 @@ skip_downloads: false @@
     ## k8s-cluster.yml
     ```yaml
-    kubelet_deployment_type: host
     container_manager: crio
     ```
@@ Expand Down @@