Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

v1.14 Backports 2023-11-08 #29064

Merged
merged 3 commits into from
Nov 9, 2023
Merged

v1.14 Backports 2023-11-08 #29064

merged 3 commits into from
Nov 9, 2023

Commits on Nov 9, 2023

  1. pkg/allocator: Improve 'Key allocation attempt failed' handling for C… 

    …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>
    @aanm
    aanm committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    b45f892 View commit details
    Browse the repository at this point in the history

  2. pkg/allocator: only do DeepCopy if necessary 

    [ 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>
    @aanm
    aanm committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    cbf9e8f View commit details
    Browse the repository at this point in the history

  3. pkg/allocator: refactor mentions of 'slave' in error messages 

    [ 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
    aanm committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    93ee0bf View commit details
    Browse the repository at this point in the history