From 3c5080e69a16186ac52d0ab0aaf012b54d1123dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= <valtri@civ.zcu.cz>
Date: Sat, 11 May 2024 20:35:23 +0000
Subject: [PATCH] Update upgrade process due to new k8s repositories

---
 cesnet-central/playbooks/k8s.yaml     |  4 ++--
 cesnet-central/playbooks/upgrade.yaml | 12 +++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/cesnet-central/playbooks/k8s.yaml b/cesnet-central/playbooks/k8s.yaml
index 4a54187..ee87d59 100644
--- a/cesnet-central/playbooks/k8s.yaml
+++ b/cesnet-central/playbooks/k8s.yaml
@@ -123,7 +123,7 @@
         # kube_nvidia_device_plugin_version: "v0.12.2"
         # kube_nvidia_driver_version: "515" # "525"
         kube_nvidia_support: true
-        kube_version: 1.28.8
+        kube_version: 1.29.4
         kube_network: 'none'  # custom network installation
         kube_install_helm: true
         kube_install_helm_version: 'v3.13.0'
@@ -186,7 +186,7 @@
         # must be IPv4 address or hostname
         kube_server: "{{ hostvars[groups['master'][0]].kube_server | default(groups['master'][0]) }}"
         kube_type_of_node: wn
-        kube_version: 1.28.8
+        kube_version: 1.29.4
         kubelet_extra_args: '--volume-stats-agg-period 0'
   tasks:
     - name: Overlay2 mountpoint workaround to docker.service unit
diff --git a/cesnet-central/playbooks/upgrade.yaml b/cesnet-central/playbooks/upgrade.yaml
index 79e2c3b..9c041da 100644
--- a/cesnet-central/playbooks/upgrade.yaml
+++ b/cesnet-central/playbooks/upgrade.yaml
@@ -6,13 +6,18 @@
 #
 # Usage example:
 #
-# VERSION=1.28.8
+# VERSION=1.29.4
 # ansible-playbook playbooks/upgrade.yaml --extra-vars "version=$VERSION"
 #
 - name: Upgrade and hold kubeadm package
   hosts: master,ingress,nfs,worker,gpu
   become: true
   tasks:
+    - name: New k8s repository
+      copy:
+        dest: /etc/apt/sources.list.d/pkgs_k8s_io_core_stable_v1_29_deb.list
+        content: deb https://pkgs.k8s.io/core:/stable:/v1.29/deb/ /
+        mode: 0644
     - name: Upgrade packages
       apt:
         name: kubeadm={{ version }}*
@@ -65,6 +70,11 @@
       systemd:
         state: restarted
         name: kubelet
+    - name: Cleanup old k8s repository
+      file:
+        path: /etc/apt/sources.list.d/pkgs_k8s_io_core_stable_v1_29_deb.list
+        state: absent
+
 
 # pinned by grycap.kubernetes
 # - name: Upgrade networking
-- 
GitLab