debug docker and k8s deployment tests

Author: qrkourier

.github/workflows/test-deployments.yml

@@ -20,7 +20,7 @@ env:
 jobs:
   build-linux-packages:
     name: Build ${{ matrix.package_name }} ${{ matrix.arch.gox }} ${{ matrix.packager }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         package_name:
@@ -77,7 +77,7 @@ jobs:
   dry-run-linux-packages:
     needs: build-linux-packages
     name: Dry Run ${{ format('{0}:{1}', matrix.distro.name, matrix.distro.version) }} ${{ matrix.arch.gox }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     env:
       ZITI_PWD: ziggypw
       ZITI_CTRL_ADVERTISED_ADDRESS: linux-controller.127.21.71.0.sslip.io
@@ -178,7 +178,7 @@ jobs:
 
   test-linux-services:
     name: Test Debian Linux Services
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Shallow checkout
         uses: actions/checkout@v4
@@ -215,7 +215,7 @@ jobs:
 
   docker-deployments:
     name: Test Docker Deployments
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     env:
       ZIGGY_UID: 1001  # let container EUID run-as GHA "runner" user to share cache, etc.
     steps:
@@ -228,15 +228,22 @@ jobs:
         with:
           go-version-file: ./go.mod
 
-      - name: Run the Compose Test Script
+      - name: Debug EUID
         shell: bash
-        run: dist/docker-images/compose.test.bash
+        run: |
+
+          set -o xtrace
+          echo "EUID: $(id -u); ZIGGY_UID: $(id "$ZIGGY_UID")"
+
+      - name: Run the Docker Test Script
+        shell: bash
+        run: dist/docker-images/docker.test.bash
         env:
           ZITI_GO_VERSION: ${{ steps.setup-go.outputs.go-version }}
 
   kubernetes-deployments:
     name: Test Kubernetes Deployments
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     env:
       ZITI_NAMESPACE: zititest
     steps:
@@ -257,4 +264,3 @@ jobs:
       - name: Run the Kubernetes Test Script
         shell: bash
         run: ./dist/docker-images/k8s.test.bash --cpus=2  # GitHub runners have 4 vCPUs
-

dist/dist-packages/linux/linux.test.bash

@@ -184,7 +184,7 @@ fi
 
 ZITI_CTRL_EDGE_ADVERTISED_ADDRESS=${ZITI_CTRL_ADVERTISED_ADDRESS} \
 ZITI_CTRL_EDGE_ADVERTISED_PORT=${ZITI_CTRL_ADVERTISED_PORT} \
-go test -v -count=1 -tags="quickstart manual" ./ziti/cmd/edge/...
+go test -v -count=1 -tags="quickstart manual" ./ziti/run/...
 
 ATTEMPTS=5
 DELAY=3

dist/docker-images/compose.test.bash dist/docker-images/docker.test.bash

@@ -126,7 +126,7 @@ docker compose up ziti-router --detach
 unset GOOS
 ZITI_CTRL_EDGE_ADVERTISED_ADDRESS=${ZITI_CTRL_ADVERTISED_ADDRESS} \
 ZITI_CTRL_EDGE_ADVERTISED_PORT=${ZITI_CTRL_ADVERTISED_PORT} \
-go test -v -count=1 -tags="quickstart manual" ./ziti/cmd/edge/...
+go test -v -count=1 -tags="quickstart manual" ./ziti/run/...
 
 ATTEMPTS=5
 DELAY=3

dist/docker-images/k8s.test.bash

@@ -122,10 +122,9 @@ image:
     pullPolicy: Never
 ROUTER
 
-./quickstart/kubernetes/miniziti.bash start \
+bash -x ./quickstart/kubernetes/miniziti.bash start \
 --profile "${ZITI_NAMESPACE}" \
 --no-hosts \
---debug \
 --values-dir "${EXTRA_VALUES_DIR}"
 
 MINIKUBE_IP="$(minikube --profile "${ZITI_NAMESPACE}" ip)"
@@ -134,14 +133,13 @@ MINIKUBE_IP="$(minikube --profile "${ZITI_NAMESPACE}" ip)"
 curl -skSfw '%{http_code}\t%{url}\n' -o/dev/null "https://miniziti-controller.${MINIKUBE_IP}.sslip.io/zac/"
 
 ZITI_PWD=$(
-minikube kubectl --profile "${ZITI_NAMESPACE}" -- \
---context "${ZITI_NAMESPACE}" \
-get secrets "ziti-controller-admin-secret" \
---namespace "${ZITI_NAMESPACE}" \
---output go-template='{{index .data "admin-password" | base64decode }}'
+    minikube kubectl --profile "${ZITI_NAMESPACE}" -- \
+        --context "${ZITI_NAMESPACE}" \
+        get secrets "ziti-controller-admin-secret" \
+        --namespace "${ZITI_NAMESPACE}" \
+        --output go-template='{{index .data "admin-password" | base64decode }}'
 )
 
-
 export \
 ZITI_PWD \
 ZITI_ROUTER_NAME="miniziti-router" \
@@ -150,6 +148,6 @@ ZITI_CTRL_ADVERTISED_ADDRESS="miniziti-controller.${MINIKUBE_IP}.sslip.io"
 ZITI_CTRL_EDGE_ADVERTISED_ADDRESS=${ZITI_CTRL_ADVERTISED_ADDRESS} \
 ZITI_CTRL_EDGE_ADVERTISED_PORT=${ZITI_CTRL_ADVERTISED_PORT} \
 ZITI_TEST_BIND_ADDRESS="ziti-controller-client.${ZITI_NAMESPACE}.svc.cluster.local" \
-go test -v -count=1 -tags="quickstart manual" ./ziti/cmd/edge/...
+go test -v -count=1 -tags="quickstart manual" ./ziti/run/...
 
 cleanup

dist/docker-images/ziti-controller/compose.test.yml

@@ -4,7 +4,7 @@ volumes:
 services:
   ziti-controller:
     volumes:
-      - ziti-test:/home/ziggy/.config/ziti
+      - ziti-test:/home/ziggy
 
   wait-for-controller:
     profiles:

dist/docker-images/ziti-router/compose.test.yml

@@ -3,4 +3,4 @@ services:
     networks:
       - ziti
     volumes:
-      - ziti-test:/home/ziggy/.config/ziti
+      - ziti-test:/home/ziggy