Merged
Conversation
[ upstream commit 1a1a57e ] Our current drivers are matched on everything inside install/kubernetes. When you do `git merge ...`, git will check the return value of any matching drivers. In the case of the install/k8s dir we have the kubernetes-update driver. However, because this presumably completes and returns 0, this also papers over any legitimate conflicts. For example, if there is a conflict in cilium/values.yaml that requires regenerating, but also a legitimate conflict in another (non-generated) file then this will silently run the kubernetes-update driver commands and silently skip incoming changes for other files. This commit tries to make that matching more specific, by matching only on files we know get overwritten by code generation we avoid wrongly auto-merging other changes. Signed-off-by: Tom Hadlaw <tom.hadlaw@isovalent.com> Signed-off-by: Marco Hofstetter <marco.hofstetter@isovalent.com>
[ upstream commit 0a67a9d ] go.mod is not generated, therefore the go mod resolution driver won't correctly fix merge conflicts. This removes that line and leaves the auto merge driver to just match the go.sum/vendor files. Signed-off-by: Tom Hadlaw <tom.hadlaw@isovalent.com> Signed-off-by: Marco Hofstetter <marco.hofstetter@isovalent.com>
[ upstream commit 53f4474 ] Similar to previous commits we avoid bad auto merges as well as reducing redundant code generation runs by matching individual api types with specific merge drivers that only run make generate-x-api commands relevant to the directory. Previously we would always run make-generate-apis multiple times which alongside performing incorrect auto-merges also takes a long time to complete. Signed-off-by: Tom Hadlaw <tom.hadlaw@isovalent.com> Signed-off-by: Marco Hofstetter <marco.hofstetter@isovalent.com>
[ upstream commit 4e7ec78 ] When running cilium on kernels that were not compiled with `CONFIG_BPF_EVENTS=y`, no events are passed from BPF back to userspace, making hubble show no L3/L4 events, without error. Resolves #37480 Signed-off-by: Emily Shepherd <emily@redcoat.dev> Signed-off-by: Marco Hofstetter <marco.hofstetter@isovalent.com>
Member
Author
|
/test |
Contributor
|
#44042 patch set is appropriate for v1.17 👍 |
tommyp1ckles
approved these changes
Jan 29, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
PRs skipped due to conflicts:
Once this PR is merged, a GitHub action will update the labels of these PRs: