From d854936b256c5f803ee5e328a7e684f4a5183bf6 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 7 Jun 2025 00:41:01 +0000 Subject: [PATCH 1/8] Initial plan for issue From 6018da30e7d7386fc7eac253070fd193c68cd0e3 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 7 Jun 2025 00:48:51 +0000 Subject: [PATCH 2/8] feat: add Kubernetes version constraints to Dependabot config Co-authored-by: jpayne3506 <89417863+jpayne3506@users.noreply.github.com> --- .github/dependabot.yaml | 84 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index 4fd8083dbe..ff9069cb1c 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -31,6 +31,20 @@ updates: prefix: "deps" labels: [ "dependencies" ] open-pull-requests-limit: 10 + ignore: + # Constrain Kubernetes dependencies to v1.30-v1.32 compatibility range + - dependency-name: "k8s.io/api" + versions: [">=0.33.0"] + - dependency-name: "k8s.io/apiextensions-apiserver" + versions: [">=0.33.0"] + - dependency-name: "k8s.io/apimachinery" + versions: [">=0.33.0"] + - dependency-name: "k8s.io/client-go" + versions: [">=0.33.0"] + - dependency-name: "k8s.io/kubelet" + versions: [">=0.33.0"] + - dependency-name: "k8s.io/kubectl" + versions: [">=0.33.0"] - package-ecosystem: "gomod" directory: "/azure-ipam" schedule: @@ -41,6 +55,20 @@ updates: prefix: "deps" labels: [ "dependencies", "azure-ipam" ] open-pull-requests-limit: 10 + ignore: + # Constrain Kubernetes dependencies to v1.30-v1.32 compatibility range + - dependency-name: "k8s.io/api" + versions: [">=0.33.0"] + - dependency-name: "k8s.io/apiextensions-apiserver" + versions: [">=0.33.0"] + - dependency-name: "k8s.io/apimachinery" + versions: [">=0.33.0"] + - dependency-name: "k8s.io/client-go" + versions: [">=0.33.0"] + - dependency-name: "k8s.io/kubelet" + versions: [">=0.33.0"] + - dependency-name: "k8s.io/kubectl" + versions: [">=0.33.0"] - package-ecosystem: "gomod" directory: "/build/tools" schedule: @@ -78,6 +106,20 @@ updates: labels: [ "dependencies", "release/1.5" ] open-pull-requests-limit: 10 target-branch: "release/v1.5" + ignore: + # Constrain Kubernetes dependencies to v1.30-v1.32 compatibility range + - dependency-name: "k8s.io/api" + versions: [">=0.33.0"] + - dependency-name: "k8s.io/apiextensions-apiserver" + versions: [">=0.33.0"] + - dependency-name: "k8s.io/apimachinery" + versions: [">=0.33.0"] + - dependency-name: "k8s.io/client-go" + versions: [">=0.33.0"] + - dependency-name: "k8s.io/kubelet" + versions: [">=0.33.0"] + - dependency-name: "k8s.io/kubectl" + versions: [">=0.33.0"] - package-ecosystem: "gomod" directory: "/azure-ipam" schedule: @@ -89,6 +131,20 @@ updates: labels: [ "dependencies", "azure-ipam", "release/1.5" ] open-pull-requests-limit: 10 target-branch: "release/v1.5" + ignore: + # Constrain Kubernetes dependencies to v1.30-v1.32 compatibility range + - dependency-name: "k8s.io/api" + versions: [">=0.33.0"] + - dependency-name: "k8s.io/apiextensions-apiserver" + versions: [">=0.33.0"] + - dependency-name: "k8s.io/apimachinery" + versions: [">=0.33.0"] + - dependency-name: "k8s.io/client-go" + versions: [">=0.33.0"] + - dependency-name: "k8s.io/kubelet" + versions: [">=0.33.0"] + - dependency-name: "k8s.io/kubectl" + versions: [">=0.33.0"] - package-ecosystem: "gomod" directory: "/" schedule: @@ -100,6 +156,20 @@ updates: labels: [ "dependencies", "release/1.4" ] open-pull-requests-limit: 10 target-branch: "release/v1.4" + ignore: + # Constrain Kubernetes dependencies to v1.30-v1.32 compatibility range + - dependency-name: "k8s.io/api" + versions: [">=0.33.0"] + - dependency-name: "k8s.io/apiextensions-apiserver" + versions: [">=0.33.0"] + - dependency-name: "k8s.io/apimachinery" + versions: [">=0.33.0"] + - dependency-name: "k8s.io/client-go" + versions: [">=0.33.0"] + - dependency-name: "k8s.io/kubelet" + versions: [">=0.33.0"] + - dependency-name: "k8s.io/kubectl" + versions: [">=0.33.0"] - package-ecosystem: "gomod" directory: "/azure-ipam" schedule: @@ -111,3 +181,17 @@ updates: labels: [ "dependencies", "azure-ipam", "release/1.4" ] open-pull-requests-limit: 10 target-branch: "release/v1.4" + ignore: + # Constrain Kubernetes dependencies to v1.30-v1.32 compatibility range + - dependency-name: "k8s.io/api" + versions: [">=0.33.0"] + - dependency-name: "k8s.io/apiextensions-apiserver" + versions: [">=0.33.0"] + - dependency-name: "k8s.io/apimachinery" + versions: [">=0.33.0"] + - dependency-name: "k8s.io/client-go" + versions: [">=0.33.0"] + - dependency-name: "k8s.io/kubelet" + versions: [">=0.33.0"] + - dependency-name: "k8s.io/kubectl" + versions: [">=0.33.0"] From 5c553900666d67ea8f5fa7b40789c3035415b9b1 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 7 Jun 2025 00:50:34 +0000 Subject: [PATCH 3/8] feat: complete Kubernetes version constraints for all go.mod locations Co-authored-by: jpayne3506 <89417863+jpayne3506@users.noreply.github.com> --- .github/dependabot.yaml | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index ff9069cb1c..4c8f9e4bb4 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -79,6 +79,20 @@ updates: prefix: "deps" labels: [ "dependencies" ] open-pull-requests-limit: 10 + ignore: + # Constrain Kubernetes dependencies to v1.30-v1.32 compatibility range + - dependency-name: "k8s.io/api" + versions: [">=0.33.0"] + - dependency-name: "k8s.io/apiextensions-apiserver" + versions: [">=0.33.0"] + - dependency-name: "k8s.io/apimachinery" + versions: [">=0.33.0"] + - dependency-name: "k8s.io/client-go" + versions: [">=0.33.0"] + - dependency-name: "k8s.io/kubelet" + versions: [">=0.33.0"] + - dependency-name: "k8s.io/kubectl" + versions: [">=0.33.0"] - package-ecosystem: "gomod" directory: "/dropgz" schedule: @@ -95,6 +109,28 @@ updates: prefix: "deps" labels: [ "dependencies" ] open-pull-requests-limit: 10 +- package-ecosystem: "gomod" + directory: "/tools/azure-npm-to-cilium-validator" + schedule: + interval: "daily" + commit-message: + prefix: "deps" + labels: [ "dependencies" ] + open-pull-requests-limit: 10 + ignore: + # Constrain Kubernetes dependencies to v1.30-v1.32 compatibility range + - dependency-name: "k8s.io/api" + versions: [">=0.33.0"] + - dependency-name: "k8s.io/apiextensions-apiserver" + versions: [">=0.33.0"] + - dependency-name: "k8s.io/apimachinery" + versions: [">=0.33.0"] + - dependency-name: "k8s.io/client-go" + versions: [">=0.33.0"] + - dependency-name: "k8s.io/kubelet" + versions: [">=0.33.0"] + - dependency-name: "k8s.io/kubectl" + versions: [">=0.33.0"] - package-ecosystem: "gomod" directory: "/" schedule: From 1e09e194d5c8af4b1991aa2e6cfc168af87df76c Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 7 Jun 2025 01:07:02 +0000 Subject: [PATCH 4/8] Update Kubernetes version constraints for release branches Co-authored-by: jpayne3506 <89417863+jpayne3506@users.noreply.github.com> --- .github/dependabot.yaml | 79 +++++++++++++++-------------------------- 1 file changed, 29 insertions(+), 50 deletions(-) diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index 4c8f9e4bb4..37558cd235 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -109,28 +109,7 @@ updates: prefix: "deps" labels: [ "dependencies" ] open-pull-requests-limit: 10 -- package-ecosystem: "gomod" - directory: "/tools/azure-npm-to-cilium-validator" - schedule: - interval: "daily" - commit-message: - prefix: "deps" - labels: [ "dependencies" ] - open-pull-requests-limit: 10 - ignore: - # Constrain Kubernetes dependencies to v1.30-v1.32 compatibility range - - dependency-name: "k8s.io/api" - versions: [">=0.33.0"] - - dependency-name: "k8s.io/apiextensions-apiserver" - versions: [">=0.33.0"] - - dependency-name: "k8s.io/apimachinery" - versions: [">=0.33.0"] - - dependency-name: "k8s.io/client-go" - versions: [">=0.33.0"] - - dependency-name: "k8s.io/kubelet" - versions: [">=0.33.0"] - - dependency-name: "k8s.io/kubectl" - versions: [">=0.33.0"] + - package-ecosystem: "gomod" directory: "/" schedule: @@ -143,19 +122,19 @@ updates: open-pull-requests-limit: 10 target-branch: "release/v1.5" ignore: - # Constrain Kubernetes dependencies to v1.30-v1.32 compatibility range + # Constrain Kubernetes dependencies to v1.28-v1.30 compatibility range - dependency-name: "k8s.io/api" - versions: [">=0.33.0"] + versions: [">=0.31.0"] - dependency-name: "k8s.io/apiextensions-apiserver" - versions: [">=0.33.0"] + versions: [">=0.31.0"] - dependency-name: "k8s.io/apimachinery" - versions: [">=0.33.0"] + versions: [">=0.31.0"] - dependency-name: "k8s.io/client-go" - versions: [">=0.33.0"] + versions: [">=0.31.0"] - dependency-name: "k8s.io/kubelet" - versions: [">=0.33.0"] + versions: [">=0.31.0"] - dependency-name: "k8s.io/kubectl" - versions: [">=0.33.0"] + versions: [">=0.31.0"] - package-ecosystem: "gomod" directory: "/azure-ipam" schedule: @@ -168,19 +147,19 @@ updates: open-pull-requests-limit: 10 target-branch: "release/v1.5" ignore: - # Constrain Kubernetes dependencies to v1.30-v1.32 compatibility range + # Constrain Kubernetes dependencies to v1.28-v1.30 compatibility range - dependency-name: "k8s.io/api" - versions: [">=0.33.0"] + versions: [">=0.31.0"] - dependency-name: "k8s.io/apiextensions-apiserver" - versions: [">=0.33.0"] + versions: [">=0.31.0"] - dependency-name: "k8s.io/apimachinery" - versions: [">=0.33.0"] + versions: [">=0.31.0"] - dependency-name: "k8s.io/client-go" - versions: [">=0.33.0"] + versions: [">=0.31.0"] - dependency-name: "k8s.io/kubelet" - versions: [">=0.33.0"] + versions: [">=0.31.0"] - dependency-name: "k8s.io/kubectl" - versions: [">=0.33.0"] + versions: [">=0.31.0"] - package-ecosystem: "gomod" directory: "/" schedule: @@ -193,19 +172,19 @@ updates: open-pull-requests-limit: 10 target-branch: "release/v1.4" ignore: - # Constrain Kubernetes dependencies to v1.30-v1.32 compatibility range + # Constrain Kubernetes dependencies to v1.25-v1.27 compatibility range - dependency-name: "k8s.io/api" - versions: [">=0.33.0"] + versions: [">=0.28.0"] - dependency-name: "k8s.io/apiextensions-apiserver" - versions: [">=0.33.0"] + versions: [">=0.28.0"] - dependency-name: "k8s.io/apimachinery" - versions: [">=0.33.0"] + versions: [">=0.28.0"] - dependency-name: "k8s.io/client-go" - versions: [">=0.33.0"] + versions: [">=0.28.0"] - dependency-name: "k8s.io/kubelet" - versions: [">=0.33.0"] + versions: [">=0.28.0"] - dependency-name: "k8s.io/kubectl" - versions: [">=0.33.0"] + versions: [">=0.28.0"] - package-ecosystem: "gomod" directory: "/azure-ipam" schedule: @@ -218,16 +197,16 @@ updates: open-pull-requests-limit: 10 target-branch: "release/v1.4" ignore: - # Constrain Kubernetes dependencies to v1.30-v1.32 compatibility range + # Constrain Kubernetes dependencies to v1.25-v1.27 compatibility range - dependency-name: "k8s.io/api" - versions: [">=0.33.0"] + versions: [">=0.28.0"] - dependency-name: "k8s.io/apiextensions-apiserver" - versions: [">=0.33.0"] + versions: [">=0.28.0"] - dependency-name: "k8s.io/apimachinery" - versions: [">=0.33.0"] + versions: [">=0.28.0"] - dependency-name: "k8s.io/client-go" - versions: [">=0.33.0"] + versions: [">=0.28.0"] - dependency-name: "k8s.io/kubelet" - versions: [">=0.33.0"] + versions: [">=0.28.0"] - dependency-name: "k8s.io/kubectl" - versions: [">=0.33.0"] + versions: [">=0.28.0"] From f0aa4aa76db7bf588ae7f14e943ba20a55118aa7 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 9 Jun 2025 16:40:37 +0000 Subject: [PATCH 5/8] =?UTF-8?q?Narrow=20Kubernetes=20version=20constraints?= =?UTF-8?q?=20to=20=C2=B11=20compatibility?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: jpayne3506 <89417863+jpayne3506@users.noreply.github.com> --- .github/dependabot.yaml | 98 ++++++++++++++++++++--------------------- 1 file changed, 49 insertions(+), 49 deletions(-) diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index 37558cd235..0a1e66be2c 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -32,19 +32,19 @@ updates: labels: [ "dependencies" ] open-pull-requests-limit: 10 ignore: - # Constrain Kubernetes dependencies to v1.30-v1.32 compatibility range + # Constrain Kubernetes dependencies to v1.31 ±1 compatibility (v1.30-v1.32) - dependency-name: "k8s.io/api" - versions: [">=0.33.0"] + versions: [">=0.33.0", "<0.30.0"] - dependency-name: "k8s.io/apiextensions-apiserver" - versions: [">=0.33.0"] + versions: [">=0.33.0", "<0.30.0"] - dependency-name: "k8s.io/apimachinery" - versions: [">=0.33.0"] + versions: [">=0.33.0", "<0.30.0"] - dependency-name: "k8s.io/client-go" - versions: [">=0.33.0"] + versions: [">=0.33.0", "<0.30.0"] - dependency-name: "k8s.io/kubelet" - versions: [">=0.33.0"] + versions: [">=0.33.0", "<0.30.0"] - dependency-name: "k8s.io/kubectl" - versions: [">=0.33.0"] + versions: [">=0.33.0", "<0.30.0"] - package-ecosystem: "gomod" directory: "/azure-ipam" schedule: @@ -56,19 +56,19 @@ updates: labels: [ "dependencies", "azure-ipam" ] open-pull-requests-limit: 10 ignore: - # Constrain Kubernetes dependencies to v1.30-v1.32 compatibility range + # Constrain Kubernetes dependencies to v1.31 ±1 compatibility (v1.30-v1.32) - dependency-name: "k8s.io/api" - versions: [">=0.33.0"] + versions: [">=0.33.0", "<0.30.0"] - dependency-name: "k8s.io/apiextensions-apiserver" - versions: [">=0.33.0"] + versions: [">=0.33.0", "<0.30.0"] - dependency-name: "k8s.io/apimachinery" - versions: [">=0.33.0"] + versions: [">=0.33.0", "<0.30.0"] - dependency-name: "k8s.io/client-go" - versions: [">=0.33.0"] + versions: [">=0.33.0", "<0.30.0"] - dependency-name: "k8s.io/kubelet" - versions: [">=0.33.0"] + versions: [">=0.33.0", "<0.30.0"] - dependency-name: "k8s.io/kubectl" - versions: [">=0.33.0"] + versions: [">=0.33.0", "<0.30.0"] - package-ecosystem: "gomod" directory: "/build/tools" schedule: @@ -80,19 +80,19 @@ updates: labels: [ "dependencies" ] open-pull-requests-limit: 10 ignore: - # Constrain Kubernetes dependencies to v1.30-v1.32 compatibility range + # Constrain Kubernetes dependencies to v1.31 ±1 compatibility (v1.30-v1.32) - dependency-name: "k8s.io/api" - versions: [">=0.33.0"] + versions: [">=0.33.0", "<0.30.0"] - dependency-name: "k8s.io/apiextensions-apiserver" - versions: [">=0.33.0"] + versions: [">=0.33.0", "<0.30.0"] - dependency-name: "k8s.io/apimachinery" - versions: [">=0.33.0"] + versions: [">=0.33.0", "<0.30.0"] - dependency-name: "k8s.io/client-go" - versions: [">=0.33.0"] + versions: [">=0.33.0", "<0.30.0"] - dependency-name: "k8s.io/kubelet" - versions: [">=0.33.0"] + versions: [">=0.33.0", "<0.30.0"] - dependency-name: "k8s.io/kubectl" - versions: [">=0.33.0"] + versions: [">=0.33.0", "<0.30.0"] - package-ecosystem: "gomod" directory: "/dropgz" schedule: @@ -122,19 +122,19 @@ updates: open-pull-requests-limit: 10 target-branch: "release/v1.5" ignore: - # Constrain Kubernetes dependencies to v1.28-v1.30 compatibility range + # Constrain Kubernetes dependencies to v1.29 ±1 compatibility (v1.28-v1.30) - dependency-name: "k8s.io/api" - versions: [">=0.31.0"] + versions: [">=0.31.0", "<0.28.0"] - dependency-name: "k8s.io/apiextensions-apiserver" - versions: [">=0.31.0"] + versions: [">=0.31.0", "<0.28.0"] - dependency-name: "k8s.io/apimachinery" - versions: [">=0.31.0"] + versions: [">=0.31.0", "<0.28.0"] - dependency-name: "k8s.io/client-go" - versions: [">=0.31.0"] + versions: [">=0.31.0", "<0.28.0"] - dependency-name: "k8s.io/kubelet" - versions: [">=0.31.0"] + versions: [">=0.31.0", "<0.28.0"] - dependency-name: "k8s.io/kubectl" - versions: [">=0.31.0"] + versions: [">=0.31.0", "<0.28.0"] - package-ecosystem: "gomod" directory: "/azure-ipam" schedule: @@ -147,19 +147,19 @@ updates: open-pull-requests-limit: 10 target-branch: "release/v1.5" ignore: - # Constrain Kubernetes dependencies to v1.28-v1.30 compatibility range + # Constrain Kubernetes dependencies to v1.29 ±1 compatibility (v1.28-v1.30) - dependency-name: "k8s.io/api" - versions: [">=0.31.0"] + versions: [">=0.31.0", "<0.28.0"] - dependency-name: "k8s.io/apiextensions-apiserver" - versions: [">=0.31.0"] + versions: [">=0.31.0", "<0.28.0"] - dependency-name: "k8s.io/apimachinery" - versions: [">=0.31.0"] + versions: [">=0.31.0", "<0.28.0"] - dependency-name: "k8s.io/client-go" - versions: [">=0.31.0"] + versions: [">=0.31.0", "<0.28.0"] - dependency-name: "k8s.io/kubelet" - versions: [">=0.31.0"] + versions: [">=0.31.0", "<0.28.0"] - dependency-name: "k8s.io/kubectl" - versions: [">=0.31.0"] + versions: [">=0.31.0", "<0.28.0"] - package-ecosystem: "gomod" directory: "/" schedule: @@ -172,19 +172,19 @@ updates: open-pull-requests-limit: 10 target-branch: "release/v1.4" ignore: - # Constrain Kubernetes dependencies to v1.25-v1.27 compatibility range + # Constrain Kubernetes dependencies to v1.26 ±1 compatibility (v1.25-v1.27) - dependency-name: "k8s.io/api" - versions: [">=0.28.0"] + versions: [">=0.28.0", "<0.25.0"] - dependency-name: "k8s.io/apiextensions-apiserver" - versions: [">=0.28.0"] + versions: [">=0.28.0", "<0.25.0"] - dependency-name: "k8s.io/apimachinery" - versions: [">=0.28.0"] + versions: [">=0.28.0", "<0.25.0"] - dependency-name: "k8s.io/client-go" - versions: [">=0.28.0"] + versions: [">=0.28.0", "<0.25.0"] - dependency-name: "k8s.io/kubelet" - versions: [">=0.28.0"] + versions: [">=0.28.0", "<0.25.0"] - dependency-name: "k8s.io/kubectl" - versions: [">=0.28.0"] + versions: [">=0.28.0", "<0.25.0"] - package-ecosystem: "gomod" directory: "/azure-ipam" schedule: @@ -197,16 +197,16 @@ updates: open-pull-requests-limit: 10 target-branch: "release/v1.4" ignore: - # Constrain Kubernetes dependencies to v1.25-v1.27 compatibility range + # Constrain Kubernetes dependencies to v1.26 ±1 compatibility (v1.25-v1.27) - dependency-name: "k8s.io/api" - versions: [">=0.28.0"] + versions: [">=0.28.0", "<0.25.0"] - dependency-name: "k8s.io/apiextensions-apiserver" - versions: [">=0.28.0"] + versions: [">=0.28.0", "<0.25.0"] - dependency-name: "k8s.io/apimachinery" - versions: [">=0.28.0"] + versions: [">=0.28.0", "<0.25.0"] - dependency-name: "k8s.io/client-go" - versions: [">=0.28.0"] + versions: [">=0.28.0", "<0.25.0"] - dependency-name: "k8s.io/kubelet" - versions: [">=0.28.0"] + versions: [">=0.28.0", "<0.25.0"] - dependency-name: "k8s.io/kubectl" - versions: [">=0.28.0"] + versions: [">=0.28.0", "<0.25.0"] From 2b46d980d5298dea3b6070421381e97df25c3d44 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 9 Jun 2025 17:06:46 +0000 Subject: [PATCH 6/8] Simplify Kubernetes version constraints to use upper bounds only Co-authored-by: jpayne3506 <89417863+jpayne3506@users.noreply.github.com> --- .github/dependabot.yaml | 98 ++++++++++++++++++++--------------------- 1 file changed, 49 insertions(+), 49 deletions(-) diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index 0a1e66be2c..cd2960540f 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -32,19 +32,19 @@ updates: labels: [ "dependencies" ] open-pull-requests-limit: 10 ignore: - # Constrain Kubernetes dependencies to v1.31 ±1 compatibility (v1.30-v1.32) + # Constrain Kubernetes dependencies to compatibility with main branch - dependency-name: "k8s.io/api" - versions: [">=0.33.0", "<0.30.0"] + versions: [">=0.31.0"] - dependency-name: "k8s.io/apiextensions-apiserver" - versions: [">=0.33.0", "<0.30.0"] + versions: [">=0.31.0"] - dependency-name: "k8s.io/apimachinery" - versions: [">=0.33.0", "<0.30.0"] + versions: [">=0.31.0"] - dependency-name: "k8s.io/client-go" - versions: [">=0.33.0", "<0.30.0"] + versions: [">=0.31.0"] - dependency-name: "k8s.io/kubelet" - versions: [">=0.33.0", "<0.30.0"] + versions: [">=0.31.0"] - dependency-name: "k8s.io/kubectl" - versions: [">=0.33.0", "<0.30.0"] + versions: [">=0.31.0"] - package-ecosystem: "gomod" directory: "/azure-ipam" schedule: @@ -56,19 +56,19 @@ updates: labels: [ "dependencies", "azure-ipam" ] open-pull-requests-limit: 10 ignore: - # Constrain Kubernetes dependencies to v1.31 ±1 compatibility (v1.30-v1.32) + # Constrain Kubernetes dependencies to compatibility with main branch - dependency-name: "k8s.io/api" - versions: [">=0.33.0", "<0.30.0"] + versions: [">=0.31.0"] - dependency-name: "k8s.io/apiextensions-apiserver" - versions: [">=0.33.0", "<0.30.0"] + versions: [">=0.31.0"] - dependency-name: "k8s.io/apimachinery" - versions: [">=0.33.0", "<0.30.0"] + versions: [">=0.31.0"] - dependency-name: "k8s.io/client-go" - versions: [">=0.33.0", "<0.30.0"] + versions: [">=0.31.0"] - dependency-name: "k8s.io/kubelet" - versions: [">=0.33.0", "<0.30.0"] + versions: [">=0.31.0"] - dependency-name: "k8s.io/kubectl" - versions: [">=0.33.0", "<0.30.0"] + versions: [">=0.31.0"] - package-ecosystem: "gomod" directory: "/build/tools" schedule: @@ -80,19 +80,19 @@ updates: labels: [ "dependencies" ] open-pull-requests-limit: 10 ignore: - # Constrain Kubernetes dependencies to v1.31 ±1 compatibility (v1.30-v1.32) + # Constrain Kubernetes dependencies to compatibility with main branch - dependency-name: "k8s.io/api" - versions: [">=0.33.0", "<0.30.0"] + versions: [">=0.31.0"] - dependency-name: "k8s.io/apiextensions-apiserver" - versions: [">=0.33.0", "<0.30.0"] + versions: [">=0.31.0"] - dependency-name: "k8s.io/apimachinery" - versions: [">=0.33.0", "<0.30.0"] + versions: [">=0.31.0"] - dependency-name: "k8s.io/client-go" - versions: [">=0.33.0", "<0.30.0"] + versions: [">=0.31.0"] - dependency-name: "k8s.io/kubelet" - versions: [">=0.33.0", "<0.30.0"] + versions: [">=0.31.0"] - dependency-name: "k8s.io/kubectl" - versions: [">=0.33.0", "<0.30.0"] + versions: [">=0.31.0"] - package-ecosystem: "gomod" directory: "/dropgz" schedule: @@ -122,19 +122,19 @@ updates: open-pull-requests-limit: 10 target-branch: "release/v1.5" ignore: - # Constrain Kubernetes dependencies to v1.29 ±1 compatibility (v1.28-v1.30) + # Constrain Kubernetes dependencies to compatibility with release/v1.5 branch - dependency-name: "k8s.io/api" - versions: [">=0.31.0", "<0.28.0"] + versions: [">=0.29.0"] - dependency-name: "k8s.io/apiextensions-apiserver" - versions: [">=0.31.0", "<0.28.0"] + versions: [">=0.29.0"] - dependency-name: "k8s.io/apimachinery" - versions: [">=0.31.0", "<0.28.0"] + versions: [">=0.29.0"] - dependency-name: "k8s.io/client-go" - versions: [">=0.31.0", "<0.28.0"] + versions: [">=0.29.0"] - dependency-name: "k8s.io/kubelet" - versions: [">=0.31.0", "<0.28.0"] + versions: [">=0.29.0"] - dependency-name: "k8s.io/kubectl" - versions: [">=0.31.0", "<0.28.0"] + versions: [">=0.29.0"] - package-ecosystem: "gomod" directory: "/azure-ipam" schedule: @@ -147,19 +147,19 @@ updates: open-pull-requests-limit: 10 target-branch: "release/v1.5" ignore: - # Constrain Kubernetes dependencies to v1.29 ±1 compatibility (v1.28-v1.30) + # Constrain Kubernetes dependencies to compatibility with release/v1.5 branch - dependency-name: "k8s.io/api" - versions: [">=0.31.0", "<0.28.0"] + versions: [">=0.29.0"] - dependency-name: "k8s.io/apiextensions-apiserver" - versions: [">=0.31.0", "<0.28.0"] + versions: [">=0.29.0"] - dependency-name: "k8s.io/apimachinery" - versions: [">=0.31.0", "<0.28.0"] + versions: [">=0.29.0"] - dependency-name: "k8s.io/client-go" - versions: [">=0.31.0", "<0.28.0"] + versions: [">=0.29.0"] - dependency-name: "k8s.io/kubelet" - versions: [">=0.31.0", "<0.28.0"] + versions: [">=0.29.0"] - dependency-name: "k8s.io/kubectl" - versions: [">=0.31.0", "<0.28.0"] + versions: [">=0.29.0"] - package-ecosystem: "gomod" directory: "/" schedule: @@ -172,19 +172,19 @@ updates: open-pull-requests-limit: 10 target-branch: "release/v1.4" ignore: - # Constrain Kubernetes dependencies to v1.26 ±1 compatibility (v1.25-v1.27) + # Constrain Kubernetes dependencies to compatibility with release/v1.4 branch - dependency-name: "k8s.io/api" - versions: [">=0.28.0", "<0.25.0"] + versions: [">=0.26.0"] - dependency-name: "k8s.io/apiextensions-apiserver" - versions: [">=0.28.0", "<0.25.0"] + versions: [">=0.26.0"] - dependency-name: "k8s.io/apimachinery" - versions: [">=0.28.0", "<0.25.0"] + versions: [">=0.26.0"] - dependency-name: "k8s.io/client-go" - versions: [">=0.28.0", "<0.25.0"] + versions: [">=0.26.0"] - dependency-name: "k8s.io/kubelet" - versions: [">=0.28.0", "<0.25.0"] + versions: [">=0.26.0"] - dependency-name: "k8s.io/kubectl" - versions: [">=0.28.0", "<0.25.0"] + versions: [">=0.26.0"] - package-ecosystem: "gomod" directory: "/azure-ipam" schedule: @@ -197,16 +197,16 @@ updates: open-pull-requests-limit: 10 target-branch: "release/v1.4" ignore: - # Constrain Kubernetes dependencies to v1.26 ±1 compatibility (v1.25-v1.27) + # Constrain Kubernetes dependencies to compatibility with release/v1.4 branch - dependency-name: "k8s.io/api" - versions: [">=0.28.0", "<0.25.0"] + versions: [">=0.26.0"] - dependency-name: "k8s.io/apiextensions-apiserver" - versions: [">=0.28.0", "<0.25.0"] + versions: [">=0.26.0"] - dependency-name: "k8s.io/apimachinery" - versions: [">=0.28.0", "<0.25.0"] + versions: [">=0.26.0"] - dependency-name: "k8s.io/client-go" - versions: [">=0.28.0", "<0.25.0"] + versions: [">=0.26.0"] - dependency-name: "k8s.io/kubelet" - versions: [">=0.28.0", "<0.25.0"] + versions: [">=0.26.0"] - dependency-name: "k8s.io/kubectl" - versions: [">=0.28.0", "<0.25.0"] + versions: [">=0.26.0"] From cf0998511108c8ce121479d2237c53ef163e3afb Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 9 Jun 2025 20:30:31 +0000 Subject: [PATCH 7/8] Clean up extra newline in dependabot.yaml at line 112 Co-authored-by: jpayne3506 <89417863+jpayne3506@users.noreply.github.com> --- .github/dependabot.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index cd2960540f..4b55fdcaaa 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -109,7 +109,6 @@ updates: prefix: "deps" labels: [ "dependencies" ] open-pull-requests-limit: 10 - - package-ecosystem: "gomod" directory: "/" schedule: From 2b86b590c302f40f05d7c5c492b53ec63e2935c9 Mon Sep 17 00:00:00 2001 From: jpayne3506 Date: Wed, 25 Jun 2025 12:50:53 -0700 Subject: [PATCH 8/8] ci: add release/v1.6 coverage --- .github/dependabot.yaml | 102 ++++++++++++++++++++++++++++++---------- 1 file changed, 77 insertions(+), 25 deletions(-) diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index 4b55fdcaaa..3e5665f302 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -21,6 +21,9 @@ updates: 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: @@ -32,19 +35,18 @@ updates: labels: [ "dependencies" ] open-pull-requests-limit: 10 ignore: - # Constrain Kubernetes dependencies to compatibility with main branch - dependency-name: "k8s.io/api" - versions: [">=0.31.0"] + versions: [">=0.34.0"] - dependency-name: "k8s.io/apiextensions-apiserver" - versions: [">=0.31.0"] + versions: [">=0.34.0"] - dependency-name: "k8s.io/apimachinery" - versions: [">=0.31.0"] + versions: [">=0.34.0"] - dependency-name: "k8s.io/client-go" - versions: [">=0.31.0"] + versions: [">=0.34.0"] - dependency-name: "k8s.io/kubelet" - versions: [">=0.31.0"] + versions: [">=0.34.0"] - dependency-name: "k8s.io/kubectl" - versions: [">=0.31.0"] + versions: [">=0.34.0"] - package-ecosystem: "gomod" directory: "/azure-ipam" schedule: @@ -56,19 +58,18 @@ updates: labels: [ "dependencies", "azure-ipam" ] open-pull-requests-limit: 10 ignore: - # Constrain Kubernetes dependencies to compatibility with main branch - dependency-name: "k8s.io/api" - versions: [">=0.31.0"] + versions: [">=0.34.0"] - dependency-name: "k8s.io/apiextensions-apiserver" - versions: [">=0.31.0"] + versions: [">=0.34.0"] - dependency-name: "k8s.io/apimachinery" - versions: [">=0.31.0"] + versions: [">=0.34.0"] - dependency-name: "k8s.io/client-go" - versions: [">=0.31.0"] + versions: [">=0.34.0"] - dependency-name: "k8s.io/kubelet" - versions: [">=0.31.0"] + versions: [">=0.34.0"] - dependency-name: "k8s.io/kubectl" - versions: [">=0.31.0"] + versions: [">=0.34.0"] - package-ecosystem: "gomod" directory: "/build/tools" schedule: @@ -80,19 +81,18 @@ updates: labels: [ "dependencies" ] open-pull-requests-limit: 10 ignore: - # Constrain Kubernetes dependencies to compatibility with main branch - dependency-name: "k8s.io/api" - versions: [">=0.31.0"] + versions: [">=0.34.0"] - dependency-name: "k8s.io/apiextensions-apiserver" - versions: [">=0.31.0"] + versions: [">=0.34.0"] - dependency-name: "k8s.io/apimachinery" - versions: [">=0.31.0"] + versions: [">=0.34.0"] - dependency-name: "k8s.io/client-go" - versions: [">=0.31.0"] + versions: [">=0.34.0"] - dependency-name: "k8s.io/kubelet" - versions: [">=0.31.0"] + versions: [">=0.34.0"] - dependency-name: "k8s.io/kubectl" - versions: [">=0.31.0"] + versions: [">=0.34.0"] - package-ecosystem: "gomod" directory: "/dropgz" schedule: @@ -109,6 +109,59 @@ updates: 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: "daily" + reviewers: + - "azure/azure-sdn-members" + commit-message: + prefix: "deps" + labels: [ "dependencies" ] + open-pull-requests-limit: 10 + target-branch: "release/v1.6" + ignore: + - dependency-name: "k8s.io/api" + versions: [">=0.31.0"] + - dependency-name: "k8s.io/apiextensions-apiserver" + versions: [">=0.31.0"] + - dependency-name: "k8s.io/apimachinery" + versions: [">=0.31.0"] + - dependency-name: "k8s.io/client-go" + versions: [">=0.31.0"] + - dependency-name: "k8s.io/kubelet" + versions: [">=0.31.0"] + - dependency-name: "k8s.io/kubectl" + versions: [">=0.31.0"] +- package-ecosystem: "gomod" + directory: "/azure-ipam" + schedule: + interval: "daily" + reviewers: + - "azure/azure-sdn-members" + commit-message: + prefix: "deps" + labels: [ "dependencies", "azure-ipam" ] + open-pull-requests-limit: 10 + ignore: + - dependency-name: "k8s.io/api" + versions: [">=0.31.0"] + - dependency-name: "k8s.io/apiextensions-apiserver" + versions: [">=0.31.0"] + - dependency-name: "k8s.io/apimachinery" + versions: [">=0.31.0"] + - dependency-name: "k8s.io/client-go" + versions: [">=0.31.0"] + - dependency-name: "k8s.io/kubelet" + versions: [">=0.31.0"] + - dependency-name: "k8s.io/kubectl" + versions: [">=0.31.0"] + + +# Constrain Kubernetes dependencies to compatibility with release/v1.5 branch - v1.28-v1.30 - package-ecosystem: "gomod" directory: "/" schedule: @@ -121,7 +174,6 @@ updates: open-pull-requests-limit: 10 target-branch: "release/v1.5" ignore: - # Constrain Kubernetes dependencies to compatibility with release/v1.5 branch - dependency-name: "k8s.io/api" versions: [">=0.29.0"] - dependency-name: "k8s.io/apiextensions-apiserver" @@ -146,7 +198,6 @@ updates: open-pull-requests-limit: 10 target-branch: "release/v1.5" ignore: - # Constrain Kubernetes dependencies to compatibility with release/v1.5 branch - dependency-name: "k8s.io/api" versions: [">=0.29.0"] - dependency-name: "k8s.io/apiextensions-apiserver" @@ -159,6 +210,9 @@ updates: versions: [">=0.29.0"] - dependency-name: "k8s.io/kubectl" versions: [">=0.29.0"] + + +# Constrain Kubernetes dependencies to compatibility with release/v1.4 branch - v1.25-v1.27 - package-ecosystem: "gomod" directory: "/" schedule: @@ -171,7 +225,6 @@ updates: open-pull-requests-limit: 10 target-branch: "release/v1.4" ignore: - # Constrain Kubernetes dependencies to compatibility with release/v1.4 branch - dependency-name: "k8s.io/api" versions: [">=0.26.0"] - dependency-name: "k8s.io/apiextensions-apiserver" @@ -196,7 +249,6 @@ updates: open-pull-requests-limit: 10 target-branch: "release/v1.4" ignore: - # Constrain Kubernetes dependencies to compatibility with release/v1.4 branch - dependency-name: "k8s.io/api" versions: [">=0.26.0"] - dependency-name: "k8s.io/apiextensions-apiserver"