Improve 8.x Dependency Updates

.ci/updatecli/updatecli.d/update-golang.yml

@@ -25,7 +25,6 @@ actions:
       labels:
         - automation
         - dependency
-        - backport-v8.x
         - go
       description: |-
         ### What

.ci/updatecli/updatecli.d/update-hermit.yml

@@ -23,7 +23,6 @@ actions:
       automerge: false
       labels:
         - automation
-        - backport-v8.x
         - dependency
       description: |-
         ### What

.ci/updatecli/updatecli.d/update-mods.yml

@@ -23,7 +23,6 @@ actions:
       automerge: false
       labels:
         - automation
-        - backport-v8.x
         - dependency
         - go
       description: |-

.github/dependabot.yml

@@ -29,7 +29,41 @@ updates:
       - "backport-v8.x"
       - "dependency"
       - "go"
-    open-pull-requests-limit: 10
+    open-pull-requests-limit: 2
+    # elastic/beats is using v7 in their go.mod, leading to automatic updates not working. Manual update is needed with
+    # go get -u github.com/elastic/beats/v7@<commit sha>
+    ignore:
+      - dependency-name: "github.com/elastic/beats/v7"
+    schedule:
+      interval: "monthly"
+
+  - package-ecosystem: "gomod"
+    target-branch: "8.x"
+    directory: "/"
+    groups:
+      azure:
+        patterns:
+          - "github.com/Azure/*"
+      aws:
+        patterns:
+          - "github.com/aws/*"
+      google:
+        patterns:
+          - "cloud.google.com/*"
+          - "google.golang.org/api"
+      elastic:
+        patterns:
+          - "github.com/elastic/*"
+      k8s:
+        patterns:
+          - "k8s.io/*"
+      trivy:
+        patterns:
+          - "github.com/aquasecurity/*"
+    labels:
+      - "dependency"
+      - "go"
+    open-pull-requests-limit: 2
     # elastic/beats is using v7 in their go.mod, leading to automatic updates not working. Manual update is needed with
     # go get -u github.com/elastic/beats/v7@<commit sha>
     ignore:

.github/workflows/updatecli.yml

@@ -49,6 +49,7 @@ jobs:
       fail-fast: false
       matrix:
         pipeline-name: [ beats, golang, hermit, mods ]
+        git-branch: [ main, 8.x ]
     steps:
       - uses: actions/checkout@v4
       - name: Init Hermit
@@ -58,7 +59,7 @@ jobs:
       - name: Run Updatecli in Apply mode
         run: updatecli apply --config .ci/updatecli/updatecli.d/update-${{ matrix.pipeline-name }}.yml --values .ci/updatecli/values.yml
         env:
-          GIT_BRANCH: main
+          GIT_BRANCH: ${{ matrix.git-branch }}
           GIT_USER: "Cloud Security Machine"
           GITHUB_TOKEN: ${{ secrets.CLOUDSEC_MACHINE_TOKEN }}