Allow passing multiple cluster-stack versions.

So we want to have several clusterstackreleases coexist, let's support
registering several of them.

Signed-off-by: Kurt Garloff <kurt@garloff.de>

Author: garloff

05-deploy-cstack.sh

@@ -2,6 +2,7 @@
 # Deploy the ClusterStack
 set -e
 # We need settings
+unset KUBECONFIG
 if test -n "$1"; then
 	SET="$1"
 else
@@ -30,8 +31,7 @@ spec:
   channel: custom
   autoSubscribe: false
   noProvider: true
-  versions:
-    - $CS_VERSION
+  versions: $CS_VERSION
 EOF
 # Apply
 kubectl apply -f ~/tmp/clusterstack-$CS_MAINVER.yaml

06-wait-clusterclass.sh

@@ -3,6 +3,7 @@
 # Do we need this?
 set -e
 # We need settings
+unset KUBECONFIG
 if test -n "$1"; then
 	SET="$1"
 else
@@ -12,7 +13,32 @@ else
 fi
 # Read settings -- make sure you can trust it
 source "$SET"
+# If we have an array, match what CS_VERSION we want to wait for
+if test "${CS_VERSION:0:1}" = "["; then
+	VERSIONS="$(echo $CS_VERSION | sed -e 's/\[//' -e 's/\]//' -e 's/,/ /g')"
+	for ver in $VERSIONS; do
+		#echo "Wait for clusterstackrelease -n $CS_NAMESPACE openstack-scs-${CS_MAINVER/./-}-${ver/./-} readiness"
+		echo "Wait for clusterstackrelease -n $CS_NAMESPACE openstack-scs-${CS_MAINVER/./-}-${ver/./-} creation"
+		kubectl wait -n "$CS_NAMESPACE" clusterstackrelease openstack-scs-${CS_MAINVER/./-}-${ver/./-} --for create
+	done
+	VERSIONS=$(kubectl get clusterstackreleases -n $CS_NAMESPACE -o "custom-columns=NAME:.metadata.name,K8SVER:.status.kubernetesVersion")
+	echo -e "# Table of registered clusterstackreleases:\n$VERSIONS"
+	while read csnm k8sver; do
+		if test "$csnm" = "NAME"; then continue; fi
+		if test "$k8sver" = "v$CL_PATCHVER"; then
+			CS_VERSION="v${csnm#openstack-scs-?-??-v}"
+			CS_VERSION="${CS_VERSION%-*}.${CS_VERSION##*-}"
+			break
+		fi
+	done < <(echo "$VERSIONS")
+	if test "${CS_VERSION:0:1}" = "["; then
+		echo "No clusterstackrelease with v$CL_PATCHVER found"
+	fi
+else
+	echo "Wait for clusterstackrelease -n $CS_NAMESPACE openstack-scs-${CS_MAINVER/./-}-${CS_VERSION/./-} readiness"
+	kubectl wait -n "$CS_NAMESPACE" clusterstackrelease openstack-scs-${CS_MAINVER/./-}-${CS_VERSION/./-} --for condition=ready
+fi
+echo "# Wait for clusterclass -n $CS_NAMESPACE openstack-scs-${CS_MAINVER/./-}-${CS_VERSION} creation"
 kubectl wait -n "$CS_NAMESPACE" clusterclass openstack-scs-${CS_MAINVER/./-}-${CS_VERSION} --for create
 kubectl get clusterclasses -n "$CS_NAMESPACE"
 kubectl get images -n "$CS_NAMESPACE"
-kubectl wait -n "$CS_NAMESPACE" clusterstackrelease openstack-scs-${CS_MAINVER/./-}-${CS_VERSION/./-} --for condition=ready

07-create-cluster.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 set -e
 # We need settings
+# unset KUBECONFIG
 if test -n "$1"; then
 	SET="$1"
 else
@@ -20,6 +21,19 @@ if test -z "$CL_SVCCIDR"; then echo "Configure CL_SVCCIDR"; exit 7; fi
 if test -z "$CL_CTRLNODES"; then echo "Configure CL_CTRLNODES"; exit 8; fi
 if test -z "$CL_WRKRNODES"; then echo "Configure CL_WRKRNODES"; exit 9; fi
 # Create Cluster yaml
+# If we have an array, match what CS_VERSION we want to wait for
+if test "${CS_VERSION:0:1}" = "["; then
+	VERSIONS=$(kubectl get clusterstackreleases -n $CS_NAMESPACE -o "custom-columns=NAME:.metadata.name,K8SVER:.status.kubernetesVersion")
+	while read csnm k8sver; do
+		if test "$csnm" = "NAME"; then continue; fi
+		if test "$k8sver" = "v$CL_PATCHVER"; then
+			CS_VERSION="v${csnm#openstack-scs-?-??-v}"
+			CS_VERSION="${CS_VERSION%-*}.${CS_VERSION##*-}"
+			break
+		fi
+	done < <(echo "$VERSIONS")
+	if test "${CS_VERSION:0:1}" = "["; then echo "No clusterstackrelease with v$CL_PATCHVER found"; exit 10; fi
+fi
 # TODO: There are a number of variables that allow us to set things like
 #  flavors, disk sizes, loadbalancer types, etc.
 #  We need to make them visible!

cluster-settings-template.env

@@ -14,7 +14,7 @@ OS_CLOUD=${OS_CLOUD:-openstack}
 ### Per cluster stack settings
 # Kubernetes Maj.Min, e.g. 1.32 (without leading v), can be left empty (see last line)
 CS_MAINVER=
-# CS Template version that matches, e.g. v1 or v0-sha.XXXXXXX, see table
+# CS Template version that matches, e.g. v1 or v0-sha.XXXXXXX, see table, can also be an array [v1, v2]
 CS_VERSION=
 ### Now the per workload cluster settings
 # Full K8s Version Maj.Min.Patch, without leading 'v', e.g. 1.32.3 (this is per cluster)