From faa40488613d842e5860eafdc679efc82bcaaa75 Mon Sep 17 00:00:00 2001
From: Adrien Reslinger <adrien@reslinger.net>
Date: Sun, 25 Dec 2022 20:40:12 +0100
Subject: [PATCH] Update kubernetes to version 1.26.0

---
 defaults/main.yml         | 3 ++-
 tasks/cluster_k3s.yml     | 8 ++++----
 tasks/cluster_kubeadm.yml | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 6982086..f3ded6b 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -6,6 +6,7 @@ kubernetes_interface: '{{ ansible_default_ipv4.interface }}'
 # value for kuberntes_network: flannel, calico, weave-net
 #kubernetes_network: weave-net
 kubernetes_kubeproxy_mode: ipvs
-kubernetes_version: 1.25.5
+kubernetes_version: 1.26.0
+kubernetes_k3s_version: 1.26.0
 kubernetes_pods_network: "10.244.0.0/16"
 lb_auth_pass: 1be344d62acc46c6858ae8475668a245
diff --git a/tasks/cluster_k3s.yml b/tasks/cluster_k3s.yml
index 4063e86..fdd20f8 100644
--- a/tasks/cluster_k3s.yml
+++ b/tasks/cluster_k3s.yml
@@ -28,7 +28,7 @@
   when:
     - ansible_pkg_mgr == "dnf"
     - ansible_os_family == "RedHat"
-    - ansible_distribution_major_version == '8'
+    - ansible_distribution_major_version >= '8'
 
 - name: Check if /usr/local/bin/k3s already existe
   ansible.builtin.stat:
@@ -39,7 +39,7 @@
 
 - name: Retreive k3s binary for x86_64
   ansible.builtin.get_url:
-    url: "https://github.com/rancher/k3s/releases/download/v1.25.4%2Bk3s1/k3s"
+    url: "https://github.com/rancher/k3s/releases/download/v{{ kubernetes_k3s_version }}%2Bk3s1/k3s"
     dest: "/usr/local/bin/k3s"
     group: root
     owner: root
@@ -50,7 +50,7 @@
 
 - name: Retreive k3s binary for arm64
   ansible.builtin.get_url:
-    url: "https://github.com/rancher/k3s/releases/download/v1.25.4%2Bk3s1/k3s-arm64"
+    url: "https://github.com/rancher/k3s/releases/download/v{{ kubernetes_k3s_version }}%2Bk3s1/k3s-arm64"
     dest: "/usr/local/bin/k3s"
     group: root
     owner: root
@@ -61,7 +61,7 @@
 
 - name: Retreive k3s binary for armv6/armv7
   ansible.builtin.get_url:
-    url: "https://github.com/rancher/k3s/releases/download/v1.25.4%2Bk3s1/k3s-armhf"
+    url: "https://github.com/rancher/k3s/releases/download/v{{ kubernetes_k3s_version }}%2Bk3s1/k3s-armhf"
     dest: "/usr/local/bin/k3s"
     group: root
     owner: root
diff --git a/tasks/cluster_kubeadm.yml b/tasks/cluster_kubeadm.yml
index 22ccc9a..b9ba75c 100644
--- a/tasks/cluster_kubeadm.yml
+++ b/tasks/cluster_kubeadm.yml
@@ -78,7 +78,7 @@
   when:
     - kubernetes_kubeproxy_mode == "ipvs"
     - ansible_os_family == "RedHat"
-    - ansible_distribution_major_version == '8'
+    - ansible_distribution_major_version >= '8'
 
 - name: Create thin volumes for kubernetes
   community.general.lvol: