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.

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

v1.12 Backports 2023-06-06 #25919

Merged
merged 2 commits into from Jun 7, 2023
Merged

Conversation

YutaroHayakawa
Copy link
Member

@YutaroHayakawa YutaroHayakawa commented Jun 6, 2023

Skipped due to major conflicts

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

for pr in 25079 25774; do contrib/backporting/set-labels.py $pr done 1.12; done

or with

make add-labels BRANCH=v1.12 ISSUES=25079,25774

pchaigno and others added 2 commits June 6, 2023 06:27
[ upstream commit e93fdd8 ]

Once we have a sysdump in the test artifacts a lot of files we collect
will become duplicates. This commit however doesn't remove all those
duplicate files from the test artifacts. Let's wait a bit and confirm
the sysdump collection always work before cleaning things up.

The sysdump collection was tested by making a test fail on purpose.

Signed-off-by: Paul Chaignon <paul@cilium.io>
Signed-off-by: Yutaro Hayakawa <yutaro.hayakawa@isovalent.com>
[ upstream commit 5c9b66c ]

[ backporter's note: Fixed conflict in the
install/kubernetes/Makefile.values and regenerated relevant documents. ]

Upgrading this image is not automated yet.

Ref: #25773
Ref: cilium/image-tools#218
Ref: https://quay.io/repository/cilium/startup-script?tab=tags

Signed-off-by: Michi Mutsuzaki <michi@isovalent.com>
Signed-off-by: Yutaro Hayakawa <yutaro.hayakawa@isovalent.com>
@YutaroHayakawa YutaroHayakawa requested a review from a team as a code owner June 6, 2023 06:41
@YutaroHayakawa YutaroHayakawa added kind/backports This PR provides functionality previously merged into master. backport/1.12 This PR represents a backport for Cilium 1.12.x of a PR that was merged to main. labels Jun 6, 2023
@YutaroHayakawa
Copy link
Member Author

YutaroHayakawa commented Jun 6, 2023

/test-backport-1.12

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

Click to show.

Test Name

K8sIstioTest Istio Bookinfo Demo Tests bookinfo inter-service connectivity

Failure Output

FAIL: DNS entry is not ready after timeout

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

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

Then please upload the Jenkins artifacts to that issue.

Copy link
Member

@pchaigno pchaigno left a comment

Choose a reason for hiding this comment

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

My PR looks good to me.

Copy link
Contributor

@michi-covalent michi-covalent left a comment

Choose a reason for hiding this comment

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

#25774 lgtm

@YutaroHayakawa
Copy link
Member Author

YutaroHayakawa commented Jun 7, 2023

/mlh new-flake Cilium-PR-K8s-1.20-kernel-4.9

👍 created #25961

@YutaroHayakawa
Copy link
Member Author

/test-1.20-4.9

@YutaroHayakawa
Copy link
Member Author

Cilium L4LB XDP is not triggered. Manually triggering.

@YutaroHayakawa
Copy link
Member Author

/ci-l4lb-1.12

@YutaroHayakawa
Copy link
Member Author

All green and reviews are in. 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 Jun 7, 2023
@dylandreimerink dylandreimerink merged commit f23bf4b into v1.12 Jun 7, 2023
57 checks passed
@dylandreimerink dylandreimerink deleted the pr/v1.12-backport-2023-06-06 branch June 7, 2023 10:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/1.12 This PR represents a backport for Cilium 1.12.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
Development

Successfully merging this pull request may close these issues.

None yet

4 participants