GitHub Actions get the cluster config differently

Signed-off-by: Pete Wall <pete.wall@grafana.com>

Author: petewall

.github/workflows/integration-test.yml

@@ -50,8 +50,11 @@ jobs:
       - name: Check for cluster config
         id: check-cluster-config
         run: |
-          if [ -f "charts/k8s-monitoring/tests/integration/${{ matrix.test }}/cluster.yaml" ]; then
+          testManifest="charts/k8s-monitoring/tests/integration/${{ matrix.test }}/test-manifest.yaml"
+          clusterConfig="$(yq -r ".cluster.config // \"\"" "${testManifest}")"
+          if [ -f "charts/k8s-monitoring/tests/integration/${{ matrix.test }}/${clusterConfig}" ]; then
             echo "has-cluster-config=true" >> "${GITHUB_OUTPUT}"
+            echo "cluster-config=charts/k8s-monitoring/tests/integration/${{ matrix.test }}/${clusterConfig}" >> "${GITHUB_OUTPUT}"
           else
             echo "has-cluster-config=false" >> "${GITHUB_OUTPUT}"
           fi
@@ -64,7 +67,7 @@ jobs:
         if: ${{ steps.check-cluster-config.outputs.has-cluster-config == 'true' }}
         uses: helm/kind-action@v1
         with:
-          config: charts/k8s-monitoring/tests/integration/${{ matrix.test }}/cluster.yaml
+          config: ${{ steps.check-cluster-config.outputs.cluster-config }}
 
       - name: Run test
         env:

scripts/run-integration-test.sh

@@ -14,6 +14,7 @@ usage() {
   echo "    test-manifest.yaml - The test manifest, which defines cluster, and deployments"
 }
 
+CREATE_CLUSTER=${CREATE_CLUSTER:-true}
 HEADLESS=${HEADLESS:-false}
 TEST_DIRECTORY=$1
 if [ -z "${TEST_DIRECTORY}" ]; then
@@ -30,23 +31,26 @@ if [ ! -f "${testManifest}" ]; then
 fi
 
 set -eo pipefail  # Exit immediately if a command fails.
+
 #
 # Cluster creation
 #
-clusterType=$(yq -r ".cluster.type // \"kind\"" "${testManifest}")
-clusterName=$(yq -r ".cluster.name // \"$(basename "${TEST_DIRECTORY}")\"" "${testManifest}")
-clusterConfig=$(yq -r ".cluster.config // \"\"" "${testManifest}")
+if [ "${CREATE_CLUSTER}" == "true" ]; then
+  clusterType=$(yq -r ".cluster.type // \"kind\"" "${testManifest}")
+  clusterName=$(yq -r ".cluster.name // \"$(basename "${TEST_DIRECTORY}")\"" "${testManifest}")
+  clusterConfig=$(yq -r ".cluster.config // \"\"" "${testManifest}")
 
-if [ "${clusterType}" == "kind" ]; then
-  if ! kind get clusters | grep -q "${clusterName}"; then
-    if [ ! -f "${clusterConfig}" ]; then
-      kind create cluster --name "${clusterName}"
-    else
-      kind create cluster --name "${clusterName}" --config "${TEST_DIRECTORY}/${clusterConfig}"
+  if [ "${clusterType}" == "kind" ]; then
+    if ! kind get clusters | grep -q "${clusterName}"; then
+      if [ ! -f "${clusterConfig}" ]; then
+        kind create cluster --name "${clusterName}"
+      else
+        kind create cluster --name "${clusterName}" --config "${TEST_DIRECTORY}/${clusterConfig}"
+      fi
     fi
+  else
+    echo "Unknown cluster type: \"${clusterType}\""
   fi
-else
-  echo "Unknown cluster type: \"${clusterType}\""
 fi
 
 #