Remove forgotten 1.21 references
This commit is contained in:
parent
24c8ba832a
commit
9e7f89d2a2
9 changed files with 1 additions and 16 deletions
|
@ -162,7 +162,7 @@ Note: Upstart/SysV init based OS types are not supported.
|
||||||
|
|
||||||
## Requirements
|
## 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**
|
- **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 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**.
|
- The target servers are configured to allow **IPv4 forwarding**.
|
||||||
|
|
|
@ -41,7 +41,6 @@ crio_kubernetes_version_matrix:
|
||||||
"1.24": "1.24"
|
"1.24": "1.24"
|
||||||
"1.23": "1.23"
|
"1.23": "1.23"
|
||||||
"1.22": "1.22"
|
"1.22": "1.22"
|
||||||
"1.21": "1.21"
|
|
||||||
|
|
||||||
crio_version: "{{ crio_kubernetes_version_matrix[crio_required_version] | default('1.24') }}"
|
crio_version: "{{ crio_kubernetes_version_matrix[crio_required_version] | default('1.24') }}"
|
||||||
|
|
||||||
|
|
|
@ -9,8 +9,6 @@ crio_versioned_pkg:
|
||||||
- "cri-o-1.23.*"
|
- "cri-o-1.23.*"
|
||||||
"1.22":
|
"1.22":
|
||||||
- "cri-o-1.22.*"
|
- "cri-o-1.22.*"
|
||||||
"1.21":
|
|
||||||
- "cri-o-1.21.*"
|
|
||||||
|
|
||||||
default_crio_packages: "{{ crio_versioned_pkg[crio_version] }}"
|
default_crio_packages: "{{ crio_versioned_pkg[crio_version] }}"
|
||||||
|
|
||||||
|
|
|
@ -6,8 +6,6 @@ crio_versioned_pkg:
|
||||||
- "cri-o-1.23.*"
|
- "cri-o-1.23.*"
|
||||||
"1.22":
|
"1.22":
|
||||||
- "cri-o-1.22.*"
|
- "cri-o-1.22.*"
|
||||||
"1.21":
|
|
||||||
- "cri-o-1.21.*"
|
|
||||||
|
|
||||||
default_crio_packages: "{{ crio_versioned_pkg[crio_version] }}"
|
default_crio_packages: "{{ crio_versioned_pkg[crio_version] }}"
|
||||||
|
|
||||||
|
|
|
@ -6,8 +6,6 @@ crio_versioned_pkg:
|
||||||
- "cri-o-1.23.*"
|
- "cri-o-1.23.*"
|
||||||
"1.22":
|
"1.22":
|
||||||
- "cri-o-1.22.*"
|
- "cri-o-1.22.*"
|
||||||
"1.21":
|
|
||||||
- "cri-o-1.21.*"
|
|
||||||
|
|
||||||
default_crio_packages: "{{ crio_versioned_pkg[crio_version] }}"
|
default_crio_packages: "{{ crio_versioned_pkg[crio_version] }}"
|
||||||
|
|
||||||
|
|
|
@ -9,9 +9,6 @@ crio_versioned_pkg:
|
||||||
"1.22":
|
"1.22":
|
||||||
- "cri-o=1.22*"
|
- "cri-o=1.22*"
|
||||||
- cri-o-runc
|
- cri-o-runc
|
||||||
"1.21":
|
|
||||||
- "cri-o=1.21*"
|
|
||||||
- cri-o-runc
|
|
||||||
|
|
||||||
crio_debian_buster_backports_packages:
|
crio_debian_buster_backports_packages:
|
||||||
- "libseccomp2"
|
- "libseccomp2"
|
||||||
|
|
|
@ -6,5 +6,4 @@ crio_kubernetes_version_matrix:
|
||||||
"1.24": "1.23"
|
"1.24": "1.23"
|
||||||
"1.23": "1.23"
|
"1.23": "1.23"
|
||||||
"1.22": "1.22"
|
"1.22": "1.22"
|
||||||
"1.21": "1.21"
|
|
||||||
crio_version: "{{ crio_kubernetes_version_matrix[crio_required_version] | default('1.23') }}"
|
crio_version: "{{ crio_kubernetes_version_matrix[crio_required_version] | default('1.23') }}"
|
||||||
|
|
|
@ -9,9 +9,6 @@ crio_versioned_pkg:
|
||||||
"1.22":
|
"1.22":
|
||||||
- "cri-o=1.22*"
|
- "cri-o=1.22*"
|
||||||
- cri-o-runc
|
- cri-o-runc
|
||||||
"1.21":
|
|
||||||
- "cri-o=1.21*"
|
|
||||||
- cri-o-runc
|
|
||||||
|
|
||||||
default_crio_packages: "{{ crio_versioned_pkg[crio_version] }}"
|
default_crio_packages: "{{ crio_versioned_pkg[crio_version] }}"
|
||||||
|
|
||||||
|
|
|
@ -252,7 +252,6 @@ kube_api_aggregator_routing: false
|
||||||
kube_profiling: false
|
kube_profiling: false
|
||||||
|
|
||||||
# Graceful Node Shutdown
|
# Graceful Node Shutdown
|
||||||
# This requires kubernetes >= 1.21.0
|
|
||||||
kubelet_shutdown_grace_period: 60s
|
kubelet_shutdown_grace_period: 60s
|
||||||
# kubelet_shutdown_grace_period_critical_pods should be less than kubelet_shutdown_grace_period
|
# kubelet_shutdown_grace_period_critical_pods should be less than kubelet_shutdown_grace_period
|
||||||
# to give normal pods time to be gracefully evacuated
|
# to give normal pods time to be gracefully evacuated
|
||||||
|
|
Loading…
Reference in a new issue