Skip to content

v1.16 Backports 2025-07-01 #40292

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Jul 2, 2025
Merged

v1.16 Backports 2025-07-01 #40292

merged 1 commit into from
Jul 2, 2025

Conversation

tklauser
Copy link
Member

@tklauser tklauser commented Jul 1, 2025

Once this PR is merged, a GitHub action will update the labels of these PRs:

 40189

@aanm @tklauser
contrib/git: add merge drivers to automate post-merge commands
a59e9bc 
[ upstream commit a1fe9e3 ]

Add merge driver configuration that automatically runs specific commands when
certain files are merged. This automation helps maintain consistency by running
essential tasks like `go mod tidy`, updating Kubernetes manifests, regenerating
documentation, and fixing permissions after merge operations.

Signed-off-by: André Martins <andre@cilium.io>
Signed-off-by: Tobias Klauser <tobias@cilium.io>
@tklauser tklauser added kind/backports This PR provides functionality previously merged into master. backport/1.16 This PR represents a backport for Cilium 1.16.x of a PR that was merged to main. labels Jul 1, 2025
@tklauser tklauser requested a review from aanm July 1, 2025 09:00
@tklauser tklauser marked this pull request as ready for review July 1, 2025 09:00
@tklauser tklauser requested a review from a team as a code owner July 1, 2025 09:00
@tklauser
Copy link
Member Author

tklauser commented Jul 1, 2025

/test

@tklauser tklauser enabled auto-merge July 1, 2025 09:00
@tklauser
Copy link
Member Author

tklauser commented Jul 2, 2025

/test

@tklauser tklauser added this pull request to the merge queue Jul 2, 2025
Merged via the queue into v1.16 with commit f1137ec Jul 2, 2025
393 of 453 checks passed
@tklauser tklauser deleted the pr/v1.16-backport-2025-07-01-10-58 branch July 2, 2025 11:05
@maintainer-s-little-helper maintainer-s-little-helper bot added ready-to-merge This PR has passed all tests and received consensus from code owners to merge. labels Jul 2, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aanm aanm aanm approved these changes

Assignees
No one assigned
Labels
backport/1.16 This PR represents a backport for Cilium 1.16.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master. ready-to-merge This PR has passed all tests and received consensus from code owners to merge.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@tklauser @aanm