Move min k8s version to 1.20

oomichi · Sep 22, 2021 · 5d1b34b · 5d1b34b
1 parent 8efde79
commit 5d1b34b
Show file tree

Hide file tree

Showing 10 changed files with 2 additions and 165 deletions.
diff --git a/README.md b/README.md
@@ -161,7 +161,7 @@ Note: Upstart/SysV init based OS types are not supported.
 
 ## Requirements
 
-- **Minimum required version of Kubernetes is v1.19**
+- **Minimum required version of Kubernetes is v1.20**
 - **Ansible v2.9.x, Jinja 2.11+ and python-netaddr is installed on the machine that will run Ansible commands, Ansible 2.10.x is experimentally supported for now**
 - 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
@@ -48,7 +48,6 @@ crio_kubernetes_version_matrix:
   "1.22": "1.21"
   "1.21": "1.21"
   "1.20": "1.20"
-  "1.19": "1.19"
 
 crio_version: "{{ crio_kubernetes_version_matrix[crio_required_version] | default('1.22') }}"
 

diff --git a/roles/container-engine/cri-o/vars/amazon.yml b/roles/container-engine/cri-o/vars/amazon.yml
@@ -7,8 +7,6 @@ crio_versioned_pkg:
     - "cri-o-1.21.*"
   "1.20":
     - "cri-o-1.20.*"
-  "1.19":
-    - "cri-o-1.19.*"
 
 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
@@ -4,8 +4,6 @@ crio_versioned_pkg:
     - "cri-o-1.21.*"
   "1.20":
     - "cri-o-1.20.*"
-  "1.19":
-    - "cri-o-1.19.*"
 
 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
@@ -4,8 +4,6 @@ crio_versioned_pkg:
     - "cri-o-1.21.*"
   "1.20":
     - "cri-o-1.20.*"
-  "1.19":
-    - "cri-o-1.19.*"
 
 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
@@ -6,9 +6,6 @@ crio_versioned_pkg:
   "1.20":
     - "cri-o=1.20*"
     - cri-o-runc
-  "1.19":
-    - "cri-o=1.19*"
-    - 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
@@ -7,5 +7,4 @@ crio_packages:
 crio_kubernetes_version_matrix:
   "1.21": "1.20"
   "1.20": "1.20"
-  "1.19": "1.19"
 crio_version: "{{ crio_kubernetes_version_matrix[crio_required_version] | default('1.20') }}"
diff --git a/roles/container-engine/cri-o/vars/ubuntu.yml b/roles/container-engine/cri-o/vars/ubuntu.yml
@@ -6,9 +6,6 @@ crio_versioned_pkg:
   "1.20":
     - "cri-o=1.20*"
     - cri-o-runc
-  "1.19":
-    - "cri-o=1.19*"
-    - cri-o-runc
 
 default_crio_packages: "{{ crio_versioned_pkg[crio_version] }}"
 

diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
diff --git a/roles/kubespray-defaults/defaults/main.yaml b/roles/kubespray-defaults/defaults/main.yaml
@@ -18,7 +18,7 @@ disable_swap: true
 kube_version: v1.22.2
 
 ## The minimum version working
-kube_version_min_required: v1.19.0
+kube_version_min_required: v1.20.0
 
 ## Kube Proxy mode One of ['iptables','ipvs']
 kube_proxy_mode: ipvs