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

image: Upgrade ubuntu base image to 22.04 #21097

Merged
merged 4 commits into from
Aug 29, 2022
Merged

image: Upgrade ubuntu base image to 22.04 #21097

merged 4 commits into from
Aug 29, 2022

Conversation

sayboras
Copy link
Member

@sayboras sayboras commented Aug 26, 2022 •
edited
Loading

Description

This is to revert the revert of previous upgrade, but with the extra fix in #21096

Relates: #20943, #20964, #21067

@maintainer-s-little-helper
Copy link

Commits 2bfaad9084060940a9dca98b65864492475226f3, 8dbc7f0c60f3bf48734efd17f1c089256352ad23, 22bfe0f68004508bfdc0aff5618f042d04886c48, b8b6beb96c00469f771f671728e0c8228a42fc54 do not contain "Signed-off-by".

Please follow instructions provided in https://docs.cilium.io/en/stable/contributing/development/contributing_guide/#developer-s-certificate-of-origin

@maintainer-s-little-helper maintainer-s-little-helper bot added dont-merge/needs-sign-off The author needs to add signoff to their commits before merge. dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. labels Aug 26, 2022
@sayboras sayboras temporarily deployed to release-base-images August 26, 2022 06:47 Inactive
@sayboras sayboras temporarily deployed to release-base-images August 26, 2022 06:47 Inactive
@sayboras
Copy link
Member Author

/test

@sayboras sayboras changed the title Tam/ubuntu 24.04 again again image: Upgrade ubuntu base image to 22.04 Aug 26, 2022
@sayboras sayboras force-pushed the tam/ubuntu-24.04-again-again branch from 4ef9247 to c29f2cf Compare August 26, 2022 09:44
@maintainer-s-little-helper maintainer-s-little-helper bot removed the dont-merge/needs-sign-off The author needs to add signoff to their commits before merge. label Aug 26, 2022
@sayboras sayboras temporarily deployed to release-base-images August 26, 2022 09:44 Inactive
@sayboras sayboras temporarily deployed to release-base-images August 26, 2022 09:44 Inactive
@sayboras sayboras added the release-note/minor This PR changes functionality that users may find relevant to operating Cilium. label Aug 26, 2022
@maintainer-s-little-helper maintainer-s-little-helper bot removed the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Aug 26, 2022
@sayboras
Copy link
Member Author

/test

@sayboras
Copy link
Member Author

/test-1.23-5.4

@sayboras
Copy link
Member Author

/test-1.25-net-next

@sayboras
Copy link
Member Author

/test-1.24-4.19

@sayboras
Revert "Revert "test/k8s: Update test-verifier images""
27d9f07 
This reverts commit 215baff.

Signed-off-by: Tam Mach <tam.mach@cilium.io>
@sayboras
Revert "Revert "gha: Update base image for race detection build""
4fca8ef 
This reverts commit df5de3d.

Signed-off-by: Tam Mach <tam.mach@cilium.io>
@sayboras
Revert "Revert "image: Bump base image to ubuntu 22.04""
18c9e79 
This reverts commit b42d331.

Signed-off-by: Tam Mach <tam.mach@cilium.io>
@sayboras
Revert "Revert "update cilium-{runtime,builder}""
d2b56d4 
This reverts commit 95f3909.

Signed-off-by: Tam Mach <tam.mach@cilium.io>
@sayboras sayboras force-pushed the tam/ubuntu-24.04-again-again branch from c29f2cf to d2b56d4 Compare August 29, 2022 09:29
@sayboras sayboras temporarily deployed to release-base-images August 29, 2022 09:29 Inactive
@sayboras sayboras temporarily deployed to release-base-images August 29, 2022 09:29 Inactive
@sayboras sayboras marked this pull request as ready for review August 29, 2022 09:29
@sayboras sayboras requested review from a team as code owners August 29, 2022 09:29
@sayboras
Copy link
Member Author

sayboras commented Aug 29, 2022 •
edited by maintainer-s-little-helper bot
Loading

/test

Job 'Cilium-PR-K8s-1.25-kernel-net-next' failed:

Click to show.

Test Name

K8sDatapathConfig Check BPF masquerading with ip-masq-agent DirectRouting

Failure Output

FAIL: Failed to add ip route

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

@sayboras
Copy link
Member Author

one failure in CI is a flake and unrelated to this change, so just wait for required review.

joestringer
joestringer approved these changes Aug 29, 2022
View reviewed changes
Copy link
Member

@joestringer joestringer left a comment

Choose a reason for hiding this comment

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

LGTM. @sayboras do you consider this ready to merge?

@joestringer joestringer merged commit 60f2039 into cilium:master Aug 29, 2022
@sayboras
Copy link
Member Author

do you consider this ready to merge?

Yup, we can mark it ready to merge now.

@sayboras sayboras deleted the tam/ubuntu-24.04-again-again branch August 29, 2022 22:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@joestringer joestringer joestringer approved these changes

@aanm aanm aanm approved these changes

@nebril nebril Awaiting requested review from nebril nebril was automatically assigned from cilium/ci-structure

Assignees
No one assigned
Labels
release-note/minor This PR changes functionality that users may find relevant to operating Cilium.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@sayboras @joestringer @aanm