[ upstream commit 26360b4 ]

Signed-off-by: Aritra Dey <adey01027@gmail.com>
Signed-off-by: Marco Hofstetter <marco.hofstetter@isovalent.com>

[ upstream commit bfbf498 ]

Fixes: 151d302 ("datapath/tunnel: New flag --underlay-protocol={ipv4,ipv6}")
Signed-off-by: André Martins <andre@cilium.io>
Signed-off-by: Marco Hofstetter <marco.hofstetter@isovalent.com>

[ 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>

[ upstream commit b76f928 ]

Signed-off-by: SeungJu Cheon <suunj1331@gmail.com>
Signed-off-by: Marco Hofstetter <marco.hofstetter@isovalent.com>