.github/dependabot.yaml

@@ -28,6 +28,48 @@ updates:
   commit-message:
     prefix: ":seedling:"
   target-branch: "main"
+# Go modules in release-v2.11 branch
+- package-ecosystem: "gomod"
+  directory: "/"
+  schedule:
+    interval: "weekly"
+  ignore:
+    # Ignore controller-runtime as its upgraded manually.
+    - dependency-name: "sigs.k8s.io/controller-runtime"
+    # Ignore k8s and its transitives modules as they are upgraded manually
+    # together with controller-runtime.
+    - dependency-name: "k8s.io/*"
+    # Ignore wrangler
+    - dependency-name: "github.com/rancher/wrangler"
+    - dependency-name: "github.com/rancher/wrangler/v3"
+    # Ignore rancher apis
+    - dependency-name: "github.com/rancher/rancher/pkg/apis"
+    # Ignore Google API version, due it is breaking integration
+    - dependency-name: "google.golang.org/api"
+  commit-message:
+    prefix: ":seedling:"
+  target-branch: "release-v2.11"
+# Go modules in release-v2.10 branch
+- package-ecosystem: "gomod"
+  directory: "/"
+  schedule:
+    interval: "weekly"
+  ignore:
+    # Ignore controller-runtime as its upgraded manually.
+    - dependency-name: "sigs.k8s.io/controller-runtime"
+    # Ignore k8s and its transitives modules as they are upgraded manually
+    # together with controller-runtime.
+    - dependency-name: "k8s.io/*"
+    # Ignore wrangler
+    - dependency-name: "github.com/rancher/wrangler"
+    - dependency-name: "github.com/rancher/wrangler/v3"
+    # Ignore rancher apis
+    - dependency-name: "github.com/rancher/rancher/pkg/apis"
+    # Ignore Google API version, due it is breaking integration
+    - dependency-name: "google.golang.org/api"
+  commit-message:
+    prefix: ":seedling:"
+  target-branch: "release-v2.10"
 # Go modules in release-v2.9 branch
 - package-ecosystem: "gomod"
   directory: "/"

.github/workflows/apidiff.yaml

@@ -10,6 +10,6 @@ jobs:
         fetch-depth: 0
     - uses: actions/setup-go@v5
       with:
-        go-version: 1.22.x
+        go-version: 1.23.x
     - name: Generate API diff
       run: make apidiff

.github/workflows/build.yaml

@@ -10,9 +10,5 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-      - name: Install Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: 1.22.x
-      - name: Build GKE operator binary
-        run: make operator
+      - name: Build
+        run: make image-build

.github/workflows/e2e-branch.yaml

@@ -22,56 +22,31 @@ jobs:
   e2e-tests:
     env:
       BRANCH: ${{ inputs.branch }}
-      REPO: ttl.sh/gke-operator-ci
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
           ref: |
             ${{ env.BRANCH }}
-      - name: Export tag
-        id: export_tag
-        run: |
-          TAG="v0.0.0"
-          COMMITDATE=`date -d @$(git log -n1 --format="%at") "+%FT%TZ"`
-          COMMIT=`git rev-parse HEAD`
-          COMMIT_SHORT=`git rev-parse --short HEAD`
-          echo "operator_tag=$TAG" >> $GITHUB_OUTPUT
-          echo "commit_date=$COMMITDATE" >> $GITHUB_OUTPUT
-          echo "commit=$COMMIT" >> $GITHUB_OUTPUT
-          echo "commit_short=$COMMIT_SHORT" >> $GITHUB_OUTPUT
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # v5.5.1
+      - name: Login to GHCR registry
+        uses: docker/login-action@v3
         with:
-          images: |
-            ${{ env.REPO }}
-          tags: |
-            type=raw,value=${{ steps.export_tag.outputs.operator_tag }}-${{ steps.export_tag.outputs.commit_short }}
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Setup Docker Buildx
+        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
       - name: Build and push image
-        uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6.9.0
-        with:
-          context: .
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          push: true
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-          target: gke-operator
-          file: test/e2e/Dockerfile.e2e
-          build-args: |
-            TAG=${{ steps.export_tag.outputs.operator_tag }}
-            COMMITDATE=${{ steps.export_tag.outputs.commit_date }}
-            COMMIT=${{ steps.export_tag.outputs.commit }}
+        env:
+          REPO: ghcr.io/rancher
+        run: |
+          make image-push
       - name: Install Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.22.x
-      - uses: helm/kind-action@0025e74a8c7512023d06dc019c617aa3cf561fde # v1.10.0
+          go-version: 1.23.x
+      - uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # v1.12.0
         with:
           version: v0.23.0
           install_only: true
@@ -84,17 +59,18 @@ jobs:
       - name: E2E tests
         env:
           GKE_CREDENTIALS: "${{ secrets.GKE_CREDENTIALS }}"
+          REPO: ghcr.io/rancher
         run: make e2e-tests
       - name: Archive artifacts
         if: always()
-        uses: actions/upload-artifact@v4.4.3
+        uses: actions/upload-artifact@v4.6.1
         with:
           name: ci-artifacts-${{ env.BRANCH }}
           path: _artifacts
           if-no-files-found: ignore
       - name: Send failed status to slack
         if: failure() && github.event_name == 'schedule'
-        uses: slackapi/slack-github-action@v1.27.0
+        uses: slackapi/slack-github-action@v2.0.0
         with:
           payload: |
             {