From 9e7f89d2a238a6c95fc3129f96af9100cb6b1ea7 Mon Sep 17 00:00:00 2001 From: Florian Ruynat <16313165+floryut@users.noreply.github.com> Date: Wed, 15 Jun 2022 10:03:38 +0200 Subject: [PATCH] Remove forgotten 1.21 references --- README.md | 2 +- roles/container-engine/cri-o/defaults/main.yml | 1 - roles/container-engine/cri-o/vars/amazon.yml | 2 -- roles/container-engine/cri-o/vars/centos-7.yml | 2 -- roles/container-engine/cri-o/vars/centos-8.yml | 2 -- roles/container-engine/cri-o/vars/debian.yml | 3 --- roles/container-engine/cri-o/vars/fedora.yml | 1 - roles/container-engine/cri-o/vars/ubuntu.yml | 3 --- roles/kubespray-defaults/defaults/main.yaml | 1 - 9 files changed, 1 insertion(+), 16 deletions(-) diff --git a/README.md b/README.md index 0df4a57bf..af22fd24f 100644 --- a/README.md +++ b/README.md @@ -162,7 +162,7 @@ Note: Upstart/SysV init based OS types are not supported. ## Requirements -- **Minimum required version of Kubernetes is v1.21** +- **Minimum required version of Kubernetes is v1.22** - **Ansible v2.11+, Jinja 2.11+ and python-netaddr is installed on the machine that will run Ansible commands** - The target servers must have **access to the Internet** in order to pull docker images. Otherwise, additional configuration is required (See [Offline Environment](docs/offline-environment.md)) - The target servers are configured to allow **IPv4 forwarding**. diff --git a/roles/container-engine/cri-o/defaults/main.yml b/roles/container-engine/cri-o/defaults/main.yml index 6625ca3ad..d507b4edc 100644 --- a/roles/container-engine/cri-o/defaults/main.yml +++ b/roles/container-engine/cri-o/defaults/main.yml @@ -41,7 +41,6 @@ crio_kubernetes_version_matrix: "1.24": "1.24" "1.23": "1.23" "1.22": "1.22" - "1.21": "1.21" crio_version: "{{ crio_kubernetes_version_matrix[crio_required_version] | default('1.24') }}" diff --git a/roles/container-engine/cri-o/vars/amazon.yml b/roles/container-engine/cri-o/vars/amazon.yml index 16bba67ae..e4668b333 100644 --- a/roles/container-engine/cri-o/vars/amazon.yml +++ b/roles/container-engine/cri-o/vars/amazon.yml @@ -9,8 +9,6 @@ crio_versioned_pkg: - "cri-o-1.23.*" "1.22": - "cri-o-1.22.*" - "1.21": - - "cri-o-1.21.*" default_crio_packages: "{{ crio_versioned_pkg[crio_version] }}" diff --git a/roles/container-engine/cri-o/vars/centos-7.yml b/roles/container-engine/cri-o/vars/centos-7.yml index 5e1818582..c6556fbfe 100644 --- a/roles/container-engine/cri-o/vars/centos-7.yml +++ b/roles/container-engine/cri-o/vars/centos-7.yml @@ -6,8 +6,6 @@ crio_versioned_pkg: - "cri-o-1.23.*" "1.22": - "cri-o-1.22.*" - "1.21": - - "cri-o-1.21.*" default_crio_packages: "{{ crio_versioned_pkg[crio_version] }}" diff --git a/roles/container-engine/cri-o/vars/centos-8.yml b/roles/container-engine/cri-o/vars/centos-8.yml index 5e1818582..c6556fbfe 100644 --- a/roles/container-engine/cri-o/vars/centos-8.yml +++ b/roles/container-engine/cri-o/vars/centos-8.yml @@ -6,8 +6,6 @@ crio_versioned_pkg: - "cri-o-1.23.*" "1.22": - "cri-o-1.22.*" - "1.21": - - "cri-o-1.21.*" default_crio_packages: "{{ crio_versioned_pkg[crio_version] }}" diff --git a/roles/container-engine/cri-o/vars/debian.yml b/roles/container-engine/cri-o/vars/debian.yml index 39296f52a..d7b5209f6 100644 --- a/roles/container-engine/cri-o/vars/debian.yml +++ b/roles/container-engine/cri-o/vars/debian.yml @@ -9,9 +9,6 @@ crio_versioned_pkg: "1.22": - "cri-o=1.22*" - cri-o-runc - "1.21": - - "cri-o=1.21*" - - cri-o-runc crio_debian_buster_backports_packages: - "libseccomp2" diff --git a/roles/container-engine/cri-o/vars/fedora.yml b/roles/container-engine/cri-o/vars/fedora.yml index 84f82b0b4..9ba130b98 100644 --- a/roles/container-engine/cri-o/vars/fedora.yml +++ b/roles/container-engine/cri-o/vars/fedora.yml @@ -6,5 +6,4 @@ crio_kubernetes_version_matrix: "1.24": "1.23" "1.23": "1.23" "1.22": "1.22" - "1.21": "1.21" crio_version: "{{ crio_kubernetes_version_matrix[crio_required_version] | default('1.23') }}" diff --git a/roles/container-engine/cri-o/vars/ubuntu.yml b/roles/container-engine/cri-o/vars/ubuntu.yml index 6ab1b0abd..632c379b5 100644 --- a/roles/container-engine/cri-o/vars/ubuntu.yml +++ b/roles/container-engine/cri-o/vars/ubuntu.yml @@ -9,9 +9,6 @@ crio_versioned_pkg: "1.22": - "cri-o=1.22*" - cri-o-runc - "1.21": - - "cri-o=1.21*" - - cri-o-runc default_crio_packages: "{{ crio_versioned_pkg[crio_version] }}" diff --git a/roles/kubespray-defaults/defaults/main.yaml b/roles/kubespray-defaults/defaults/main.yaml index e0d948d74..756c6f7c3 100644 --- a/roles/kubespray-defaults/defaults/main.yaml +++ b/roles/kubespray-defaults/defaults/main.yaml @@ -252,7 +252,6 @@ kube_api_aggregator_routing: false kube_profiling: false # Graceful Node Shutdown -# This requires kubernetes >= 1.21.0 kubelet_shutdown_grace_period: 60s # kubelet_shutdown_grace_period_critical_pods should be less than kubelet_shutdown_grace_period # to give normal pods time to be gracefully evacuated