Merge pull request #30 from SovereignCloudStack/feat/update-deb13

Feat/update deb13

Author: garloff

00-bootstrap-vm-cs.sh

@@ -49,18 +49,18 @@ install_via_download_tgz()
 # Debian 12 (Bookworm)
 mkdir -p ~/Download
 INSTCMD="apt-get install -y --no-install-recommends --no-install-suggests"
-DEB12_PKGS=(docker.io golang jq yq git gh python3-openstackclient)
-DEB12_TGZS=("https://get.helm.sh/helm-v3.17.1-${OS}-${ARCH}.tar.gz")
-DEB12_TCHK=("3b66f3cd28409f29832b1b35b43d9922959a32d795003149707fea84cbcd4469")
+DEB12_PKGS=(docker.io docker-cli golang jq yq git gh python3-openstackclient)
+DEB12_TGZS=("https://get.helm.sh/helm-v3.20.0-${OS}-${ARCH}.tar.gz")
+DEB12_TCHK=("dbb4c8fc8e19d159d1a63dda8db655f9ffa4aac1b9a6b188b34a40957119b286")
 DEB12_TOLD=("${OS}-${ARCH}/helm")
 DEB12_TNEW=(".")
-DEB12_BINS=("https://github.com/kubernetes-sigs/kind/releases/download/v0.26.0/kind-${OS}-${ARCH}"
-	    "https://dl.k8s.io/release/v1.31.6/bin/${OS}/${ARCH}/kubectl"
-	    "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.4/clusterctl-${OS}-${ARCH}"
+DEB12_BINS=("https://github.com/kubernetes-sigs/kind/releases/download/v0.31.0/kind-${OS}-${ARCH}"
+	    "https://dl.k8s.io/release/v1.35.0/bin/${OS}/${ARCH}/kubectl"
+	    "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.12.2/clusterctl-${OS}-${ARCH}"
 	)
-DEB12_BCHK=("d445b44c28297bc23fd67e51cc24bb294ae7b977712be2d4d312883d0835829b"
-	    "c46b2f5b0027e919299d1eca073ebf13a4c5c0528dd854fc71a5b93396c9fa9d"
-	    "0c80a58f6158cd76075fcc9a5d860978720fa88860c2608bb00944f6af1e5752"
+DEB12_BCHK=("eb244cbafcc157dff60cf68693c14c9a75c4e6e6fedaf9cd71c58117cb93e3fa"
+	    "a2e984a18a0c063279d692533031c1eff93a262afcc0afdc517375432d060989"
+	    "c9f05fb8a7839067bcfb2c897f4b7cab37b7c2780aef12669b5fd89a1dd6dffd"
     )
 DEB12_BNEW=("kind" "." "clusterctl")
 

02-deploy-capi.sh

@@ -26,6 +26,9 @@ fi
 # We need ORC these days and clusterctl has chosen to ignore that
 kubectl apply -f https://github.com/k-orc/openstack-resource-controller/releases/latest/download/install.yaml
 # Rollout capi and capo (assuming that orc gets deployed independently)
+# Note: For capi <= 1.11.x (v1beta1), we need to stay on old capo 0.12.7
+# clusterctl init --infrastructure openstack:v0.12.7
+# With latest capi (1.12.2), 0.14+ works.
 clusterctl init --infrastructure openstack
 # Wait for completion
 kubectl -n capi-system rollout status deployment

09-wait-cluster.sh

@@ -15,9 +15,14 @@ source "$SET"
 #kubectl get cluster -A
 #set -x
 echo "# Wait for certificates for cluster -n $CS_NAMESPACE $CL_NAME"
-kubectl wait --timeout=12m --for=condition=certificatesavailable -n "$CS_NAMESPACE" kubeadmcontrolplanes -l cluster.x-k8s.io/cluster-name=$CL_NAME
+TSTMP1=$(date +%s)
+kubectl wait --timeout=8m --for=condition=certificatesavailable -n "$CS_NAMESPACE" kubeadmcontrolplanes -l cluster.x-k8s.io/cluster-name=$CL_NAME
+TSTMP2=$(date +%s)
+if test $((TSTMP2-TSTMP1)) -gt 1; then echo "# Waited $((TSTMP2-TSTMP1))s"; fi
 kubectl get -n "$CS_NAMESPACE" cluster $CL_NAME
-kubectl wait --timeout=8m --for=condition=Ready -n "$CS_NAMESPACE" machine -l cluster.x-k8s.io/control-plane,cluster.x-k8s.io/cluster-name=${CL_NAME}
+kubectl wait --timeout=12m --for=condition=Ready -n "$CS_NAMESPACE" machine -l cluster.x-k8s.io/control-plane,cluster.x-k8s.io/cluster-name=${CL_NAME}
+TSTMP3=$(date +%s)
+if test $((TSTMP3-TSTMP2)) -gt 1; then echo "# Waited $((TSTMP3-TSTMP2))s"; fi
 clusterctl describe cluster -n "$CS_NAMESPACE" $CL_NAME --grouping=false
 KCFG=~/.kube/$CS_NAMESPACE.$CL_NAME
 OLDUMASK=$(umask)

_yaml_parse.sh

@@ -232,6 +232,7 @@ $VAL"
 extract_yaml_rec()
 {
 	#echo "DEBUG: Called extract_yaml_rec $@" 1>&2
+	yaml_debug 3 "extract_yaml_rec \"$1\" \"$2\" \"$3\" \"$4\" \"$5\" \"$6\" [...]"
 	local previndent="$1"
 	local more="$2"
 	#global LNNO _MORE
@@ -244,10 +245,10 @@ extract_yaml_rec()
 		if islineempty "$line"; then continue; fi
 		# First line of new block: We need more indentation ...
 		if test "$more" = "1"; then
-		       if ! echo "$line" | grep -q "^$previndent\s"; then return; fi
-		       more=$(echo "$line" | sed "s/^$previndent\\(\s*\\)[^\s].*\$/\\1/")
+		       if ! echo "$line" | grep -q "^$previndent\\s"; then return; fi
+		       more=$(echo "$line" | sed "s/^$previndent\\(\\s*\\)\\S.*\$/\\1/")
 		       if test -z "$_MORE"; then _MORE="$more"; fi
-		       #echo "$previndent$more# $LNNO: New indent level"
+		       yaml_debug 4 "New indent level (line $LNNO): \"$previndent$more\""
 		fi
 		# Detect less indentation than wanted, return
 		#if ! echo "$line" | grep -q "^$previndent$more"; then return; fi