From f7ed22cdfcca014cdf4bc88994534456989cd151 Mon Sep 17 00:00:00 2001
From: Chris Privitere <23177737+cprivitere@users.noreply.github.com>
Date: Mon, 8 Jan 2024 12:23:41 -0600
Subject: [PATCH] ci: sync dependabot settings with upstream capi

---
 .github/dependabot.yml | 47 ++++++++++++++++++++++++++++++++----------
 1 file changed, 36 insertions(+), 11 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index f95bd12f4..7f9eab605 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -10,43 +10,68 @@ updates:
   commit-message:
       prefix: ":seedling:"
   labels:
+    - "area/ci"
     - "ok-to-test"
 # Go
 - package-ecosystem: "gomod"
   directory: "/"
   schedule:
     interval: "weekly"
+    day: "monday"
+  ## group all dependencies with a k8s.io prefix into a single PR.
+  groups:
+    kubernetes:
+      patterns: [ "k8s.io/*" ]
   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.
+    update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
+    # Ignore k8s and its transitives modules as they are upgraded manually together with controller-runtime.
   - dependency-name: "k8s.io/*"
+    update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
   - dependency-name: "go.etcd.io/*"
+    update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
   - dependency-name: "google.golang.org/grpc"
+    update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
+    # Bumping the kustomize API independently can break compatibility with client-go as they share k8s.io/kube-openapi as a dependency.
+  - dependency-name: "sigs.k8s.io/kustomize/api"
+    update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
   commit-message:
     prefix: ":seedling:"
   labels:
     - "area/dependency"
     - "ok-to-test"
+  
 # Maintain e2e test Go modules
 - package-ecosystem: "gomod"
   directory: "/test/e2e"
   schedule:
-    interval: "weekly"  
+    interval: "weekly"
+    day: "tuesday"
+  ## group all dependencies with a k8s.io prefix into a single PR.
+  groups:
+    kubernetes:
+      patterns: [ "k8s.io/*" ]
   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/*"
-  - dependency-name: "go.etcd.io/*"
-  - dependency-name: "google.golang.org/grpc"
+    # Ignore controller-runtime as its upgraded manually.
+    - dependency-name: "sigs.k8s.io/controller-runtime"
+      update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
+    # Ignore k8s and its transitives modules as they are upgraded manually together with controller-runtime.
+    - dependency-name: "k8s.io/*"
+      update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
+    - dependency-name: "go.etcd.io/*"
+      update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
+    - dependency-name: "google.golang.org/grpc"
+      update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
+    # Bumping the kustomize API independently can break compatibility with client-go as they share k8s.io/kube-openapi as a dependency.
+    - dependency-name: "sigs.k8s.io/kustomize/api"
+      update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
   commit-message:
     prefix: ":seedling:"
   labels:
     - "area/dependency"
     - "ok-to-test"
+  
 # Maintain dependencies for Docker images.
 - package-ecosystem: "docker"
   directory: "/"
@@ -55,4 +80,4 @@ updates:
   commit-message:
     prefix: ":seedling:"
   labels:
-    - "ok-to-test"
\ No newline at end of file
+    - "ok-to-test"