Set spec.api.externalAddress for smoke-tests

Signed-off-by: Kimmo Lehto <[email protected]>

smoke-test/k0sctl-controller-swap.yaml

@@ -24,6 +24,8 @@ spec:
     version: "${K0S_VERSION}"
     config:
       spec:
+        api:
+          externalAddress: "${EXTERNAL_ADDRESS}"
         telemetry:
           enabled: false
 

smoke-test/k0sctl-downloadurl.yaml

@@ -17,5 +17,7 @@ spec:
   k0s:
     config:
       spec:
+        api:
+          externalAddress: "${EXTERNAL_ADDRESS}"
         telemetry:
           enabled: false

smoke-test/k0sctl-dryrun.yaml

@@ -20,5 +20,7 @@ spec:
     version: "${K0S_VERSION}"
     config:
       spec:
+        api:
+          externalAddress: "${EXTERNAL_ADDRESS}"
         telemetry:
           enabled: false

smoke-test/k0sctl-dynamic.yaml

@@ -20,5 +20,7 @@ spec:
     dynamicConfig: true
     config:
       spec:
+        api:
+          externalAddress: "${EXTERNAL_ADDRESS}"
         telemetry:
           enabled: false

smoke-test/k0sctl-files.yaml.tpl

@@ -47,5 +47,7 @@ spec:
     version: "$K0S_VERSION"
     config:
       spec:
+        api:
+          externalAddress: "${EXTERNAL_ADDRESS}"
         telemetry:
           enabled: false

smoke-test/k0sctl-installflags.yaml.tpl

@@ -22,5 +22,7 @@ spec:
     version: "${K0S_VERSION}"
     config:
       spec:
+        api:
+          externalAddress: "${EXTERNAL_ADDRESS}"
         telemetry:
           enabled: false

smoke-test/k0sctl-openssh.yaml

@@ -16,5 +16,7 @@ spec:
     version: "${K0S_VERSION}"
     config:
       spec:
+        api:
+          externalAddress: "${EXTERNAL_ADDRESS}"
         telemetry:
           enabled: false

smoke-test/k0sctl-rootless.yaml.tpl

@@ -28,5 +28,7 @@ spec:
     version: "${K0S_VERSION}"
     config:
       spec:
+        api:
+          externalAddress: "${EXTERNAL_ADDRESS}"
         telemetry:
           enabled: false

smoke-test/k0sctl-single.yaml

@@ -19,5 +19,7 @@ spec:
     version: "$K0S_VERSION"
     config:
       spec:
+        api:
+          externalAddress: "${EXTERNAL_ADDRESS}"
         telemetry:
-          enabled: false
+          enabled: false

smoke-test/k0sctl.yaml

@@ -26,5 +26,7 @@ spec:
     version: "${K0S_VERSION}"
     config:
       spec:
+        api:
+          externalAddress: "${EXTERNAL_ADDRESS}"
         telemetry:
           enabled: false

smoke-test/smoke-backup-restore.sh

@@ -15,6 +15,8 @@ runCleanup() {
 
 deleteCluster
 createCluster
+export EXTERNAL_ADDRESS=$(externalAddress)
+
 ../k0sctl init
 ../k0sctl apply --config "${K0SCTL_CONFIG}" --debug
 

smoke-test/smoke-basic-openssh.sh

@@ -15,6 +15,8 @@ cleanup_openssh() {
 deleteCluster
 createCluster
 
+export EXTERNAL_ADDRESS=$(externalAddress)
+
 echo "* Create SSH config"
 mkdir -p ~/.ssh
 mkdir -p ssh

smoke-test/smoke-basic-rootless.sh

@@ -14,6 +14,8 @@ trap cleanup EXIT
 deleteCluster
 createCluster
 
+export EXTERNAL_ADDRESS=$(externalAddress)
+
 for host in manager0 worker0; do
   echo "* Creating ${SSH_USER} on ${host}"
   bootloose ssh "root@${host}" -- groupadd --system k0sctl-admin

smoke-test/smoke-basic.sh

@@ -11,6 +11,8 @@ trap cleanup EXIT
 deleteCluster
 createCluster
 
+export EXTERNAL_ADDRESS=$(externalAddress)
+
 echo "* Starting apply"
 ../k0sctl apply --config "${K0SCTL_CONFIG}" --kubeconfig-out applykubeconfig --debug
 echo "* Apply OK"

smoke-test/smoke-controller-swap.sh

@@ -11,6 +11,8 @@ trap cleanup EXIT
 deleteCluster
 createCluster
 
+export EXTERNAL_ADDRESS=$(externalAddress)
+
 echo "* Starting apply"
 ../k0sctl apply --config "${K0SCTL_CONFIG}" --debug
 echo "* Apply OK"

smoke-test/smoke-dryrun.sh

@@ -97,6 +97,8 @@ applyConfig() {
 deleteCluster
 createCluster
 
+export EXTERNAL_ADDRESS=$(externalAddress)
+
 K0S_VERSION="${K0S_FROM}"
 
 colorEcho 3 "Installing ${K0S_VERSION} with --dry-run"

smoke-test/smoke-dynamic.sh

@@ -11,6 +11,8 @@ trap cleanup EXIT
 deleteCluster
 createCluster
 
+export EXTERNAL_ADDRESS=$(externalAddress)
+
 echo "* Starting apply"
 ../k0sctl apply --config "${K0SCTL_CONFIG}" --debug
 echo "* Apply OK"

smoke-test/smoke-files.sh

@@ -12,6 +12,8 @@ envsubst < k0sctl-files.yaml.tpl > k0sctl.yaml
 deleteCluster
 createCluster
 
+export EXTERNAL_ADDRESS=$(externalAddress)
+
 remoteCommand() {
   local userhost="$1"
   shift

smoke-test/smoke-init.sh

@@ -7,4 +7,6 @@ trap cleanup EXIT
 
 deleteCluster
 createCluster
+
+# this will not work as init does not set spec.api.externalAddress
 ../k0sctl init --key-path ./id_rsa_k0s 127.0.0.1:9022 [email protected]:9023 | ../k0sctl apply --config - --debug

smoke-test/smoke-reinstall.sh

@@ -14,6 +14,8 @@ trap cleanup EXIT
 deleteCluster
 createCluster
 
+export EXTERNAL_ADDRESS=$(externalAddress)
+
 remoteCommand() {
   local userhost="$1"
   shift

smoke-test/smoke-reset.sh

@@ -9,6 +9,9 @@ trap cleanup EXIT
 
 deleteCluster
 createCluster
+
+export EXTERNAL_ADDRESS=$(externalAddress)
+
 echo "* Applying"
 ../k0sctl apply --config "${K0SCTL_CONFIG}" --debug
 echo "* Resetting"

smoke-test/smoke-upgrade.sh

@@ -11,6 +11,8 @@ trap cleanup EXIT
 deleteCluster
 createCluster
 
+export EXTERNAL_ADDRESS=$(externalAddress)
+
 remoteCommand() {
   local userhost="$1"
   shift

smoke-test/smoke.common.sh

@@ -5,6 +5,10 @@ export PRESERVE_CLUSTER="${PRESERVE_CLUSTER:-""}"
 export DISABLE_TELEMETRY=true
 export K0S_VERSION
 
+externalAddress() {
+  bootloose show manager0 -o json | grep '"ip":' | head -1 | cut -d'"' -f4
+}
+
 createCluster() {
   envsubst < "${BOOTLOOSE_TEMPLATE}" > bootloose.yaml
   bootloose create