From ef6a81cae0e1d1511256b541122a1cb11835fcc7 Mon Sep 17 00:00:00 2001 From: Paul Yu Date: Fri, 5 Sep 2025 15:36:39 -0400 Subject: [PATCH 1/7] make dependatbot to open one PR for go dependencies update weekly --- .github/dependabot.yaml | 87 ++++++++++++++++++++++++++++++++++------- 1 file changed, 72 insertions(+), 15 deletions(-) diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index 2c165e712a..64c92941ab 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -23,11 +23,19 @@ updates: - package-ecosystem: "gomod" directory: "/" schedule: - interval: "daily" + interval: "weekly" + day: "monday" + time: "09:00" # PR will be only raised every monday 9:00 weekly commit-message: prefix: "deps" labels: [ "dependencies" ] - open-pull-requests-limit: 10 + # make sure there will be only one PR + open-pull-requests-limit: 1 + groups: + all-go-minor-and-patch: + applies-to: version-updates + patterns: ["*"] + update-types: ["minor", "patch"] ignore: - dependency-name: "k8s.io/api" versions: [">=0.35.0"] @@ -44,11 +52,18 @@ updates: - package-ecosystem: "gomod" directory: "/azure-ipam" schedule: - interval: "daily" + interval: "weekly" + day: "monday" + time: "09:00" commit-message: prefix: "deps" labels: [ "dependencies", "azure-ipam" ] - open-pull-requests-limit: 10 + open-pull-requests-limit: 1 + groups: + all-go-minor-and-patch: + applies-to: version-updates + patterns: ["*"] + update-types: ["minor", "patch"] ignore: - dependency-name: "k8s.io/api" versions: [">=0.35.0"] @@ -65,11 +80,18 @@ updates: - package-ecosystem: "gomod" directory: "/build/tools" schedule: - interval: "daily" + interval: "weekly" + day: "monday" + time: "09:00" commit-message: prefix: "deps" labels: [ "dependencies" ] - open-pull-requests-limit: 10 + open-pull-requests-limit: 1 + groups: + all-go-minor-and-patch: + applies-to: version-updates + patterns: ["*"] + update-types: ["minor", "patch"] ignore: - dependency-name: "k8s.io/api" versions: [">=0.35.0"] @@ -86,11 +108,18 @@ updates: - package-ecosystem: "gomod" directory: "/dropgz" schedule: - interval: "daily" + interval: "weekly" + day: "monday" + time: "09:00" commit-message: prefix: "deps" labels: [ "dependencies", "dropgz" ] - open-pull-requests-limit: 10 + open-pull-requests-limit: 1 + groups: + all-go-minor-and-patch: + applies-to: version-updates + patterns: ["*"] + update-types: ["minor", "patch"] - package-ecosystem: "gomod" directory: "/zapai" schedule: @@ -105,12 +134,19 @@ updates: - package-ecosystem: "gomod" directory: "/" schedule: - interval: "daily" + interval: "weekly" + day: "monday" + time: "09:00" commit-message: prefix: "deps" labels: [ "dependencies", "release/1.6" ] - open-pull-requests-limit: 10 + open-pull-requests-limit: 1 target-branch: "release/v1.6" + groups: + all-go-minor-and-patch: + applies-to: version-updates + patterns: ["*"] + update-types: ["minor", "patch"] ignore: - dependency-name: "k8s.io/api" versions: [">=0.32.0"] @@ -127,12 +163,19 @@ updates: - package-ecosystem: "gomod" directory: "/azure-ipam" schedule: - interval: "daily" + interval: "weekly" + day: "monday" + time: "09:00" commit-message: prefix: "deps" labels: [ "dependencies", "azure-ipam", "release/1.6" ] - open-pull-requests-limit: 10 + open-pull-requests-limit: 1 target-branch: "release/v1.6" + groups: + all-go-minor-and-patch: + applies-to: version-updates + patterns: ["*"] + update-types: ["minor", "patch"] ignore: - dependency-name: "k8s.io/api" versions: [">=0.32.0"] @@ -152,12 +195,19 @@ updates: - package-ecosystem: "gomod" directory: "/" schedule: - interval: "daily" + interval: "weekly" + day: "monday" + time: "09:00" commit-message: prefix: "deps" labels: [ "dependencies", "release/1.5" ] - open-pull-requests-limit: 10 + open-pull-requests-limit: 1 target-branch: "release/v1.5" + groups: + all-go-minor-and-patch: + applies-to: version-updates + patterns: ["*"] + update-types: ["minor", "patch"] ignore: - dependency-name: "k8s.io/api" versions: [">=0.30.0"] @@ -174,12 +224,19 @@ updates: - package-ecosystem: "gomod" directory: "/azure-ipam" schedule: - interval: "daily" + interval: "weekly" + day: "monday" + time: "09:00" commit-message: prefix: "deps" labels: [ "dependencies", "azure-ipam", "release/1.5" ] open-pull-requests-limit: 10 target-branch: "release/v1.5" + groups: + all-go-minor-and-patch: + applies-to: version-updates + patterns: ["*"] + update-types: ["minor", "patch"] ignore: - dependency-name: "k8s.io/api" versions: [">=0.30.0"] From a7b4bf34b27f68f532241d4877317eb13582132a Mon Sep 17 00:00:00 2001 From: Paul Yu Date: Mon, 8 Sep 2025 11:58:46 -0400 Subject: [PATCH 2/7] fix comments --- .github/dependabot.yaml | 577 +++++++++++++++++++++++----------------- 1 file changed, 328 insertions(+), 249 deletions(-) diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index 64c92941ab..a171fa0803 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -1,252 +1,331 @@ # https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates version: 2 + updates: -- package-ecosystem: "docker" - directory: "/" - schedule: - interval: "daily" - commit-message: - prefix: "ci" - labels: [ "ci", "dependencies" ] - open-pull-requests-limit: 10 -- package-ecosystem: "github-actions" - directory: "/" - schedule: - interval: "daily" - commit-message: - prefix: "ci" - labels: [ "ci", "dependencies" ] - open-pull-requests-limit: 10 - - -# Constrain Kubernetes dependencies to compatibility with default branch - v1.33-v1.35 -- package-ecosystem: "gomod" - directory: "/" - schedule: - interval: "weekly" - day: "monday" - time: "09:00" # PR will be only raised every monday 9:00 weekly - commit-message: - prefix: "deps" - labels: [ "dependencies" ] - # make sure there will be only one PR - open-pull-requests-limit: 1 - groups: - all-go-minor-and-patch: - applies-to: version-updates - patterns: ["*"] - update-types: ["minor", "patch"] - ignore: - - dependency-name: "k8s.io/api" - versions: [">=0.35.0"] - - dependency-name: "k8s.io/apiextensions-apiserver" - versions: [">=0.35.0"] - - dependency-name: "k8s.io/apimachinery" - versions: [">=0.35.0"] - - dependency-name: "k8s.io/client-go" - versions: [">=0.35.0"] - - dependency-name: "k8s.io/kubelet" - versions: [">=0.35.0"] - - dependency-name: "k8s.io/kubectl" - versions: [">=0.35.0"] -- package-ecosystem: "gomod" - directory: "/azure-ipam" - schedule: - interval: "weekly" - day: "monday" - time: "09:00" - commit-message: - prefix: "deps" - labels: [ "dependencies", "azure-ipam" ] - open-pull-requests-limit: 1 - groups: - all-go-minor-and-patch: - applies-to: version-updates - patterns: ["*"] - update-types: ["minor", "patch"] - ignore: - - dependency-name: "k8s.io/api" - versions: [">=0.35.0"] - - dependency-name: "k8s.io/apiextensions-apiserver" - versions: [">=0.35.0"] - - dependency-name: "k8s.io/apimachinery" - versions: [">=0.35.0"] - - dependency-name: "k8s.io/client-go" - versions: [">=0.35.0"] - - dependency-name: "k8s.io/kubelet" - versions: [">=0.35.0"] - - dependency-name: "k8s.io/kubectl" - versions: [">=0.35.0"] -- package-ecosystem: "gomod" - directory: "/build/tools" - schedule: - interval: "weekly" - day: "monday" - time: "09:00" - commit-message: - prefix: "deps" - labels: [ "dependencies" ] - open-pull-requests-limit: 1 - groups: - all-go-minor-and-patch: - applies-to: version-updates - patterns: ["*"] - update-types: ["minor", "patch"] - ignore: - - dependency-name: "k8s.io/api" - versions: [">=0.35.0"] - - dependency-name: "k8s.io/apiextensions-apiserver" - versions: [">=0.35.0"] - - dependency-name: "k8s.io/apimachinery" - versions: [">=0.35.0"] - - dependency-name: "k8s.io/client-go" - versions: [">=0.35.0"] - - dependency-name: "k8s.io/kubelet" - versions: [">=0.35.0"] - - dependency-name: "k8s.io/kubectl" - versions: [">=0.35.0"] -- package-ecosystem: "gomod" - directory: "/dropgz" - schedule: - interval: "weekly" - day: "monday" - time: "09:00" - commit-message: - prefix: "deps" - labels: [ "dependencies", "dropgz" ] - open-pull-requests-limit: 1 - groups: - all-go-minor-and-patch: - applies-to: version-updates - patterns: ["*"] - update-types: ["minor", "patch"] -- package-ecosystem: "gomod" - directory: "/zapai" - schedule: - interval: "daily" - commit-message: - prefix: "deps" - labels: [ "dependencies" ] - open-pull-requests-limit: 10 - - -# Constrain Kubernetes dependencies to compatibility with release/v1.6 branch - v1.30-v1.32 -- package-ecosystem: "gomod" - directory: "/" - schedule: - interval: "weekly" - day: "monday" - time: "09:00" - commit-message: - prefix: "deps" - labels: [ "dependencies", "release/1.6" ] - open-pull-requests-limit: 1 - target-branch: "release/v1.6" - groups: - all-go-minor-and-patch: - applies-to: version-updates - patterns: ["*"] - update-types: ["minor", "patch"] - ignore: - - dependency-name: "k8s.io/api" - versions: [">=0.32.0"] - - dependency-name: "k8s.io/apiextensions-apiserver" - versions: [">=0.32.0"] - - dependency-name: "k8s.io/apimachinery" - versions: [">=0.32.0"] - - dependency-name: "k8s.io/client-go" - versions: [">=0.32.0"] - - dependency-name: "k8s.io/kubelet" - versions: [">=0.32.0"] - - dependency-name: "k8s.io/kubectl" - versions: [">=0.32.0"] -- package-ecosystem: "gomod" - directory: "/azure-ipam" - schedule: - interval: "weekly" - day: "monday" - time: "09:00" - commit-message: - prefix: "deps" - labels: [ "dependencies", "azure-ipam", "release/1.6" ] - open-pull-requests-limit: 1 - target-branch: "release/v1.6" - groups: - all-go-minor-and-patch: - applies-to: version-updates - patterns: ["*"] - update-types: ["minor", "patch"] - ignore: - - dependency-name: "k8s.io/api" - versions: [">=0.32.0"] - - dependency-name: "k8s.io/apiextensions-apiserver" - versions: [">=0.32.0"] - - dependency-name: "k8s.io/apimachinery" - versions: [">=0.32.0"] - - dependency-name: "k8s.io/client-go" - versions: [">=0.32.0"] - - dependency-name: "k8s.io/kubelet" - versions: [">=0.32.0"] - - dependency-name: "k8s.io/kubectl" - versions: [">=0.32.0"] - - -# Constrain Kubernetes dependencies to compatibility with release/v1.5 branch - v1.28-v1.30 -- package-ecosystem: "gomod" - directory: "/" - schedule: - interval: "weekly" - day: "monday" - time: "09:00" - commit-message: - prefix: "deps" - labels: [ "dependencies", "release/1.5" ] - open-pull-requests-limit: 1 - target-branch: "release/v1.5" - groups: - all-go-minor-and-patch: - applies-to: version-updates - patterns: ["*"] - update-types: ["minor", "patch"] - ignore: - - dependency-name: "k8s.io/api" - versions: [">=0.30.0"] - - dependency-name: "k8s.io/apiextensions-apiserver" - versions: [">=0.30.0"] - - dependency-name: "k8s.io/apimachinery" - versions: [">=0.30.0"] - - dependency-name: "k8s.io/client-go" - versions: [">=0.30.0"] - - dependency-name: "k8s.io/kubelet" - versions: [">=0.30.0"] - - dependency-name: "k8s.io/kubectl" - versions: [">=0.30.0"] -- package-ecosystem: "gomod" - directory: "/azure-ipam" - schedule: - interval: "weekly" - day: "monday" - time: "09:00" - commit-message: - prefix: "deps" - labels: [ "dependencies", "azure-ipam", "release/1.5" ] - open-pull-requests-limit: 10 - target-branch: "release/v1.5" - groups: - all-go-minor-and-patch: - applies-to: version-updates - patterns: ["*"] - update-types: ["minor", "patch"] - ignore: - - dependency-name: "k8s.io/api" - versions: [">=0.30.0"] - - dependency-name: "k8s.io/apiextensions-apiserver" - versions: [">=0.30.0"] - - dependency-name: "k8s.io/apimachinery" - versions: [">=0.30.0"] - - dependency-name: "k8s.io/client-go" - versions: [">=0.30.0"] - - dependency-name: "k8s.io/kubelet" - versions: [">=0.30.0"] - - dependency-name: "k8s.io/kubectl" - versions: [">=0.30.0"] + - package-ecosystem: "docker" + directory: "/" + schedule: + interval: "daily" + commit-message: + prefix: "ci" + labels: ["ci", "dependencies"] + open-pull-requests-limit: 10 + + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "daily" + commit-message: + prefix: "ci" + labels: ["ci", "dependencies"] + open-pull-requests-limit: 10 + + # ========================= + # DEFAULT BRANCH (master/main) — STAGED ROLLOUT + # ========================= + + # ---- Root go.mod (/): GROUPED weekly minor+patch ---- + - package-ecosystem: "gomod" + directory: "/" + schedule: + interval: "weekly" + day: "sunday" + time: "12:00" # UTC time + commit-message: + prefix: "deps" + labels: ["dependencies", "grouped"] + open-pull-requests-limit: 1 + groups: + all-go-minor-and-patch: + applies-to: version-updates + patterns: ["*"] + update-types: ["minor", "patch"] + + # Constrain Kubernetes deps to default branch compatibility (v0.33–v0.35) + ignore: + - dependency-name: "k8s.io/api" + versions: [">=0.35.0"] + - dependency-name: "k8s.io/apiextensions-apiserver" + versions: [">=0.35.0"] + - dependency-name: "k8s.io/apimachinery" + versions: [">=0.35.0"] + - dependency-name: "k8s.io/client-go" + versions: [">=0.35.0"] + - dependency-name: "k8s.io/kubelet" + versions: [">=0.35.0"] + - dependency-name: "k8s.io/kubectl" + versions: [">=0.35.0"] + + # ---- Root go.mod (/): INDIVIDUAL major-only ---- + - package-ecosystem: "gomod" + directory: "/" + schedule: + interval: "weekly" + day: "sunday" + time: "12:00" + commit-message: + prefix: "deps" + labels: ["dependencies", "major"] + open-pull-requests-limit: 1 + # Surface only majors by ignoring minor/patch + ignore: + - dependency-name: "*" + update-types: ["version-update:semver-minor", "version-update:semver-patch"] + + # ---- /azure-ipam: GROUPED weekly minor+patch ---- + - package-ecosystem: "gomod" + directory: "/azure-ipam" + schedule: + interval: "weekly" + day: "sunday" + time: "12:00" + commit-message: + prefix: "deps" + labels: ["dependencies", "azure-ipam", "grouped"] + open-pull-requests-limit: 1 + groups: + all-go-minor-and-patch: + applies-to: version-updates + patterns: ["*"] + update-types: ["minor", "patch"] + ignore: + - dependency-name: "k8s.io/api" + versions: [">=0.35.0"] + - dependency-name: "k8s.io/apiextensions-apiserver" + versions: [">=0.35.0"] + - dependency-name: "k8s.io/apimachinery" + versions: [">=0.35.0"] + - dependency-name: "k8s.io/client-go" + versions: [">=0.35.0"] + - dependency-name: "k8s.io/kubelet" + versions: [">=0.35.0"] + - dependency-name: "k8s.io/kubectl" + versions: [">=0.35.0"] + + # ---- /azure-ipam: INDIVIDUAL major-only ---- + - package-ecosystem: "gomod" + directory: "/azure-ipam" + schedule: + interval: "weekly" + day: "sunday" + time: "12:00" + commit-message: + prefix: "deps" + labels: ["dependencies", "azure-ipam", "major"] + open-pull-requests-limit: 1 + ignore: + - dependency-name: "*" + update-types: ["version-update:semver-minor", "version-update:semver-patch"] + + # ---- /build/tools: GROUPED weekly minor+patch ---- + - package-ecosystem: "gomod" + directory: "/build/tools" + schedule: + interval: "weekly" + day: "sunday" + time: "12:00" + commit-message: + prefix: "deps" + labels: ["dependencies", "grouped"] + open-pull-requests-limit: 1 + groups: + all-go-minor-and-patch: + applies-to: version-updates + patterns: ["*"] + update-types: ["minor", "patch"] + ignore: + - dependency-name: "k8s.io/api" + versions: [">=0.35.0"] + - dependency-name: "k8s.io/apiextensions-apiserver" + versions: [">=0.35.0"] + - dependency-name: "k8s.io/apimachinery" + versions: [">=0.35.0"] + - dependency-name: "k8s.io/client-go" + versions: [">=0.35.0"] + - dependency-name: "k8s.io/kubelet" + versions: [">=0.35.0"] + - dependency-name: "k8s.io/kubectl" + versions: [">=0.35.0"] + + # ---- /build/tools: INDIVIDUAL major-only ---- + - package-ecosystem: "gomod" + directory: "/build/tools" + schedule: + interval: "weekly" + day: "sunday" + time: "12:00" + commit-message: + prefix: "deps" + labels: ["dependencies", "major"] + open-pull-requests-limit: 1 + ignore: + - dependency-name: "*" + update-types: ["version-update:semver-minor", "version-update:semver-patch"] + + # ---- /dropgz: GROUPED weekly minor+patch ---- + - package-ecosystem: "gomod" + directory: "/dropgz" + schedule: + interval: "weekly" + day: "sunday" + time: "12:00" + commit-message: + prefix: "deps" + labels: ["dependencies", "dropgz", "grouped"] + open-pull-requests-limit: 1 + groups: + all-go-minor-and-patch: + applies-to: version-updates + patterns: ["*"] + update-types: ["minor", "patch"] + + # ---- /dropgz: INDIVIDUAL major-only ---- + - package-ecosystem: "gomod" + directory: "/dropgz" + schedule: + interval: "weekly" + day: "sunday" + time: "12:00" + commit-message: + prefix: "deps" + labels: ["dependencies", "dropgz", "major"] + open-pull-requests-limit: 1 + ignore: + - dependency-name: "*" + update-types: ["version-update:semver-minor", "version-update:semver-patch"] + + # ---- /zapai (unchanged cadence, still daily individual PRs) ---- + - package-ecosystem: "gomod" + directory: "/zapai" + schedule: + interval: "daily" + commit-message: + prefix: "deps" + labels: ["dependencies"] + open-pull-requests-limit: 10 + + # ========================= + # RELEASE BRANCHES — UNCHANGED (broad roll-out later) + # ========================= + + # Constrain Kubernetes dependencies to compatibility with release/v1.6 branch - v1.30-v1.32 + - package-ecosystem: "gomod" + directory: "/" + schedule: + interval: "weekly" + day: "sunday" + time: "12:00" + commit-message: + prefix: "deps" + labels: ["dependencies", "release/1.6"] + open-pull-requests-limit: 1 + target-branch: "release/v1.6" + groups: + all-go-minor-and-patch: + applies-to: version-updates + patterns: ["*"] + update-types: ["minor", "patch"] + ignore: + - dependency-name: "k8s.io/api" + versions: [">=0.32.0"] + - dependency-name: "k8s.io/apiextensions-apiserver" + versions: [">=0.32.0"] + - dependency-name: "k8s.io/apimachinery" + versions: [">=0.32.0"] + - dependency-name: "k8s.io/client-go" + versions: [">=0.32.0"] + - dependency-name: "k8s.io/kubelet" + versions: [">=0.32.0"] + - dependency-name: "k8s.io/kubectl" + versions: [">=0.32.0"] + + - package-ecosystem: "gomod" + directory: "/azure-ipam" + schedule: + interval: "weekly" + day: "sunday" + time: "12:00" + commit-message: + prefix: "deps" + labels: ["dependencies", "azure-ipam", "release/1.6"] + open-pull-requests-limit: 1 + target-branch: "release/v1.6" + groups: + all-go-minor-and-patch: + applies-to: version-updates + patterns: ["*"] + update-types: ["minor", "patch"] + ignore: + - dependency-name: "k8s.io/api" + versions: [">=0.32.0"] + - dependency-name: "k8s.io/apiextensions-apiserver" + versions: [">=0.32.0"] + - dependency-name: "k8s.io/apimachinery" + versions: [">=0.32.0"] + - dependency-name: "k8s.io/client-go" + versions: [">=0.32.0"] + - dependency-name: "k8s.io/kubelet" + versions: [">=0.32.0"] + - dependency-name: "k8s.io/kubectl" + versions: [">=0.32.0"] + + # Constrain Kubernetes dependencies to compatibility with release/v1.5 branch - v1.28-v1.30 + - package-ecosystem: "gomod" + directory: "/" + schedule: + interval: "weekly" + day: "sunday" + time: "12:00" + commit-message: + prefix: "deps" + labels: ["dependencies", "release/1.5"] + open-pull-requests-limit: 1 + target-branch: "release/v1.5" + groups: + all-go-minor-and-patch: + applies-to: version-updates + patterns: ["*"] + update-types: ["minor", "patch"] + ignore: + - dependency-name: "k8s.io/api" + versions: [">=0.30.0"] + - dependency-name: "k8s.io/apiextensions-apiserver" + versions: [">=0.30.0"] + - dependency-name: "k8s.io/apimachinery" + versions: [">=0.30.0"] + - dependency-name: "k8s.io/client-go" + versions: [">=0.30.0"] + - dependency-name: "k8s.io/kubelet" + versions: [">=0.30.0"] + - dependency-name: "k8s.io/kubectl" + versions: [">=0.30.0"] + + - package-ecosystem: "gomod" + directory: "/azure-ipam" + schedule: + interval: "weekly" + day: "sunday" + time: "12:00" + commit-message: + prefix: "deps" + labels: ["dependencies", "azure-ipam", "release/1.5"] + open-pull-requests-limit: 10 + target-branch: "release/v1.5" + groups: + all-go-minor-and-patch: + applies-to: version-updates + patterns: ["*"] + update-types: ["minor", "patch"] + ignore: + - dependency-name: "k8s.io/api" + versions: [">=0.30.0"] + - dependency-name: "k8s.io/apiextensions-apiserver" + versions: [">=0.30.0"] + - dependency-name: "k8s.io/apimachinery" + versions: [">=0.30.0"] + - dependency-name: "k8s.io/client-go" + versions: [">=0.30.0"] + - dependency-name: "k8s.io/kubelet" + versions: [">=0.30.0"] + - dependency-name: "k8s.io/kubectl" + versions: [">=0.30.0"] From 10aafcb7aba7cdce62ce95851a7b05b40169cd58 Mon Sep 17 00:00:00 2001 From: Paul Yu Date: Mon, 8 Sep 2025 11:59:58 -0400 Subject: [PATCH 3/7] remove spaces --- .github/dependabot.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index a171fa0803..2b9eb91edf 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -1,6 +1,5 @@ # https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates version: 2 - updates: - package-ecosystem: "docker" directory: "/" @@ -10,7 +9,6 @@ updates: prefix: "ci" labels: ["ci", "dependencies"] open-pull-requests-limit: 10 - - package-ecosystem: "github-actions" directory: "/" schedule: From fb94fb53bd37a58870cd5cb930b98c3da7231ca8 Mon Sep 17 00:00:00 2001 From: Paul Yu Date: Mon, 8 Sep 2025 12:17:50 -0400 Subject: [PATCH 4/7] fix comments --- .github/dependabot.yaml | 102 ++++++++-------------------------------- 1 file changed, 20 insertions(+), 82 deletions(-) diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index 2b9eb91edf..eeaf98b754 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -9,6 +9,7 @@ updates: prefix: "ci" labels: ["ci", "dependencies"] open-pull-requests-limit: 10 + - package-ecosystem: "github-actions" directory: "/" schedule: @@ -22,24 +23,22 @@ updates: # DEFAULT BRANCH (master/main) — STAGED ROLLOUT # ========================= - # ---- Root go.mod (/): GROUPED weekly minor+patch ---- + # Root go.mod (/): grouped minor+patch + allow majors concurrently - package-ecosystem: "gomod" directory: "/" schedule: interval: "weekly" day: "sunday" - time: "12:00" # UTC time + time: "12:00" # UTC commit-message: prefix: "deps" labels: ["dependencies", "grouped"] - open-pull-requests-limit: 1 + open-pull-requests-limit: 2 groups: all-go-minor-and-patch: applies-to: version-updates patterns: ["*"] update-types: ["minor", "patch"] - - # Constrain Kubernetes deps to default branch compatibility (v0.33–v0.35) ignore: - dependency-name: "k8s.io/api" versions: [">=0.35.0"] @@ -54,33 +53,17 @@ updates: - dependency-name: "k8s.io/kubectl" versions: [">=0.35.0"] - # ---- Root go.mod (/): INDIVIDUAL major-only ---- - - package-ecosystem: "gomod" - directory: "/" - schedule: - interval: "weekly" - day: "sunday" - time: "12:00" - commit-message: - prefix: "deps" - labels: ["dependencies", "major"] - open-pull-requests-limit: 1 - # Surface only majors by ignoring minor/patch - ignore: - - dependency-name: "*" - update-types: ["version-update:semver-minor", "version-update:semver-patch"] - - # ---- /azure-ipam: GROUPED weekly minor+patch ---- + # /azure-ipam: grouped minor+patch + allow majors concurrently - package-ecosystem: "gomod" directory: "/azure-ipam" schedule: interval: "weekly" day: "sunday" - time: "12:00" + time: "12:00" # UTC commit-message: prefix: "deps" labels: ["dependencies", "azure-ipam", "grouped"] - open-pull-requests-limit: 1 + open-pull-requests-limit: 2 groups: all-go-minor-and-patch: applies-to: version-updates @@ -100,32 +83,17 @@ updates: - dependency-name: "k8s.io/kubectl" versions: [">=0.35.0"] - # ---- /azure-ipam: INDIVIDUAL major-only ---- - - package-ecosystem: "gomod" - directory: "/azure-ipam" - schedule: - interval: "weekly" - day: "sunday" - time: "12:00" - commit-message: - prefix: "deps" - labels: ["dependencies", "azure-ipam", "major"] - open-pull-requests-limit: 1 - ignore: - - dependency-name: "*" - update-types: ["version-update:semver-minor", "version-update:semver-patch"] - - # ---- /build/tools: GROUPED weekly minor+patch ---- + # /build/tools: grouped minor+patch + allow majors concurrently - package-ecosystem: "gomod" directory: "/build/tools" schedule: interval: "weekly" day: "sunday" - time: "12:00" + time: "12:00" # UTC commit-message: prefix: "deps" labels: ["dependencies", "grouped"] - open-pull-requests-limit: 1 + open-pull-requests-limit: 2 groups: all-go-minor-and-patch: applies-to: version-updates @@ -145,54 +113,24 @@ updates: - dependency-name: "k8s.io/kubectl" versions: [">=0.35.0"] - # ---- /build/tools: INDIVIDUAL major-only ---- - - package-ecosystem: "gomod" - directory: "/build/tools" - schedule: - interval: "weekly" - day: "sunday" - time: "12:00" - commit-message: - prefix: "deps" - labels: ["dependencies", "major"] - open-pull-requests-limit: 1 - ignore: - - dependency-name: "*" - update-types: ["version-update:semver-minor", "version-update:semver-patch"] - - # ---- /dropgz: GROUPED weekly minor+patch ---- + # /dropgz: grouped minor+patch + allow majors concurrently - package-ecosystem: "gomod" directory: "/dropgz" schedule: interval: "weekly" day: "sunday" - time: "12:00" + time: "12:00" # UTC commit-message: prefix: "deps" labels: ["dependencies", "dropgz", "grouped"] - open-pull-requests-limit: 1 + open-pull-requests-limit: 2 groups: all-go-minor-and-patch: applies-to: version-updates patterns: ["*"] update-types: ["minor", "patch"] - # ---- /dropgz: INDIVIDUAL major-only ---- - - package-ecosystem: "gomod" - directory: "/dropgz" - schedule: - interval: "weekly" - day: "sunday" - time: "12:00" - commit-message: - prefix: "deps" - labels: ["dependencies", "dropgz", "major"] - open-pull-requests-limit: 1 - ignore: - - dependency-name: "*" - update-types: ["version-update:semver-minor", "version-update:semver-patch"] - - # ---- /zapai (unchanged cadence, still daily individual PRs) ---- + # /zapai (unchanged cadence, still daily individual PRs) - package-ecosystem: "gomod" directory: "/zapai" schedule: @@ -206,13 +144,13 @@ updates: # RELEASE BRANCHES — UNCHANGED (broad roll-out later) # ========================= - # Constrain Kubernetes dependencies to compatibility with release/v1.6 branch - v1.30-v1.32 + # release/v1.6 constraints (single block per directory+target-branch) - package-ecosystem: "gomod" directory: "/" schedule: interval: "weekly" day: "sunday" - time: "12:00" + time: "12:00" # UTC commit-message: prefix: "deps" labels: ["dependencies", "release/1.6"] @@ -242,7 +180,7 @@ updates: schedule: interval: "weekly" day: "sunday" - time: "12:00" + time: "12:00" # UTC commit-message: prefix: "deps" labels: ["dependencies", "azure-ipam", "release/1.6"] @@ -267,13 +205,13 @@ updates: - dependency-name: "k8s.io/kubectl" versions: [">=0.32.0"] - # Constrain Kubernetes dependencies to compatibility with release/v1.5 branch - v1.28-v1.30 + # release/v1.5 constraints (single block per directory+target-branch) - package-ecosystem: "gomod" directory: "/" schedule: interval: "weekly" day: "sunday" - time: "12:00" + time: "12:00" # UTC commit-message: prefix: "deps" labels: ["dependencies", "release/1.5"] @@ -303,7 +241,7 @@ updates: schedule: interval: "weekly" day: "sunday" - time: "12:00" + time: "12:00" # UTC commit-message: prefix: "deps" labels: ["dependencies", "azure-ipam", "release/1.5"] From f29c4ea0ee2524dc01c34ad4b27c0d0614b90c25 Mon Sep 17 00:00:00 2001 From: Paul Yu Date: Mon, 8 Sep 2025 12:22:30 -0400 Subject: [PATCH 5/7] make /zapai to update weeklly too --- .github/dependabot.yaml | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index eeaf98b754..80486fdef3 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -130,19 +130,22 @@ updates: patterns: ["*"] update-types: ["minor", "patch"] - # /zapai (unchanged cadence, still daily individual PRs) + # /zapai: grouped weekly minor+patch + allow majors concurrently - package-ecosystem: "gomod" directory: "/zapai" schedule: - interval: "daily" + interval: "weekly" + day: "sunday" + time: "12:00" # UTC commit-message: prefix: "deps" - labels: ["dependencies"] - open-pull-requests-limit: 10 - - # ========================= - # RELEASE BRANCHES — UNCHANGED (broad roll-out later) - # ========================= + labels: ["dependencies", "grouped"] + open-pull-requests-limit: 2 + groups: + all-go-minor-and-patch: + applies-to: version-updates + patterns: ["*"] + update-types: ["minor", "patch"] # release/v1.6 constraints (single block per directory+target-branch) - package-ecosystem: "gomod" From 014a0e87ebdba76dc379a097e12d42112ede9220 Mon Sep 17 00:00:00 2001 From: Paul Yu Date: Mon, 8 Sep 2025 12:43:30 -0400 Subject: [PATCH 6/7] make v1.5 and v1.6 daily updates --- .github/dependabot.yaml | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index 80486fdef3..ab250d4781 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -147,13 +147,15 @@ updates: patterns: ["*"] update-types: ["minor", "patch"] - # release/v1.6 constraints (single block per directory+target-branch) + # ========================= + # RELEASE BRANCHES — keep daily for v1.5 and v1.6 + # ========================= + + # release/v1.6 constraints (daily); - package-ecosystem: "gomod" directory: "/" schedule: - interval: "weekly" - day: "sunday" - time: "12:00" # UTC + interval: "daily" commit-message: prefix: "deps" labels: ["dependencies", "release/1.6"] @@ -181,9 +183,7 @@ updates: - package-ecosystem: "gomod" directory: "/azure-ipam" schedule: - interval: "weekly" - day: "sunday" - time: "12:00" # UTC + interval: "daily" commit-message: prefix: "deps" labels: ["dependencies", "azure-ipam", "release/1.6"] @@ -208,13 +208,11 @@ updates: - dependency-name: "k8s.io/kubectl" versions: [">=0.32.0"] - # release/v1.5 constraints (single block per directory+target-branch) + # release/v1.5 constraints (daily) - package-ecosystem: "gomod" directory: "/" schedule: - interval: "weekly" - day: "sunday" - time: "12:00" # UTC + interval: "daily" commit-message: prefix: "deps" labels: ["dependencies", "release/1.5"] @@ -242,9 +240,7 @@ updates: - package-ecosystem: "gomod" directory: "/azure-ipam" schedule: - interval: "weekly" - day: "sunday" - time: "12:00" # UTC + interval: "daily" commit-message: prefix: "deps" labels: ["dependencies", "azure-ipam", "release/1.5"] From ae82407c62252b4d5fc7cf799401e982bb727c75 Mon Sep 17 00:00:00 2001 From: Paul Yu Date: Tue, 9 Sep 2025 10:57:57 -0400 Subject: [PATCH 7/7] remove build/tool --- .github/dependabot.yaml | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index ab250d4781..4f2272870d 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -83,36 +83,6 @@ updates: - dependency-name: "k8s.io/kubectl" versions: [">=0.35.0"] - # /build/tools: grouped minor+patch + allow majors concurrently - - package-ecosystem: "gomod" - directory: "/build/tools" - schedule: - interval: "weekly" - day: "sunday" - time: "12:00" # UTC - commit-message: - prefix: "deps" - labels: ["dependencies", "grouped"] - open-pull-requests-limit: 2 - groups: - all-go-minor-and-patch: - applies-to: version-updates - patterns: ["*"] - update-types: ["minor", "patch"] - ignore: - - dependency-name: "k8s.io/api" - versions: [">=0.35.0"] - - dependency-name: "k8s.io/apiextensions-apiserver" - versions: [">=0.35.0"] - - dependency-name: "k8s.io/apimachinery" - versions: [">=0.35.0"] - - dependency-name: "k8s.io/client-go" - versions: [">=0.35.0"] - - dependency-name: "k8s.io/kubelet" - versions: [">=0.35.0"] - - dependency-name: "k8s.io/kubectl" - versions: [">=0.35.0"] - # /dropgz: grouped minor+patch + allow majors concurrently - package-ecosystem: "gomod" directory: "/dropgz"