From a38f9308587f30a5e3586cb2bac11270519d2b29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Petazzoni?= <jerome.petazzoni@gmail.com>
Date: Sun, 3 Dec 2023 21:33:25 -0600
Subject: [PATCH] =?UTF-8?q?=F0=9F=93=A6=20Use=20new=20k8s=20package=20repo?=
 =?UTF-8?q?sitories?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 prepare-labs/lib/commands.sh               |  38 ++++++++++++++-------
 prepare-labs/lib/kubernetes-apt-key.gpg    | Bin 1210 -> 0 bytes
 prepare-labs/settings/admin-oldversion.env |   2 +-
 3 files changed, 26 insertions(+), 14 deletions(-)
 delete mode 100644 prepare-labs/lib/kubernetes-apt-key.gpg

diff --git a/prepare-labs/lib/commands.sh b/prepare-labs/lib/commands.sh
index 53129acd..65da0144 100644
--- a/prepare-labs/lib/commands.sh
+++ b/prepare-labs/lib/commands.sh
@@ -421,18 +421,18 @@ _cmd_kubebins() {
     TAG=$1
     need_tag
 
-    ##VERSION##
     if [ "$KUBEVERSION" = "" ]; then
         KUBEVERSION="$(curl -fsSL https://cdn.dl.k8s.io/release/stable.txt | sed s/^v//)"
     fi
 
+    ##VERSION##
     case "$KUBEVERSION" in
     1.19.*)
       ETCD_VERSION=v3.4.13
       CNI_VERSION=v0.8.7
       ;;
     *)
-      ETCD_VERSION=v3.5.9
+      ETCD_VERSION=v3.5.10
       CNI_VERSION=v1.3.0
       ;;
     esac
@@ -466,24 +466,36 @@ _cmd_kubepkgs() {
     TAG=$1
     need_tag
 
-    if [ "$KUBEVERSION" ]; then
-        pssh "
-        sudo tee /etc/apt/preferences.d/kubernetes <<EOF
+    # Prior September 2023, there was a single Kubernetes package repo that
+    # contained packages for all versions, so we could just add that repo
+    # and install whatever was the latest version available there.
+    # Things have changed (versions after September 2023, e.g. 1.28.3 are
+    # not in the old repo) and now there is a different repo for each
+    # minor version, so we need to figure out what minor version we are
+    # installing to add the corresponding repo.
+    if [ "$KUBEVERSION" = "" ]; then
+        KUBEVERSION="$(curl -fsSL https://cdn.dl.k8s.io/release/stable.txt | sed s/^v//)"
+    fi
+    KUBEREPOVERSION="$(echo $KUBEVERSION | cut -d. -f1-2)"
+
+    # Since the new repo doesn't have older versions, add a safety check here.
+    MINORVERSION="$(echo $KUBEVERSION | cut -d. -f2)"
+    if [ "$MINORVERSION" -lt 24 ]; then
+        die "Cannot install kubepkgs for versions before 1.24."
+    fi
+
+    pssh "
+    sudo tee /etc/apt/preferences.d/kubernetes <<EOF
 Package: kubectl kubeadm kubelet
 Pin: version $KUBEVERSION-*
 Pin-Priority: 1000
 EOF"
-    fi
-
-    # As of February 27th, 2023, packages.cloud.google.com seems broken
-    # (serves HTTP 500 errors for the GPG key), so let's pre-load that key.
-    pssh -I "sudo apt-key add -" < lib/kubernetes-apt-key.gpg
 
     # Install packages
     pssh --timeout 200 "
-    #curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg |
-    #sudo apt-key add - &&
-    echo deb http://apt.kubernetes.io/ kubernetes-xenial main |
+    curl -fsSL https://pkgs.k8s.io/core:/stable:/v$KUBEREPOVERSION/deb/Release.key | 
+    gpg --dearmor | sudo tee /etc/apt/keyrings/kubernetes-apt-keyring.gpg &&
+    echo 'deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v$KUBEREPOVERSION/deb/ /' |
     sudo tee /etc/apt/sources.list.d/kubernetes.list"
     pssh --timeout 200 "
     sudo apt-get update -q &&
diff --git a/prepare-labs/lib/kubernetes-apt-key.gpg b/prepare-labs/lib/kubernetes-apt-key.gpg
deleted file mode 100644
index 0f478144f1491ce0e6668faf181eb8a7f24a208a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1210
zcmV;r1V#JCz)b{Vh_%!K2mscYq|IbT7J+=b+*`^Oj$cN)IJ9G0;1{?}mAAo~T({7p
z@JRBJPSW&4=qGU<Dx5`@(b2oK8xAguStCH<d~lxUP_2QnpB#Ed?Mei3aUK%iTFb?7
zV=#)}^PZe-BHvWbpr+Y`#9Nb8pENkFb}Cf@wiL0r!R86&vapelnX+_Ar#xL8VsxY!
zs=`AP@wd=)oTgA3FrVa}xebRBr{h%12u1B3!Ql2hb)H&}Url>6)ec&2A)J#VmCA#C
z|M1{S^3<Wl9A?Vay@T2}>O7Tn&fI1N7}adYPQ9-dtC8TNI+&0-YS5c37a=4rb<3<u
z38sPj5oLwD6fkn+#47+10RREbQBq-WbairNAVGC>Z*5_8X=5N$X=iR}Zf77%WqBYd
zV{C7AWG!-GaCCKYWi4}QXKrb3XDw@Gc`Y(9GBPbNGc7PTEigD=Ffm^+F)na*VkyGF
zVgwTb2mlrZ0%C}@)Cmx^J;)6c?e7Hw8v_Cv0RRBOs0aXjKodwH-O$)Q+G-l#k-nP6
z-g(UI5z^V~isDhA@#r?{D>{&`^`(q5^Z*Feq{hq1#6f&HM)QRxBLN<F;Sl12G~Tu{
zwu@{EFF)iaHe0w}8C=Y#3T`xcS+!l7l<RdpT^*6eW$C9QX)>e^^t$sHNzEqccHSo%
zWsaw#U7E)!v2s_x`5>lsuP6)$+R`k5+AN^`<uv8HnZKS43#38UbS+EoFFLY=8otqD
zpVeaYGhu1Ia!!N3R+V3+LFZ6pE?u`t2`9;t2?bN;^4nDFkut8h2G%mm996?oqJKt{
zN~`0-&1kZ>i?ZAY*DKFab29GU>|zf<kRwF**6+y9z)b{Vh_%!K2mr`1!d*qkG(H>q
z_$t}Yd{Gm@ThG7^`GAXx1RftieU>Qkk}w6Y>tP2%D?0A$y8~GIYu!JmKzju)uj)x?
zh{SvDEbx#-6}|z)m%#-4gluH7ZY~ZyLT<r6cTB=e63+gBj6w=*BB3}SOd5J8FziqF
z9R=)`3hM$x0M@3e7z%|JB)Zf?r%sfP?CPJQAwx)NYjOlE8{#bN+p*memHdM9y{t!V
zalZHW(egWb1L6VTa^YgRl<B=;-JjK%!10XgdPy{H+^*8+a@5h$!~H7jQas%0$tQrG
zA@T6PUTx6*w9~>^FOIb521d65cueP!h;<8zGj#n<Ms9AVc_#o70RREQz+VIy0SEvS
z1p;D-wbTg^wLQoU6YcK>0vikf07;k#0EH9e{n2CZR@D7O*RDY%Wt_zHoYaA-|F+zb
ztzM99RzL(CpW>Dy20yYatT)@uKm3)htg12E?8K{BU0nB_L~;T~=yeu1bkd7jL+l0@
zc^L1E<ytGj>1ukma{Wm(HKA4kQvSz<A?PQYArQQtcN|B?>ePTx1NxT5T!@PC$-o`;
z(<H|$nEFEbg@g<6-l&X(aMR??7;Qx>ghh8M)_;m7^ArH11OC^u!uzAl7Me+BshQcv
zn$%;AzR1N#hH7P2I|9&cO8(!2FwNJAb;A68tNAPs6q8G($>rU`APVqOkg_aD`xbA{
YvDCB4XX2J{8xPZ_^SyA%2cipL&5QI%SpWb4

diff --git a/prepare-labs/settings/admin-oldversion.env b/prepare-labs/settings/admin-oldversion.env
index 5d48a56d..c3357728 100644
--- a/prepare-labs/settings/admin-oldversion.env
+++ b/prepare-labs/settings/admin-oldversion.env
@@ -7,7 +7,7 @@ USER_PASSWORD=training
 
 # For a list of old versions, check:
 # https://kubernetes.io/releases/patch-releases/#non-active-branch-history
-KUBEVERSION=1.22.5
+KUBEVERSION=1.24.14
 
 STEPS="
   wait