v1.12 Backports 2023-07-24 #27031
Merged
v1.12 Backports 2023-07-24 #27031
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
nbusseneau
added
kind/backports
|
@michi-covalent @pchaigno Please see backporter's notes for each commit, conflicts arised due to file renames. |
|
/test-backport-1.12 |
pchaigno
approved these changes
Jul 24, 2023
The backport only targets docs and tests themselves, and the unquarantined test passed, the 2 failures above cannot be introduced by this PR. Marking |
nbusseneau
added
the
ready-to-merge
youngnick
approved these changes
Jul 26, 2023
|
Looks like there are some conflicts @nbusseneau. |
margamanterola
removed
the
ready-to-merge
[ upstream commit a58cb6a ] [ Backporter's notes: minor conflict in `test/k8s/manifests/log-gatherer.yaml` due to the fact we didn't use quay.io yet on v1.12. ] The 'Skip conntrack for pod traffic' test currently downloads the conntrack package at runtime to be able to flush and list Linux's conntrack entries. This sometimes fail because of connectivity issues to the package repositories. Instead, we've now included the conntrack package in the log-gatherer image. We can use those pods to run conntrack commands instead of using the Cilium agent pods. Fixes: 496ce42 ("iptables: add support for NOTRACK rules for pod-to-pod traffic") Signed-off-by: Paul Chaignon <paul@cilium.io> Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com>
[ upstream commit 67a3ab3 ] If we check res.WasSuccessful() instead of res, then ginkgo won't print the error message in case the command wasn't successful. Signed-off-by: Paul Chaignon <paul@cilium.io> Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com>
[ upstream commit 3ba76e5 ] [ Backporter's notes: the changes had to be manually backported to the appropriate files for v1.12, as the docs were restructured in fbc53d0 and 69d07f7 since then. ] Recent bugs with IPsec have highlighted a need to document several caveats of IPsec operations. This commit documents those caveats as well as common XFRM errors. Signed-off-by: Paul Chaignon <paul.chaignon@gmail.com> Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com>
[ upstream commit 0297c6c ] Azure does not allow having multiple clusters with the same name in the same subscription even if they are hosted on different locations. In order to avoid name conflicts, we previously added the location name to the cluster name, however in some cases this leads to cluster names exceeding the maximum length. As a quick fix, we replace the location name with a simple index. Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com> Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com>
[ upstream commit 12fc68a ] [ Backporter's notes: the changes had to be manually backported to the appropriate files for v1.12, as the docs were restructured in fbc53d0 and 69d07f7 since then. ] - For the main branch latest docs, clone the Cilium GitHub repo and use "--chart-directory ./install/kubernetes/cilium" flag. - For stable branches, set "--version" flag to the version in the top-level VERSION file. Fixes: #26931 Signed-off-by: Michi Mutsuzaki <michi@isovalent.com> Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com>
[ upstream commit c9983ef ] [ Backporter's notes: the changes had to be manually backported to the appropriate files for v1.12, as the docs were restructured in fbc53d0 and 69d07f7 since then. ] All IPsec traffic between two nodes is always send on a single IPsec flow (defined by outer source and destination IP addresses). As a consequence, RSS on such traffic is ineffective and throughput will be limited to the decryption performance of a single core. Reported-by: Ryan Drew <ryan.drew@isovalent.com> Signed-off-by: Paul Chaignon <paul.chaignon@gmail.com> Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com>
nbusseneau
force-pushed
the
pr/v1.12-backport-2023-07-24
branch
from
63f0062
to
aa103ae
Compare
|
Indeed, #27059 got merged first so I lost the race here (unlike on v1.13, where I won and now Quentin has to deal with it, hehe). It's only very a minor Documentation conflict though (spelling wordlist...), so no need to re-run the full CI for this. Documentation checks have passed, marking |
nbusseneau
added
the
ready-to-merge
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.
Skip conntracktest #25038 (@pchaigno)PRs skipped due to conflicts:
Once this PR is merged, you can update the PR labels via:
or with