Skip to content

v1.11 Backports 2023-06-06 #25920

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
Merged
merged 2 commits into from
Jun 9, 2023
Merged

v1.11 Backports 2023-06-06 #25920

merged 2 commits into from
Jun 9, 2023

Conversation

YutaroHayakawa
Copy link
Member

@YutaroHayakawa YutaroHayakawa commented Jun 6, 2023 •
edited
Loading

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.11; done

or with

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

@YutaroHayakawa YutaroHayakawa requested a review from a team as a code owner June 6, 2023 07:18
@YutaroHayakawa YutaroHayakawa added kind/backports This PR provides functionality previously merged into master. backport/1.11 labels Jun 6, 2023
@YutaroHayakawa YutaroHayakawa force-pushed the pr/v1.11-backport-2023-06-06 branch from 8f08265 to 6d5f174 Compare June 6, 2023 07:23
@YutaroHayakawa
Copy link
Member Author

Hmm, the build-commits workflow is failing. Looks not related to this PR, but let me dig in.

pchaigno
pchaigno approved these changes Jun 6, 2023
View reviewed changes
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. Thanks!

@YutaroHayakawa
Copy link
Member Author

YutaroHayakawa commented Jun 6, 2023 •
edited
Loading

build-commits workflow is failing to build CMock test facilities. This is removed in the main, but still present on v1.11, so should succeed. Let me retry to see consistency.

Failed run: https://github.com/cilium/cilium/actions/runs/5185763004/jobs/9346044609?pr=25920

The second attempt succeeded 🤯

@YutaroHayakawa
Copy link
Member Author

/test-backport-1.11

@YutaroHayakawa
Copy link
Member Author

YutaroHayakawa commented Jun 6, 2023 •
edited
Loading

ConformanceKind1.19: New flake. Filed an issue (#25940)

No, this is not a flake. It's complexity issue.

michi-covalent
michi-covalent approved these changes Jun 6, 2023
View reviewed changes
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.

ack on #25774 ❤️

pchaigno and others added 2 commits June 8, 2023 16:52
@pchaigno @aspsk
test: Collect sysdump as part of artifacts
ed53f7e 
[ 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>
@michi-covalent @aspsk
Pick up the latest startup-script image
0109edd 
[ 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>
@aspsk aspsk force-pushed the pr/v1.11-backport-2023-06-06 branch from 6d5f174 to 0109edd Compare June 8, 2023 14:52
@aspsk
Copy link
Contributor

aspsk commented Jun 8, 2023

I've rebased on top of v1.11 so that broken parts of conformance-kind and smoke-test are disabled.

@aspsk
Copy link
Contributor

aspsk commented Jun 8, 2023

/test-backport-1.11

@aspsk
Copy link
Contributor

aspsk commented Jun 8, 2023

build-commits failed twice with something like this: #19098 (don't have more time today to investigate, sorry)

@aspsk
Copy link
Contributor

aspsk commented Jun 8, 2023

But bad news is that ci-multicluster-1.11 fails due to complexity:

/logs-cilium-zfwcd-cilium-agent-20230608-150459.log:2023-06-08T15:00:42.008720587Z level=warning msg="BPF program is too large. Processed 1000001 insn" subsys=datapath-loader
./logs-cilium-zfwcd-cilium-agent-20230608-150459.log:2023-06-08T15:00:42.008780488Z level=warning msg="processed 1000001 insns (limit 1000000) max_states_per_insn 23 total_states 60796 peak_states 2209 mark_read 85" subsys=datapath-loader

so either it should be disabled as well, or we need to wait until the #25993 is merged

@aspsk
Copy link
Contributor

aspsk commented Jun 9, 2023

ci-multicluster is not in required

kernel-netnext hits #18218

so I think this is read to go

@aspsk aspsk added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Jun 9, 2023
@YutaroHayakawa
Copy link
Member Author

/ci-l4lb-1.11

@YutaroHayakawa
Copy link
Member Author

/test-1.16-netnext

@YutaroHayakawa YutaroHayakawa removed the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Jun 9, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Jun 9, 2023
@dylandreimerink dylandreimerink merged commit 71728fd into v1.11 Jun 9, 2023
@dylandreimerink dylandreimerink deleted the pr/v1.11-backport-2023-06-06 branch June 9, 2023 11:16
@michi-covalent michi-covalent mentioned this pull request Jun 14, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pchaigno pchaigno pchaigno approved these changes

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

Assignees
No one assigned
Labels
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.
5 participants
@YutaroHayakawa @aspsk @pchaigno @michi-covalent @dylandreimerink