Merge pull request #532 from ngrok/hkatz/e2e-5

E2E 5, E5E

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

@@ -64,22 +64,23 @@ runs:
         NGROK_API_KEY: ${{ inputs.ngrok-api-key }}
         NGROK_AUTHTOKEN: ${{ inputs.ngrok-authtoken }}
         E2E_BINDING_NAME: k8s/e2e-${{ github.run_id }}
+        # use the latest image built in this run
+        IMG: ngrok/ngrok-operator
       run: |
         # create some namespaces for bindings tests
         kubectl create ns e2e || true
 
         # deploy ngrok-op for e2e tests
         make deploy_for_e2e
 
-    - name: Check if controller is up
+    - name: Check if operator is up
       shell: bash
       run: |
         kubectl get nodes
         kubectl get pods -A
-        sleep 20
+        kubectl -n ngrok-operator wait --for=condition=ready pod -l app.kubernetes.io/name=ngrok-operator --timeout=1m || true
         kubectl get pods -A
-        kubectl -n ngrok-operator describe pod -l app.kubernetes.io/component=controller
-        kubectl -n ngrok-operator logs -l app.kubernetes.io/component=controller --tail=-1
+        kubectl -n ngrok-operator describe pod -l app.kubernetes.io/name=ngrok-operator
 
     - name: Install cosign
       if: ${{ inputs.run-e2e == 'true' }}

.github/workflows/test.yaml

@@ -4,6 +4,12 @@ on:
     branches: [ "main" ]
   pull_request_target:
     branches: [ "main" ]
+  # For testing/iteration on these e2e tests
+  # 1. Create a branch and PR in the ngrok/ngrok-operator repo
+  # 2. uncomment the block below
+  # 3. Push a PR
+  # pull_request:
+  #   branches: [ "main" ]
 
 env:
   GO_VERSION: '1.23'

Makefile

@@ -4,7 +4,6 @@ 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)
@@ -318,4 +317,4 @@ e2e-clean: ## Clean up e2e tests
 	kubectl delete --all boundendpoints -n ngrok-operator
 	kubectl delete --all services -n ngrok-operator
 	kubectl delete --all kubernetesoperators -n ngrok-operator
-	helm uninstall ngrok-operator
+	helm --namespace ngrok-operator uninstall ngrok-operator