Merge pull request #528 from ngrok/hkatz/test-e2e-2

Trigger ci e2e with Makefile change

.github/actions/build-and-test/action.yaml

@@ -76,6 +76,10 @@ runs:
       run: |
         kubectl get nodes
         kubectl get pods -A
+        sleep 20
+        kubectl get pods -A
+        kubectl describe pod -l app.kubernetes.io/component=controller
+        kubectl logs -l app.kubernetes.io/component=controller --tail=-1
 
     - name: Install cosign
       if: ${{ inputs.run-e2e == 'true' }}
@@ -97,6 +101,6 @@ runs:
     # that hopefully helps not pollute our ngrok-operator-ci account
     - name: Cleanup e2e tests
       shell: bash
-      if: ${{ inputs.run-e2e == 'true' }}
+      if: ${{ always() && inputs.run-e2e == 'true' }}
       run: |
         make e2e-clean

.github/workflows/ci.yaml

@@ -93,11 +93,15 @@ jobs:
     - changes
     - kubebuilder-diff
     if: |
-      (needs.changes.outputs.go == 'true') ||
-      (needs.changes.outputs.charts == 'true') ||
-      (needs.changes.outputs.chartyaml == 'true') ||
-      (needs.changes.outputs.tests == 'true') ||
-      (needs.changes.outputs.make == 'true')
+      (github.event.type == 'PushEvent' && github.ref_name == 'main')
+      ||
+      (
+        (needs.changes.outputs.go == 'true') ||
+        (needs.changes.outputs.charts == 'true') ||
+        (needs.changes.outputs.chartyaml == 'true') ||
+        (needs.changes.outputs.tests == 'true') ||
+        (needs.changes.outputs.make == 'true')
+      )
     permissions:
       contents: read
       pull-requests: read

.github/workflows/test.yaml

@@ -32,11 +32,15 @@ jobs:
     needs:
     - changes
     if: |
-      (needs.changes.outputs.go == 'true') ||
-      (needs.changes.outputs.charts == 'true') ||
-      (needs.changes.outputs.chartyaml == 'true') ||
-      (needs.changes.outputs.tests == 'true') ||
-      (needs.changes.outputs.make == 'true')
+      (github.event.type == 'PushEvent' && github.ref_name == 'main')
+      ||
+      (
+        (needs.changes.outputs.go == 'true') ||
+        (needs.changes.outputs.charts == 'true') ||
+        (needs.changes.outputs.chartyaml == 'true') ||
+        (needs.changes.outputs.tests == 'true') ||
+        (needs.changes.outputs.make == 'true')
+      )
     permissions:
       contents: read
       pull-requests: read

Makefile

@@ -4,6 +4,7 @@ IMG ?= ngrok-operator
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
 ENVTEST_K8S_VERSION = 1.29.0
 
+# Repository URL
 REPO_URL = github.com/ngrok/ngrok-operator
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)