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 2022-11-23 #22328

Merged
merged 3 commits into from Nov 23, 2022
Merged

v1.12 backports 2022-11-23 #22328

merged 3 commits into from Nov 23, 2022

Conversation

tklauser
Copy link
Member

@tklauser tklauser commented Nov 23, 2022 •
edited

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

$ for pr in 22315 22322 22324; do contrib/backporting/set-labels.py $pr done 1.12; done

chancez and others added 2 commits November 23, 2022 10:26
@chancez @tklauser
.github: Explicitly set build-commits job runner image version
32deed6 
[ upstream commit 5f7aa03 ]

github: Install libtinfo5 for clang in build-commits CI job

Signed-off-by: Chance Zibolski <chance.zibolski@gmail.com>
Signed-off-by: Tobias Klauser <tobias@cilium.io>
@julianwiedmann @tklauser
.github: fix bpf-checks on ubuntu-latest runner
cd85b50 
[ upstream commit b27208a ]

Take the same approach as in 5f7aa03 (".github: Explicitly set
build-commits job runner image version").

[ backporter note: resolved mionor merge conflict in build_all job ]

Signed-off-by: Julian Wiedmann <jwi@isovalent.com>
Signed-off-by: Tobias Klauser <tobias@cilium.io>
@tklauser tklauser requested review from a team as code owners November 23, 2022 10:12
@tklauser tklauser added 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. labels Nov 23, 2022
@sayboras @tklauser
gha: Pin ubuntu-20.04 for conformance-test-ipv6
bb7f873 
This commit is to avoid ubuntu version drift for runner, till the proper
version upgrade is done.

Signed-off-by: Tam Mach <tam.mach@cilium.io>
@tklauser tklauser mentioned this pull request Nov 23, 2022
Merged
@pchaigno pchaigno added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Nov 23, 2022
@tklauser tklauser merged commit bb2d246 into cilium:v1.12 Nov 23, 2022
@tklauser tklauser deleted the pr/v1.12-backport-2022-11-23 branch November 23, 2022 10:47
@michi-covalent michi-covalent added backport-done/1.12 The backport for Cilium 1.12.x for this PR is done. and removed backport-done/1.12 The backport for Cilium 1.12.x for this PR is done. labels Dec 1, 2022
@joestringer joestringer mentioned this pull request Dec 16, 2022
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

@julianwiedmann julianwiedmann julianwiedmann approved these changes

@nbusseneau nbusseneau Awaiting requested review from nbusseneau nbusseneau is a code owner automatically assigned from cilium/github-sec

@aanm aanm Awaiting requested review from aanm

Assignees
No one assigned
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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@tklauser @pchaigno @julianwiedmann @michi-covalent @chancez @sayboras