From 270f91e577156468edff8aa880757c86ff917d19 Mon Sep 17 00:00:00 2001
From: Hans Feldt <2808287+hafe@users.noreply.github.com>
Date: Mon, 12 Oct 2020 09:04:47 +0200
Subject: [PATCH] cleanup kubelet_deployment_type (#6815)
No longer used/supported
---
docs/cri-o.md | 1 -
docs/vars.md | 5 -----
inventory/sample/group_vars/k8s-cluster/k8s-cluster.yml | 2 --
tests/files/packet_centos7-crio.yml | 1 -
tests/files/packet_ubuntu18-crio.yml | 1 -
5 files changed, 10 deletions(-)
diff --git a/docs/cri-o.md b/docs/cri-o.md
index b9ffb2a46..4ee245010 100644
--- 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
index 598fd4d7a..2c40ab0e7 100644
--- 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
index 0767927a1..8a1d103d5 100644
--- 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
index cfb745a67..7565f77bd 100644
--- 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
index e2ba42220..a4c60d3af 100644
--- 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
--
GitLab