Skip to content

Misc changes in renovate configuration#44389

Merged
aanm merged 2 commits intomainfrom
pr/fix-renovate-config
Feb 17, 2026
Merged

Misc changes in renovate configuration#44389
aanm merged 2 commits intomainfrom
pr/fix-renovate-config

Conversation

@aanm
Copy link
Copy Markdown
Member

@aanm aanm commented Feb 16, 2026

No description provided.

aanm added 2 commits February 16, 2026 14:14
The intent was always to update the k8s libraries patch versions into
the stable branches but due to a misconfiguration in renovate config
that never happened.

Signed-off-by: André Martins <andre@cilium.io>
This tag does not contain a package that exist in a later commit, thus
we should skip it until it gets fixed.

Signed-off-by: André Martins <andre@cilium.io>
@aanm aanm requested a review from a team as a code owner February 16, 2026 13:26
@aanm aanm added the release-note/misc This PR makes changes that have no direct user impact. label Feb 16, 2026
@aanm aanm requested a review from a team as a code owner February 16, 2026 13:26
@aanm aanm enabled auto-merge February 16, 2026 13:26
@aanm
Copy link
Copy Markdown
Member Author

aanm commented Feb 16, 2026

/test

@aanm aanm added this pull request to the merge queue Feb 17, 2026
@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Feb 17, 2026
Merged via the queue into main with commit 146a429 Feb 17, 2026
86 checks passed
@aanm aanm deleted the pr/fix-renovate-config branch February 17, 2026 09:52
HadrienPatte added a commit that referenced this pull request Feb 22, 2026
PR #44389 introduced the `"matchBaseBranches": ["main"]` constraint to the `"disable major/minor k8s updates"` rule. The intent was to scope that rule to main since stable branches would have their own logic, but the new `"k8s.io patch updates stable"` rule only covers patch/digest — it never disables major/minor on stable. So major/minor k8s update fell through with nothing blocking them on v1.17/v1.18/v1.19.

That's how we got #44481 attempting to bump those from `v0.32.0` to `v0.35.1` on 1.17 and #44476 from `v0.33.3` to `v0.35.1` on 1.18.

This PR removes the `matchBaseBranches: ["main"]` from the disable rule so it applies t all branches. The `"k8s.io patch updates stable"` rule (which explicitly enables patch+digest on stable) will still take precedence for those update types, giving the correct behavior:
* All branches: major/minor k8s updates disabled                                        * Stable branches only: patch/digest k8s updates enabled

Signed-off-by: Hadrien Patte <hadrien.patte@datadoghq.com>
HadrienPatte added a commit that referenced this pull request Feb 22, 2026
PR #44389 introduced the `"matchBaseBranches": ["main"]` constraint to the `"disable major/minor k8s updates"` rule. The intent was to scope that rule to main since stable branches would have their own logic, but the new `"k8s.io patch updates stable"` rule only covers patch/digest — it never disables major/minor on stable. So major/minor k8s update fell through with nothing blocking them on v1.17/v1.18/v1.19.

That's how we got #44481 attempting to bump those from `v0.32.0` to `v0.35.1` on 1.17 and #44476 from `v0.33.3` to `v0.35.1` on 1.18.

This PR removes the `matchBaseBranches: ["main"]` from the disable rule so it applies t all branches. The `"k8s.io patch updates stable"` rule (which explicitly enables patch+digest on stable) will still take precedence for those update types, giving the correct behavior:
* All branches: major/minor k8s updates disabled                                        * Stable branches only: patch/digest k8s updates enabled

Signed-off-by: Hadrien Patte <hadrien.patte@datadoghq.com>
HadrienPatte added a commit that referenced this pull request Feb 22, 2026
PR #44389 introduced the `"matchBaseBranches": ["main"]` constraint to the `"disable major/minor k8s updates"` rule. The intent was to scope that rule to main since stable branches would have their own logic, but the new `"k8s.io patch updates stable"` rule only covers patch/digest — it never disables major/minor on stable. So major/minor k8s update fell through with nothing blocking them on v1.17/v1.18/v1.19.

