From 8efde799e15934f13c0e2ce43f2273380f369c2d Mon Sep 17 00:00:00 2001 From: Florian Ruynat <16313165+floryut@users.noreply.github.com> Date: Fri, 17 Sep 2021 16:42:27 +0200 Subject: [PATCH] Update kubernetes version to 1.22.2 --- README.md | 2 +- inventory/sample/group_vars/k8s_cluster/k8s-cluster.yml | 2 +- roles/container-engine/cri-o/defaults/main.yml | 3 ++- roles/kubespray-defaults/defaults/main.yaml | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 7b6be3ba9..cb9714e6a 100644 --- a/README.md +++ b/README.md @@ -130,7 +130,7 @@ Note: Upstart/SysV init based OS types are not supported. ## Supported Components - Core - - [kubernetes](https://github.com/kubernetes/kubernetes) v1.21.5 + - [kubernetes](https://github.com/kubernetes/kubernetes) v1.22.2 - [etcd](https://github.com/coreos/etcd) v3.4.13 - [docker](https://www.docker.com/) v20.10 (see note) - [containerd](https://containerd.io/) v1.4.9 diff --git a/inventory/sample/group_vars/k8s_cluster/k8s-cluster.yml b/inventory/sample/group_vars/k8s_cluster/k8s-cluster.yml index 1edd5f502..e2c5d5fc2 100644 --- a/inventory/sample/group_vars/k8s_cluster/k8s-cluster.yml +++ b/inventory/sample/group_vars/k8s_cluster/k8s-cluster.yml @@ -17,7 +17,7 @@ kube_token_dir: "{{ kube_config_dir }}/tokens" kube_api_anonymous_auth: true ## Change this to use another Kubernetes version, e.g. a current beta release -kube_version: v1.21.5 +kube_version: v1.22.2 # Where the binaries will be downloaded. # Note: ensure that you've enough disk space (about 1G) diff --git a/roles/container-engine/cri-o/defaults/main.yml b/roles/container-engine/cri-o/defaults/main.yml index 5f53aa6f9..e97dee0c1 100644 --- a/roles/container-engine/cri-o/defaults/main.yml +++ b/roles/container-engine/cri-o/defaults/main.yml @@ -45,11 +45,12 @@ crio_stream_port: "10010" crio_required_version: "{{ kube_version | regex_replace('^v(?P\\d+).(?P\\d+).(?P\\d+)$', '\\g.\\g') }}" 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.21') }}" +crio_version: "{{ crio_kubernetes_version_matrix[crio_required_version] | default('1.22') }}" # The crio_runtimes variable defines a list of OCI compatible runtimes. crio_runtimes: diff --git a/roles/kubespray-defaults/defaults/main.yaml b/roles/kubespray-defaults/defaults/main.yaml index 0205e3c51..41273d9a5 100644 --- a/roles/kubespray-defaults/defaults/main.yaml +++ b/roles/kubespray-defaults/defaults/main.yaml @@ -15,7 +15,7 @@ is_fedora_coreos: false disable_swap: true ## Change this to use another Kubernetes version, e.g. a current beta release -kube_version: v1.21.5 +kube_version: v1.22.2 ## The minimum version working kube_version_min_required: v1.19.0