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.11 Backports 2023-05-03 Cont #25349

Merged
merged 5 commits into from May 11, 2023
Merged

v1.11 Backports 2023-05-03 Cont #25349

merged 5 commits into from May 11, 2023

Conversation

YutaroHayakawa
Copy link
Member

@YutaroHayakawa YutaroHayakawa commented May 10, 2023 •
edited by jrajahalme

This PR is a successor of #25250. I didn't make any changes for those who are already approved in the old PR, so you don't have to review this again.

For those who are notified even if you are not listed as a reviewer now, sorry for the spam. I mistakenly open the PR against main at the beginning, and that made a huge diff.

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

for pr in 25033 25109 25192 25174 25219; do contrib/backporting/set-labels.py $pr done 1.11; done

or with

make add-labels BRANCH=v1.11 ISSUES=25043,25046,24770,25033,25109,25192,25174,25219

@YutaroHayakawa YutaroHayakawa requested review from a team as code owners May 10, 2023 06:58
@pchaigno
Copy link
Member

For those who are notified even if you are not listed as a reviewer now, sorry for the spam. I mistakenly open the PR against main at the beginning, and that made a huge diff.

Don't be sorry. Use the scripts.

sayboras
sayboras approved these changes May 10, 2023
View reviewed changes
Copy link
Member

@sayboras sayboras left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM ✅

@aditighag
Copy link
Member

@YutaroHayakawa Please skip the PR backport. I'll backport it manually to 1.11. Thanks!

harsimran-pabla
harsimran-pabla approved these changes May 10, 2023
View reviewed changes
Copy link
Contributor

@harsimran-pabla harsimran-pabla left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is no bgp change in this, fix is already backported here #25139.

kaworu
kaworu approved these changes May 10, 2023
View reviewed changes
Copy link
Member

@kaworu kaworu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @YutaroHayakawa my patch LGTM

giorio94 and others added 5 commits May 11, 2023 10:03
@giorio94 @YutaroHayakawa
helm: add clustermesh nodeport config warning about #24692
9ef5dd8 
[ upstream commit 9e83a6f ]

