From 93d8a23c81b4667182f22cc4dc63eaa3590888c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Petazzoni?= <jerome.petazzoni@gmail.com>
Date: Fri, 19 Nov 2021 15:49:55 +0100
Subject: [PATCH] =?UTF-8?q?=E2=9E=95=20Add=20'oldversion'=20cluster=20in?=
 =?UTF-8?q?=20admin=20course=20deployment=20script?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 prepare-vms/lib/commands.sh                |  5 ++--
 prepare-vms/settings/admin-oldversion.yaml | 31 ++++++++++++++++++++++
 prepare-vms/setup-admin-clusters.sh        | 12 ++++++---
 3 files changed, 43 insertions(+), 5 deletions(-)
 create mode 100644 prepare-vms/settings/admin-oldversion.yaml

diff --git a/prepare-vms/lib/commands.sh b/prepare-vms/lib/commands.sh
index 277b664f..fdb484b4 100644
--- a/prepare-vms/lib/commands.sh
+++ b/prepare-vms/lib/commands.sh
@@ -309,7 +309,8 @@ _cmd_kube() {
     need_login_password
 
     # Optional version, e.g. 1.13.5
-    KUBEVERSION=$2
+    SETTINGS=tags/$TAG/settings.yaml
+    KUBEVERSION=$(awk '/^kubernetes_version:/ {print $2}' $SETTINGS)
     if [ "$KUBEVERSION" ]; then
         EXTRA_APTGET="=$KUBEVERSION-00"
         EXTRA_KUBEADM="kubernetesVersion: v$KUBEVERSION"
@@ -684,7 +685,7 @@ _cmd_tailhist () {
     ARCH=${ARCHITECTURE-amd64}
     [ "$ARCH" = "aarch64" ] && ARCH=arm64
 
-    pssh -i "
+    pssh "
     set -e
     wget https://github.com/joewalnes/websocketd/releases/download/v0.3.0/websocketd-0.3.0-linux_$ARCH.zip
     unzip websocketd-0.3.0-linux_$ARCH.zip websocketd
diff --git a/prepare-vms/settings/admin-oldversion.yaml b/prepare-vms/settings/admin-oldversion.yaml
new file mode 100644
index 00000000..604824a1
--- /dev/null
+++ b/prepare-vms/settings/admin-oldversion.yaml
@@ -0,0 +1,31 @@
+# Number of VMs per cluster
+clustersize: 3
+
+# The hostname of each node will be clusterprefix + a number
+clusterprefix: oldversion
+
+# Jinja2 template to use to generate ready-to-cut cards
+cards_template: cards.html
+
+# Use "Letter" in the US, and "A4" everywhere else
+paper_size: A4
+
+# Login and password that students will use
+user_login: k8s
+user_password: training
+
+kubernetes_version: 1.19.16
+
+image:
+
+steps:
+  - wait
+  - clusterize
+  - tools
+  - docker
+  - createuser
+  - webssh
+  - tailhist
+  - kube
+  - kubetools
+  - kubetest
diff --git a/prepare-vms/setup-admin-clusters.sh b/prepare-vms/setup-admin-clusters.sh
index 14b27236..9ae86b5d 100755
--- a/prepare-vms/setup-admin-clusters.sh
+++ b/prepare-vms/setup-admin-clusters.sh
@@ -3,7 +3,7 @@ set -e
 
 export AWS_INSTANCE_TYPE=t3a.small
 
-INFRA=infra/aws-us-east-2
+INFRA=infra/aws-eu-north-1
 
 STUDENTS=2
 
@@ -33,9 +33,15 @@ TAG=$PREFIX-$SETTINGS
 	--settings settings/$SETTINGS.yaml \
 	--students $STUDENTS
 
-#INFRA=infra/aws-us-west-1
+INFRA=infra/enix
 
-export AWS_INSTANCE_TYPE=t3a.medium
+SETTINGS=admin-oldversion
+TAG=$PREFIX-$SETTINGS
+./workshopctl start \
+	--tag $TAG \
+	--infra $INFRA \
+	--settings settings/$SETTINGS.yaml \
+	--students $STUDENTS
 
 SETTINGS=admin-test
 TAG=$PREFIX-$SETTINGS