From c1f8177f4e34ffe8580f73d11c72e27470e66e84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Petazzoni?= <jerome.petazzoni@gmail.com>
Date: Wed, 17 May 2023 19:04:32 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20Pass=20kubernetesVersion:=20in?=
 =?UTF-8?q?=20kubeadm=20config=20file?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 prepare-labs/lib/commands.sh               | 9 ++-------
 prepare-labs/settings/admin-oldversion.env | 2 +-
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/prepare-labs/lib/commands.sh b/prepare-labs/lib/commands.sh
index 4fa6bca8..60e8288e 100644
--- a/prepare-labs/lib/commands.sh
+++ b/prepare-labs/lib/commands.sh
@@ -453,6 +453,7 @@ _cmd_kube() {
     need_tag
 
     if [ "$KUBEVERSION" ]; then
+        CLUSTER_CONFIGURATION_KUBERNETESVERSION='kubernetesVersion: "v'$KUBEVERSION'"'
         pssh "
         sudo tee /etc/apt/preferences.d/kubernetes <<EOF
 Package: kubectl kubeadm kubelet
@@ -480,13 +481,6 @@ EOF"
     echo 'alias k=kubectl' | sudo tee /etc/bash_completion.d/k &&
     echo 'complete -F __start_kubectl k' | sudo tee -a /etc/bash_completion.d/k"
 
-    # Disable swap
-    # (note that this won't survive across node reboots!)
-    if [ "$INFRACLASS" = "linode" ]; then
-        pssh "
-        sudo swapoff -a"
-    fi
-
     # Install a valid configuration for containerd
     # (first, the CRI interface needs to be re-enabled;
     # also, the correct systemd cgroup driver must be selected,
@@ -527,6 +521,7 @@ apiVersion: kubeadm.k8s.io/v1beta3
 apiServer:
   certSANs:
   - \$(cat /tmp/ipv4)
+$CLUSTER_CONFIGURATION_KUBERNETESVERSION
 EOF
 	sudo kubeadm init --config=/tmp/kubeadm-config.yaml
     fi"
diff --git a/prepare-labs/settings/admin-oldversion.env b/prepare-labs/settings/admin-oldversion.env
index 19ab55dd..1ae39d7b 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.17
+KUBEVERSION=1.22.5
 
 STEPS="
   wait