Cilium is currently affected by a known bug (#24692) when NodePorts are
handled by the KPR implementation, which occurs when the same NodePort
is used both in the local and the remote cluster. This causes all
traffic targeting that NodePort to be redirected to a local backend,
regardless of whether the destination node belongs to the local or the
remote cluster. This affects also the clustermesh-apiserver NodePort
service, which is configured by default with a fixed port. Hence, let's
add a warning message to the corresponding values file setting.

Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
Signed-off-by: Jussi Maki <jussi@isovalent.com>
Signed-off-by: Yutaro Hayakawa <yutaro.hayakawa@isovalent.com>
@sayboras @zacharysarah @YutaroHayakawa
docs: Add matrix version between envoy and cilium
fd77fca 
[ upstream commit 11e1bcc ]

This is to add a small docs for version matrix between Cilium and Cilium
envoy versions, which is useful with the upcoming work to move envoy
proxy out of Cilium agent container.

Co-authored-by: ZSC <zacharysarah@users.noreply.github.com>
Signed-off-by: Tam Mach <sayboras@yahoo.com>
Signed-off-by: Jussi Maki <jussi@isovalent.com>
Signed-off-by: Yutaro Hayakawa <yutaro.hayakawa@isovalent.com>
@kaworu @YutaroHayakawa
Makefile: use a specific template for mktemp files
404e1a5 
[ upstream commit db3e015 ]

Before this patch, we would hit a controller-gen[1] bug when the
temporary file would be of the form tmp.0oXXXXXX.

This patch uses a custom mktemp template that will not trigger the bug.

[1]: kubernetes-sigs/controller-tools#734

Signed-off-by: Alexandre Perrin <alex@isovalent.com>
Signed-off-by: Jussi Maki <jussi@isovalent.com>
Signed-off-by: Yutaro Hayakawa <yutaro.hayakawa@isovalent.com>
@joestringer @YutaroHayakawa
docs: Add platform support to docs
5ae4dc8 
[ upstream commit 9a38aec ]

We've been distributing ARM architecture images for Cilium for almost
two years, but neglected to mention this up front in the system
requirements or the main docs page. Add this to the docs.

Signed-off-by: Joe Stringer <joe@cilium.io>
Signed-off-by: Jussi Maki <jussi@isovalent.com>
Signed-off-by: Yutaro Hayakawa <yutaro.hayakawa@isovalent.com>
@tommyp1ckles @YutaroHayakawa
inctimer: fix test flake where timer does not fire within time.
b334996 
[ upstream commit e695e48 ]

Running the test in a cpu constrained environment, such as:

```
docker run -v $(pwd):$(pwd) -w $(pwd) --cpus=0.1 -it golang:bullseye ./inctimer.test -test.v
```

I can fairly consistency reproduce a flake where the inctimer.After does not fire in time.
If I allow it to wait for an additional couple of ms, this seems to be sufficient to prevent failure.

It appears that goroutine scheduling latency can be significantly delayed in cpu restricted environments.
This seems unavoidable, so to fix the flake I'll allow the test to wait another 2ms to see if the inctimer eventually fires.

This will also log an error for delayed test fires, so if there is any other issues we can more easily debug them in the future.

Fixed: #25202

Signed-off-by: Tom Hadlaw <tom.hadlaw@isovalent.com>
Signed-off-by: Jussi Maki <jussi@isovalent.com>
Signed-off-by: Yutaro Hayakawa <yutaro.hayakawa@isovalent.com>
@YutaroHayakawa
Copy link
Member Author

Dropped Aditi's PR.

@YutaroHayakawa
Copy link
Member Author

YutaroHayakawa commented May 11, 2023 •
edited by maintainer-s-little-helper bot

/test-backport-1.11

Job 'Cilium-PR-K8s-1.22-kernel-4.19' failed:

Click to show.

Test Name

K8sDatapathConfig Host firewall With native routing and endpoint routes

Failure Output

FAIL: Error deleting resource /home/jenkins/workspace/Cilium-PR-K8s-1.22-kernel-4.19/src/github.com/cilium/cilium/test/k8sT/manifests/host-policies.yaml: Cannot retrieve "cilium-clsf6"'s policy revision: cannot get policy revision: ""

Jenkins URL: https://jenkins.cilium.io/job/Cilium-PR-K8s-1.22-kernel-4.19/1665/

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

Then please upload the Jenkins artifacts to that issue.

Job 'Cilium-PR-K8s-1.21-kernel-4.9' failed:

Click to show.

Test Name

K8sIstioTest Istio Bookinfo Demo Tests bookinfo inter-service connectivity

Failure Output

FAIL: Found 2 k8s-app=cilium logs matching list of errors that must be investigated:

Jenkins URL: https://jenkins.cilium.io/job/Cilium-PR-K8s-1.21-kernel-4.9/2621/

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

Then please upload the Jenkins artifacts to that issue.

@YutaroHayakawa
Copy link
Member Author

k8s-1.21-kernel-4.9: https://jenkins.cilium.io/job/Cilium-PR-K8s-1.21-kernel-4.9/2621/
k8s-1.22-kernel-4.19: https://jenkins.cilium.io/job/Cilium-PR-K8s-1.22-kernel-4.19/1665/
They are known flakes as MLH mentioned.

@YutaroHayakawa
Copy link
Member Author

/test-1.21-4.9

@YutaroHayakawa
Copy link
Member Author

/test-1.22-4.19

@YutaroHayakawa
Copy link
Member Author

Conformance AWS-CNI: https://github.com/cilium/cilium/actions/runs/4942916632

Timeout while connecting to EKS kubernetes service. Probably, the AWS side of the issue. Let me retry.

@YutaroHayakawa
Copy link
Member Author

/ci-awscni-1.11

@YutaroHayakawa
Copy link
Member Author

All green. Ready to merge.

@YutaroHayakawa YutaroHayakawa added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label May 11, 2023
@youngnick youngnick merged commit 0834b37 into v1.11 May 11, 2023
53 checks passed
@youngnick youngnick deleted the pr/v1.11-backport-2023-05-03 branch May 11, 2023 09:57
@jrajahalme
Copy link
Member

jrajahalme commented May 12, 2023 •
edited

@YutaroHayakawa @youngnick Run the script to mark backports done. Noticed that you had dropped #24770, marked it back to needs-backport-1.11, but should make sure if there was another determination what to do with it?

@YutaroHayakawa
Copy link
Member Author

@jrajahalme Thanks for running the script. #24770 will be handled by Aditi.

This was referenced May 12, 2023
Closed
Closed
Closed
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kaworu kaworu kaworu approved these changes

@sayboras sayboras sayboras approved these changes

@michi-covalent michi-covalent michi-covalent approved these changes

@giorio94 giorio94 giorio94 approved these changes

@harsimran-pabla harsimran-pabla harsimran-pabla approved these changes

@joestringer joestringer Awaiting requested review from joestringer

@nbusseneau nbusseneau Awaiting requested review from nbusseneau

@tommyp1ckles tommyp1ckles Awaiting requested review from tommyp1ckles

@aditighag aditighag Awaiting requested review from aditighag

Assignees
No one assigned
Labels
backport/1.11 This PR represents a backport for Cilium 1.11.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master. ready-to-merge This PR has passed all tests and received consensus from code owners to merge.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet