Merge pull request #26 from SovereignCloudStack/fix/scs2-apisrv-lb-default

Fix/scs2 apisrv lb default

Author: garloff

08-create-cluster.sh

@@ -59,7 +59,11 @@ fi
 # Additional variables
 #  Compatibility with old defaults
 if ! grep CL_VARIABLES "$SET" >/dev/null 2>&1; then
-	CL_VARIABLES="apiserver_loadbalancer=octavia-ovn"
+	if test "$CS_SERIES" = "scs2"; then
+		CL_VARIABLES="apiServerLoadBalancer=octavia-ovn"
+	else
+		CL_VARIABLES="apiserver_loadbalancer=octavia-ovn"
+	fi
 fi
 #  Turn them into YAML
 if test -n "$CL_VARIABLES"; then

20-install-gateway-api-crd.sh

@@ -18,5 +18,6 @@ source "$SET"
 export KUBECONFIG=~/.kube/$CS_NAMESPACE.$CL_NAME
 kubectl apply -f https://github.com/kubernetes-sigs/gateway-api/releases/download/v1.3.0/standard-install.yaml
 kubectl apply -f https://raw.githubusercontent.com/kubernetes-sigs/gateway-api/v1.3.0/config/crd/experimental/gateway.networking.k8s.io_tlsroutes.yaml
-# Patch configMap for cilium -- is this possible after the fact?
+# Patch configMap for cilium -- this won't be effective after kube-proxy is running already
+echo "Note: If kube-proxy is already running, we won't have kube-proxy-less mode ..."
 kubectl patch -n kube-system configmap cilium-config -p '.data.kube-proxy-replacement: true'

22-sonobuoy.sh

@@ -1,2 +1,3 @@
 #!/bin/bash
+# See also https://github.com/SovereignCloudStack/standards/issues/982
 sonobuoy run --plugin-env=e2e.E2E_PROVIDER=openstack --e2e-skip="\[Disruptive\]|NoExecuteTaintManager|HostPort validates that there is no conflict between pods with same hostPort but different hostIP and protocol"