v1.13 Backports 2023-08-23 #27651
Merged
v1.13 Backports 2023-08-23 #27651
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 e25bd05 ] PR #24649 removed the deprecated support for adding fallback HTTP log tags if the access log entry wasn't of type HTTP, Kafka or GenericL7. This removal leads to panics when the l7Tags function (`nil`) is called while trying to enrich the log entry. Therefore, this commit changes the behaviour by defaulting to an noop l7Tags function if no specific L7 information are present. Fixes: #27442 Signed-off-by: Marco Hofstetter <marco.hofstetter@isovalent.com> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
[ upstream commit b7947bc ] Signed-off-by: ishuar <ishansharma887@gmail.com> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
[ upstream commit 0cd6932 ] Signed-off-by: chentanjun <tanjunchen20@gmail.com> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
[ upstream commit 4cb2a4b ] AKS supported k8s versions changed. This commit updates tested k8s versions for AKS Signed-off-by: Birol Bilgin <birol@cilium.io> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
[ upstream commit 270be30 ] We've been using a custom spelling filter to make sure that "WireGuard" is spelled correctly, with the proper case. As it turns out, passing this filter to the Sphinx configuration, in the conf.py file, makes Sphinx re-read all sources and re-write all output files, as can be observed when running sphinx-build multiple times, without suppressing the output: $ sphinx-build -M html . _build [...] updating environment: [config changed ('spelling_filters')] 472 added, 30 changed, 0 removed [...] This is because in conf.py, we pass the filter directly as a function. When Sphinx writes its environment.pickle file to keep track of the configuration in use, it discards values that cannot be serialised, including the filter, "<class 'cilium_spellfilters.WireGuardFilter'>", of instance "type" [0]. So the value for the configuration option "spelling_filters" is not saved, and as Sphinx believes that the configuration has changed, it reads and rebuilds everything. In fact, the issue has been reported before, and solved in the spellchecker [1]. We need to set the configuration with a string instead of the direct function object, and the extension is able to load it from there. Let's adjust accordingly, to save cycles when building the docs more than once. [0] https://github.com/sphinx-doc/sphinx/blob/v7.1.2/sphinx/config.py#L323 [1] sphinx-contrib/spelling#40 Signed-off-by: Quentin Monnet <quentin@isovalent.com> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
[ upstream commit 164332f ] v0.1.9 is the first release of certgen 1.5 years. As a patch release, it doesn't contain any major changes but only updates to its dependencies and the Go version that it's built with. See release notes for details: https://github.com/cilium/certgen/releases/tag/v0.1.9 Signed-off-by: Robin Hahling <robin.hahling@gw-computing.net> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
[ upstream commit c0a5fbe ] After 0696874 refactored the logic to read annotations and change the default behavior, addrs array was never assigned to newNode.IPAddresses after it was populated. Signed-off-by: Hemanth Malla <hemanth.malla@datadoghq.com> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
tklauser
added
kind/backports
tklauser
requested review from
doniacld,
qmonnet,
rolinh,
hemanthmalla,
mhofstetter and
brlbil
|
/test-backport-1.13 |
mhofstetter
approved these changes
Aug 23, 2023
rolinh
approved these changes
Aug 23, 2023
brlbil
approved these changes
Aug 23, 2023
hemanthmalla
approved these changes
Aug 23, 2023
hemanthmalla
approved these changes
Aug 24, 2023
joestringer
approved these changes
Aug 25, 2023
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, you can update the PR labels via:
or with