From d69d4a83030ccaed0297e7d667015e9c7c63a9f5 Mon Sep 17 00:00:00 2001 From: Calin Cristian Andrei Date: Mon, 6 Jun 2022 18:00:27 +0300 Subject: [PATCH] [kubernetes] make 1.24.1 the new default --- README.md | 2 +- inventory/sample/group_vars/k8s_cluster/k8s-cluster.yml | 2 +- roles/kubernetes/preinstall/tasks/0040-set_facts.yml | 1 + roles/kubespray-defaults/defaults/main.yaml | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index fc5dbd0e0..1620d4088 100644 --- a/README.md +++ b/README.md @@ -133,7 +133,7 @@ Note: Upstart/SysV init based OS types are not supported. ## Supported Components - Core - - [kubernetes](https://github.com/kubernetes/kubernetes) v1.23.7 + - [kubernetes](https://github.com/kubernetes/kubernetes) v1.24.1 - [etcd](https://github.com/etcd-io/etcd) v3.5.3 - [docker](https://www.docker.com/) v20.10 (see note) - [containerd](https://containerd.io/) v1.6.4 diff --git a/inventory/sample/group_vars/k8s_cluster/k8s-cluster.yml b/inventory/sample/group_vars/k8s_cluster/k8s-cluster.yml index be7788798..5ed394a8d 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.23.7 +kube_version: v1.24.1 # Where the binaries will be downloaded. # Note: ensure that you've enough disk space (about 1G) diff --git a/roles/kubernetes/preinstall/tasks/0040-set_facts.yml b/roles/kubernetes/preinstall/tasks/0040-set_facts.yml index 6c5ba4b89..e271d9e50 100644 --- a/roles/kubernetes/preinstall/tasks/0040-set_facts.yml +++ b/roles/kubernetes/preinstall/tasks/0040-set_facts.yml @@ -253,3 +253,4 @@ - not 'IPv6DualStack=true' in kubeadm_feature_gates when: - enable_dual_stack_networks + - kube_version is version('v1.24.0', '<') diff --git a/roles/kubespray-defaults/defaults/main.yaml b/roles/kubespray-defaults/defaults/main.yaml index fc4629703..107fc3f3a 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.23.7 +kube_version: v1.24.1 ## The minimum version working kube_version_min_required: v1.21.0