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.12 Backports 2023-04-03 #24709

Merged
merged 3 commits into from
Apr 5, 2023
Merged

v1.12 Backports 2023-04-03 #24709

merged 3 commits into from
Apr 5, 2023

Commits on Apr 3, 2023

  1. endpoint: fix k8sNamespace log field when ep gets deleted 

    [ upstream commit 772f4a0 ]

Currently, the log field k8sNamespace contains the name of the pod
instead of the actual namespace when an endpoint gets deleted. This
commit fixes this and adds the k8s namespace.

Signed-off-by: Marco Hofstetter <marco.hofstetter@isovalent.com>
Signed-off-by: Gilberto Bertin <jibi@cilium.io>
    @mhofstetter @jibi
    mhofstetter authored and jibi committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    09711d1 View commit details
    Browse the repository at this point in the history

  2. test: fix race condition of deleting ccnp in e2e test 

    [ upstream commit 22a3743 ]

There is a flake in e2e test when a test case starts to proceed
before ccnp comes to take effect by cilium-agent. The correct way to
delete ccnp is to run "kubectl delete" followed by "cilium policy wait",
and kubectl helper already has such wrappers.

Fixes: #24380

Signed-off-by: Zhichuan Liang <gray.liang@isovalent.com>
Signed-off-by: Gilberto Bertin <jibi@cilium.io>
    @jschwinger233 @jibi
    jschwinger233 authored and jibi committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    faab233 View commit details
    Browse the repository at this point in the history

  3. test: fix race condition of deleting cnp in e2e test 

    [ upstream commit 294bcd1 ]

There is a flake in e2e test when a test case starts to proceed
before cnp comes to take effect by cilium-agent. The correct way to
delete cnp is to run "kubectl delete" followed by "cilium policy wait",
and kubectl helper already has such wrappers.

Signed-off-by: Zhichuan Liang <gray.liang@isovalent.com>
Signed-off-by: Gilberto Bertin <jibi@cilium.io>
    @jschwinger233 @jibi
    jschwinger233 authored and jibi committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    5ff8060 View commit details
    Browse the repository at this point in the history