v1.15 Backports 2024-02-13 #30727
Merged
v1.15 Backports 2024-02-13 #30727
Conversation
This file contains 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
[ upstream commit f8c68e4 ] Commit 07595da added module ID to the start/stop hook output by carrying the module ID in the hook. Unfortunately I forgot to fix the getHooKFuncName to actually handle this wrapped handle which caused the log output to always show "augmentedHook.Start" as the function name. Fix this by looking through the wrapper. Fixes: 07595da ("hive: Add module ID to hive start/stop hook output") Signed-off-by: Jussi Maki <jussi@isovalent.com> Signed-off-by: Tam Mach <tam.mach@cilium.io>
[ upstream commit 60ea87e ] Signed-off-by: Dmitry Kharitonov <dmitry@isovalent.com> Signed-off-by: Tam Mach <tam.mach@cilium.io>
sayboras
added
kind/backports
|
/test-backport-1.15 |
michi-covalent
approved these changes
Feb 13, 2024
michi-covalent
added
the
dont-merge/waiting-for-upstream
|
let's wait for #30691 to get merged to main branch before shipping this one. |
sayboras
removed
the
dont-merge/waiting-for-upstream
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Once this PR is merged, a GitHub action will update the labels of these PRs: