Change merge queue workflow

Author: rlymbur

.github/workflows/presubmit.yaml

@@ -1,15 +1,11 @@
-name: e2e-test
+name: Validate code in the merge queue with e2e-test
 permissions:
   id-token: write
   contents: read
 on:
-  push:
-    branches:
-      - main
-  workflow_dispatch:
-  workflow_call:
+  merge_group:
 jobs:
-  e2e-test:
+  validate:
     runs-on: ubuntu-latest
     # Prevent concurrent execution as we only have one cluster at the moment.
     concurrency:

.github/workflows/e2e-test.yaml .github/workflows/validate-merge-queue-e2e-test.yaml

@@ -0,0 +1,22 @@
+name: Validate pull request with presubmit before putting into queue
+permissions:
+  id-token: write
+  contents: read
+on:
+  pull_request:
+jobs:
+  validate:
+    name: golangci-lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - run: sed -En 's/^go[[:space:]]+([[:digit:].]+)$/GO_VERSION=\1/p' go.mod >> $GITHUB_ENV
+      - uses: actions/setup-go@v4
+        with:
+          go-version: ${{ env.GO_VERSION }}
+          cache: false
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v3
+        with:
+          version: v1.63.4
+          args:  --verbose --timeout 30m

.github/workflows/validate-merge-queue.yaml

@@ -0,0 +1,43 @@
+name: Validate pull request with presubmit before putting into queue
+on:
+  pull_request:
+jobs:
+  validate:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        k8sVersion: ["1.31.1"]
+    env:
+      K8S_VERSION: ${{ matrix.k8sVersion }}
+    steps:
+      - uses: actions/checkout@v3
+      - run: sed -En 's/^go[[:space:]]+([[:digit:].]+)$/GO_VERSION=\1/p' go.mod >> $GITHUB_ENV
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.11'
+          cache: 'pip'
+      - run: pip install -r requirements.txt
+      - uses: actions/setup-go@v3
+        with:
+          go-version: ${{ env.GO_VERSION }}
+          check-latest: true
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cache/go-build
+            ~/go/pkg/mod
+            ~/go/bin/
+            ~/.kubebuilder/bin
+          key: ${{ runner.os }}-go-cache-${{ hashFiles('**/go.sum') }}
+      - run: go install github.com/golang/mock/[email protected]
+      - run: go install sigs.k8s.io/kustomize/kustomize/[email protected]
+      - run: go install sigs.k8s.io/controller-runtime/tools/[email protected]
+      - run: go install github.com/mattn/goveralls@b031368
+      - run: make manifest
+      - run: make vet
+      - run: make test
+      - run: make docs
+      - name: Send coverage
+        env:
+          COVERALLS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: goveralls -coverprofile=coverage.out -service=github