That's how we got #44481 attempting to bump those from `v0.32.0` to `v0.35.1` on 1.17 and #44476 from `v0.33.3` to `v0.35.1` on 1.18.

This PR removes the `matchBaseBranches: ["main"]` from the disable rule so it applies t all branches. The `"k8s.io patch updates stable"` rule (which explicitly enables patch+digest on stable) will still take precedence for those update types, giving the correct behavior:
* All branches: major/minor k8s updates disabled
* Stable branches only: patch/digest k8s updates enabled

Signed-off-by: Hadrien Patte <hadrien.patte@datadoghq.com>
github-merge-queue bot pushed a commit that referenced this pull request Feb 23, 2026
PR #44389 introduced the `"matchBaseBranches": ["main"]` constraint to the `"disable major/minor k8s updates"` rule. The intent was to scope that rule to main since stable branches would have their own logic, but the new `"k8s.io patch updates stable"` rule only covers patch/digest — it never disables major/minor on stable. So major/minor k8s update fell through with nothing blocking them on v1.17/v1.18/v1.19.

That's how we got #44481 attempting to bump those from `v0.32.0` to `v0.35.1` on 1.17 and #44476 from `v0.33.3` to `v0.35.1` on 1.18.

This PR removes the `matchBaseBranches: ["main"]` from the disable rule so it applies t all branches. The `"k8s.io patch updates stable"` rule (which explicitly enables patch+digest on stable) will still take precedence for those update types, giving the correct behavior:
* All branches: major/minor k8s updates disabled
* Stable branches only: patch/digest k8s updates enabled

Signed-off-by: Hadrien Patte <hadrien.patte@datadoghq.com>
fzu-huang pushed a commit to fzu-huang/cilium that referenced this pull request Feb 25, 2026
PR cilium#44389 introduced the `"matchBaseBranches": ["main"]` constraint to the `"disable major/minor k8s updates"` rule. The intent was to scope that rule to main since stable branches would have their own logic, but the new `"k8s.io patch updates stable"` rule only covers patch/digest — it never disables major/minor on stable. So major/minor k8s update fell through with nothing blocking them on v1.17/v1.18/v1.19.

That's how we got cilium#44481 attempting to bump those from `v0.32.0` to `v0.35.1` on 1.17 and cilium#44476 from `v0.33.3` to `v0.35.1` on 1.18.

This PR removes the `matchBaseBranches: ["main"]` from the disable rule so it applies t all branches. The `"k8s.io patch updates stable"` rule (which explicitly enables patch+digest on stable) will still take precedence for those update types, giving the correct behavior:
* All branches: major/minor k8s updates disabled
* Stable branches only: patch/digest k8s updates enabled

Signed-off-by: Hadrien Patte <hadrien.patte@datadoghq.com>
javiercardona-work pushed a commit to javiercardona-work/cilium that referenced this pull request Mar 18, 2026
PR cilium#44389 introduced the `"matchBaseBranches": ["main"]` constraint to the `"disable major/minor k8s updates"` rule. The intent was to scope that rule to main since stable branches would have their own logic, but the new `"k8s.io patch updates stable"` rule only covers patch/digest — it never disables major/minor on stable. So major/minor k8s update fell through with nothing blocking them on v1.17/v1.18/v1.19.

That's how we got cilium#44481 attempting to bump those from `v0.32.0` to `v0.35.1` on 1.17 and cilium#44476 from `v0.33.3` to `v0.35.1` on 1.18.

This PR removes the `matchBaseBranches: ["main"]` from the disable rule so it applies t all branches. The `"k8s.io patch updates stable"` rule (which explicitly enables patch+digest on stable) will still take precedence for those update types, giving the correct behavior:
* All branches: major/minor k8s updates disabled
* Stable branches only: patch/digest k8s updates enabled

Signed-off-by: Hadrien Patte <hadrien.patte@datadoghq.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/misc This PR makes changes that have no direct user impact.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants