v1.11 backports 2022-01-03 #18364
Merged
v1.11 backports 2022-01-03 #18364
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 5a5755a ] In a version vX.Y.Z, X is called the major version, Y the minor version, and Z the patch version with this commit. Before this commit, Z was the micro version, but that's a bit confusing given we already have 'minor'. The patch terminology also matches semantics documented at semver.org. Signed-off-by: Paul Chaignon <paul@cilium.io> Signed-off-by: Chris Tarazi <chris@isovalent.com>
[ upstream commit ddb5482 ] Move the fork of controller-tools from my personal fork to be officially part of the Cilium repo. Along the way, add the commit from christarazi/controller-tools#1 to the v0.6.2 branch. Signed-off-by: Chris Tarazi <chris@isovalent.com> Signed-off-by: Chris Tarazi <chris@isovalent.com>
[ upstream commit 6ee7914 ] The annotations here should use the proper name for each CRD. Doing so will make them shown up correctly in ArtifactHub, and will also simplify automatic linting for when they are missing. Signed-off-by: Joe Stringer <joe@cilium.io> Signed-off-by: Chris Tarazi <chris@isovalent.com>
[ upstream commit 6bee10d ] These charts are intended to have annotations describing each CRD installed by Cilium. Add EgressNATPolicy, which was previously missing. Signed-off-by: Joe Stringer <joe@cilium.io> Signed-off-by: Chris Tarazi <chris@isovalent.com>
[ upstream commit 7349018 ] These charts are intended to have annotations describing each CRD installed by Cilium. Add CiliumEndpointSlices, which was previously missing. Signed-off-by: Joe Stringer <joe@cilium.io> Signed-off-by: Chris Tarazi <chris@isovalent.com>
[ upstream commit 99c034f ] The Chart.yaml should have an annotation for each of the CRDs that Cilium may install. Add a simple lint check to ensure this at build time. Signed-off-by: Joe Stringer <joe@cilium.io> Signed-off-by: Chris Tarazi <chris@isovalent.com>
[ upstream commit 227424a ] The 0ffa7c6 commit didn't remove all guards which previously were used to check that XDP is enabled only with |--devices| == 1. The last guard was not visible on v1.11 due to cilium#18304, while on v1.10 it failed on the multi-dev XDP setups. Fixes: 0ffa7c6 ("datapath,daemon: Enable multi-dev XDP") Reported-by: Tobias Klauser <tobias@cilium.io> Reported-by: Paul Chaignon <paul@cilium.io> Signed-off-by: Martynas Pumputis <m@lambda.lt> Signed-off-by: Chris Tarazi <chris@isovalent.com>
[ upstream commit bcb86c8 ] * Fix for blocked state transition from ready-for-release to released * Fix for unnecessary updates between agent and operator during handshake Signed-off-by: Hemanth Malla <hemanth.malla@datadoghq.com> Signed-off-by: Chris Tarazi <chris@isovalent.com>
[ upstream commit 2581084 ] crdAllocator.Allocate() aquires lock on allocator first and then on nodestore. But updateLocalNodeResource() acquires locks in the opposite order. This commit releases nodestore lock before acquiring allocator lock to avoid potential deadlocks due to inconsistent lock ordering. Signed-off-by: Hemanth Malla <hemanth.malla@datadoghq.com> Signed-off-by: Chris Tarazi <chris@isovalent.com>
maintainer-s-little-helper
bot
added
backport/1.11
joestringer
approved these changes
Jan 3, 2022
pchaigno
approved these changes
Jan 4, 2022
|
/test-backport-1.11 |
|
|
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