Add metrics overlay to smoke tests

Signed-off-by: Thomas Cooper <code@tomcooper.dev>

Author: tomncooper

.github/actions/smoke-test/action.yaml

@@ -9,7 +9,7 @@ inputs:
   overlay:
     description: 'Overlay name for component verification (matches .github/config/overlays/<name>.env)'
     required: false
-    default: 'base'
+    default: 'core'
 
 runs:
   using: 'composite'
@@ -18,6 +18,7 @@ runs:
       shell: bash
       env:
         LOCAL_DIR: .
+        OVERLAY: ${{ inputs.overlay }}
         TIMEOUT: ${{ inputs.timeout }}
       run: ./install.sh
 
@@ -31,6 +32,7 @@ runs:
       shell: bash
       env:
         LOCAL_DIR: .
+        OVERLAY: ${{ inputs.overlay }}
         TIMEOUT: ${{ inputs.timeout }}
       run: ./uninstall.sh
 

.github/config/overlays/base.env .github/config/overlays/core.env.github/config/overlays/base.env renamed to .github/config/overlays/core.env

@@ -1,5 +1,5 @@
-# Components expected in the base (default) deployment.
-# Used by verify-install.sh, verify-uninstall.sh, and debug.sh.
+# Components expected in the core (default) deployment.
+# Used by verify-install.sh and debug.sh.
 #
 # Format:
 #   OPERATORS     - "namespace:deployment" pairs (space-separated)

.github/config/overlays/metrics.env

@@ -0,0 +1,11 @@
+# Components expected in the metrics overlay deployment.
+# Used by verify-install.sh and debug.sh.
+#
+# Format:
+#   OPERATORS     - "namespace:deployment" pairs (space-separated)
+#   CUSTOM_RESOURCES - "namespace:resource" pairs (space-separated)
+#   NAMESPACES    - namespaces to inspect on failure (space-separated)
+
+OPERATORS="strimzi:strimzi-cluster-operator apicurio-registry:apicurio-registry-operator streamshub-console:streamshub-console-operator monitoring:prometheus-operator"
+CUSTOM_RESOURCES="kafka:kafka/dev-cluster apicurio-registry:apicurioregistry3/apicurio-registry streamshub-console:console.console.streamshub.github.com/streamshub-console monitoring:prometheus.monitoring.coreos.com/prometheus"
+NAMESPACES="strimzi kafka apicurio-registry streamshub-console monitoring"

.github/scripts/debug.sh

@@ -4,12 +4,12 @@
 # Reads component definitions from an overlay config file.
 #
 # Environment variables:
-#   OVERLAY - overlay name (default: "base")
+#   OVERLAY - overlay name (default: "core")
 #
 
 set +e
 
-OVERLAY="${OVERLAY:-base}"
+OVERLAY="${OVERLAY:-core}"
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 CONFIG_FILE="${SCRIPT_DIR}/../config/overlays/${OVERLAY}.env"
 

.github/scripts/verify-install.sh

@@ -4,13 +4,13 @@
 # Reads component definitions from an overlay config file.
 #
 # Environment variables:
-#   OVERLAY  - overlay name (default: "base")
+#   OVERLAY  - overlay name (default: "core")
 #   TIMEOUT  - kubectl wait timeout (default: "600s")
 #
 
 set -euo pipefail
 
-OVERLAY="${OVERLAY:-base}"
+OVERLAY="${OVERLAY:-core}"
 TIMEOUT="${TIMEOUT:-600s}"
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 CONFIG_FILE="${SCRIPT_DIR}/../config/overlays/${OVERLAY}.env"

.github/workflows/integration.yaml

@@ -8,8 +8,12 @@ on:
 
 jobs:
   smoke-minikube:
-    name: smoke-minikube
+    name: smoke-minikube (${{ matrix.overlay }})
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        overlay: [core, metrics]
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
@@ -24,10 +28,16 @@ jobs:
 
       - name: Smoke test
         uses: ./.github/actions/smoke-test
+        with:
+          overlay: ${{ matrix.overlay }}
 
   smoke-kind:
-    name: smoke-kind
+    name: smoke-kind (${{ matrix.overlay }})
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        overlay: [core, metrics]
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
@@ -46,3 +56,5 @@ jobs:
 
       - name: Smoke test
         uses: ./.github/actions/smoke-test
+        with:
+          overlay: ${{ matrix.overlay }}