Browse Source

Remove forgotten 1.21 references

pull/8991/head
Florian Ruynat 3 years ago
parent
commit
9e7f89d2a2
9 changed files with 1 additions and 16 deletions
  1. 2
      README.md
  2. 1
      roles/container-engine/cri-o/defaults/main.yml
  3. 2
      roles/container-engine/cri-o/vars/amazon.yml
  4. 2
      roles/container-engine/cri-o/vars/centos-7.yml
  5. 2
      roles/container-engine/cri-o/vars/centos-8.yml
  6. 3
      roles/container-engine/cri-o/vars/debian.yml
  7. 1
      roles/container-engine/cri-o/vars/fedora.yml
  8. 3
      roles/container-engine/cri-o/vars/ubuntu.yml
  9. 1
      roles/kubespray-defaults/defaults/main.yaml

2
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**.

1
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') }}"

2
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] }}"

2
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] }}"

2
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] }}"

3
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"

1
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') }}"

3
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] }}"

1
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

Loading…
Cancel
Save