v1.14 Backports 2023-11-08 #29064
Merged
v1.14 Backports 2023-11-08 #29064
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
aanm
added
kind/backports
|
/test-backport-1.14 |
aanm
force-pushed
the
pr/v1.14-backport-2023-11-08
branch
from
3233363
to
ed2d25d
Compare
|
/test-backport-1.14 |
1 similar comment
|
/test-backport-1.14 |
squeed
approved these changes
Nov 9, 2023
maintainer-s-little-helper
bot
added
the
ready-to-merge
giorio94
requested changes
Nov 9, 2023
pkg/allocator/allocator.go
Outdated
| @@ -579,7 +594,7 @@ func (a *Allocator) lockedAllocate(ctx context.Context, key AllocatorKey) (idpoo | |||
| return 0, false, false, fmt.Errorf("Found master key after proceeding with new allocation for %s", k) | |||
| } | |||
|
|
|||
| err = a.backend.AllocateIDIfLocked(ctx, id, key, lock) | |||
| key, err = a.backend.AllocateIDIfLocked(ctx, id, key, lock) | |||
There was a problem hiding this comment.
Sorry, I missed this during my last review. When AllocateIDIfLocked returns an error, the current implementation also returns a nil key. Which means that the error message below will be incorrect.
maintainer-s-little-helper
bot
removed
ready-to-merge
…RD mode [ upstream commit e39fcae ] In CRD mode, the Cilium agent uses CRD to create identities. After an identity is created, the agent acquires a reference for that key. This involves fetching the CRD from the local Kubernetes cache and checking for an annotation applied by cilium-operator to mark the identity for deletion. However, there may be a delay before the Cilium Identity is cached locally, leading to the 'Key allocation attempt failed' error. This patch ensures that we fallback to the newly allocated Cilium Identity if it's not found in the Kubernetes cache. Signed-off-by: André Martins <andre@cilium.io> Signed-off-by: André Martins <andre@cilium.io>
[ upstream commit df05754 ] We don't need to always DeepCopy Cilium Identity. We just need to perform that operation if we are going perform writes. Signed-off-by: André Martins <andre@cilium.io> Signed-off-by: André Martins <andre@cilium.io>
[ upstream commit 3b2e1ad ] Renamed 'slave' to 'secondary' in the error messages that are presented to users. Signed-off-by: André Martins <andre@cilium.io> Signed-off-by: André Martins <andre@cilium.io>
aanm
force-pushed
the
pr/v1.14-backport-2023-11-08
branch
from
ed2d25d
to
93ee0bf
Compare
|
/test-backport-1.14 |
giorio94
approved these changes
Nov 9, 2023
maintainer-s-little-helper
bot
added
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.
Once this PR is merged, a GitHub action will update the labels of these PRs: