Skip to content

v1.10 backports 2022-10-19 #21811

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.

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

Merged
merged 3 commits into from
Oct 26, 2022
Merged

v1.10 backports 2022-10-19 #21811

merged 3 commits into from
Oct 26, 2022

Conversation

qmonnet
Copy link
Member

@qmonnet qmonnet commented Oct 19, 2022

PRs skipped due conflicts:

Once this PR is merged, you can update the PR labels via:

$ for pr in 21394 21670 21771; do contrib/backporting/set-labels.py $pr done 1.10; done

or with

$ make add-label BRANCH=v1.10 ISSUES=21394,21670,21771

zuzzas and others added 3 commits October 19, 2022 17:37
[ upstream commit 694892c ]

CCNPs are converted internally into CNPs, but metadata.name has been forgotten

Fixes #21393

[ Backport note: operator/k8s_node.go has been renamed into
    operator/cilium_node.go, and then into operator/cmd/cilium_node.go
    in master branch. ]

Signed-off-by: Andrey Klimentyev <andrey.klimentyev@flant.com>
Signed-off-by: Quentin Monnet <quentin@isovalent.com>
[ upstream commit 6fbbbb9 ]

Add some additional notes to highlight how Cilium's k8s NetworkPolicy
support works, including:

- Egress policies have not been beta for several years.
- Port Ranges.

[ Backport note: File Documentation/concepts/kubernetes/policy.rst has
    been renamed into Documentation/network/kubernetes/policy.rst in
    master branch. ]

Signed-off-by: Joe Stringer <joe@cilium.io>
Signed-off-by: Quentin Monnet <quentin@isovalent.com>
[ upstream commit 061e55f ]

In high-churn clusters, there can be a three-party deadlock between the
EndpointManager, the PolicyRepository, and a given Endpoint. One of the
"links in the chain" is merely trying to get the container ID and
namespace+name of an Endpoint for logging. Which we already have.

So, rather than trying to lock an Endpoint to get it's identifiers
again, just use the copy we already have.

Fixes: dae07b5 (endpointmanager: Remove goroutine for ID release)
Signed-off-by: Casey Callendrello <cdc@isovalent.com>
Signed-off-by: Quentin Monnet <quentin@isovalent.com>
@qmonnet qmonnet requested a review from a team as a code owner October 19, 2022 16:39
@qmonnet qmonnet requested review from joestringer and squeed October 19, 2022 16:39
@maintainer-s-little-helper maintainer-s-little-helper bot added backport/1.10 kind/backports This PR provides functionality previously merged into master. labels Oct 19, 2022
@qmonnet
Copy link
Member Author

qmonnet commented Oct 19, 2022

/test-backport-1.10

Job 'Cilium-PR-K8s-GKE' failed:

Click to show.

Test Name

K8sServicesTest Checks ClusterIP Connectivity Checks service.kubernetes.io/service-proxy-name label implementation

Failure Output

FAIL: Request from echo-55fdf5787d-xbkmr pod to service http://10.72.7.175:80/ failed

If it is a flake and a GitHub issue doesn't already exist to track it, comment /mlh new-flake Cilium-PR-K8s-GKE so I can create one.

@nathanjsweet
Copy link
Member

/test-gke

1 similar comment
@nathanjsweet
Copy link
Member

/test-gke

@nathanjsweet
Copy link
Member

Failure is #17628

@nathanjsweet nathanjsweet merged commit 4c47595 into v1.10 Oct 26, 2022
@nathanjsweet nathanjsweet deleted the pr/v1.10-backport-2022-10-19 branch October 26, 2022 16:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/backports This PR provides functionality previously merged into master.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants