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

Default Ubuntu to 22.04 for new k8s versions #2807

Merged
merged 1 commit into from
Dec 6, 2022
Merged

Default Ubuntu to 22.04 for new k8s versions #2807

merged 1 commit into from
Dec 6, 2022

Conversation

mboersma
Copy link
Contributor

@mboersma mboersma commented Nov 10, 2022 •
edited
Loading

What type of PR is this?

/kind feature

What this PR does / why we need it:

Updates the default Ubuntu version to 22.04 LTS for newer Kubernetes versions that have published reference images to Azure Marketplace for it.

Which issue(s) this PR fixes:

N/A

Special notes for your reviewer:

TODOs:

  • squashed commits
  • includes documentation
  • adds unit tests

Release note:

Default Ubuntu to 22.04 for new k8s versions

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/feature Categorizes issue or PR as related to a new feature. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Nov 10, 2022
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Nov 14, 2022
@mboersma
Copy link
Contributor Author

Updated with a case for <v1.22.16 since we'll actually publish it for Ubuntu 22.04, and with more unit test cases.

willie-yao
willie-yao approved these changes Nov 14, 2022
View reviewed changes
Copy link
Contributor

@willie-yao willie-yao left a comment

Choose a reason for hiding this comment

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

lgtm!

jackfrancis
jackfrancis approved these changes Nov 14, 2022
View reviewed changes
Copy link
Contributor

@jackfrancis jackfrancis left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 14, 2022
@jackfrancis
Copy link
Contributor

/hold

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 14, 2022
@jackfrancis
Copy link
Contributor

/approve

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 14, 2022
@jackfrancis
Copy link
Contributor

@mboersma feel free to cancel the hold once the referenced 22.04 images are actually live and we're able to merge this

@nawazkh
Copy link
Member

nawazkh commented Nov 15, 2022

/lgtm

@jackfrancis jackfrancis added this to the v1.7 milestone Nov 17, 2022
@jackfrancis
Copy link
Contributor

/cherry-pick release-1.5 release-1.6

@k8s-infra-cherrypick-robot
Copy link

@jackfrancis: once the present PR merges, I will cherry-pick it on top of release-1.5 release-1.6 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.5 release-1.6

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@jackfrancis
Copy link
Contributor

/assign

@jackfrancis
Copy link
Contributor

/assign @mtougeron

mtougeron
mtougeron reviewed Dec 1, 2022
View reviewed changes
azure/services/virtualmachineimages/images.go Outdated
if (major == 1 && minor == 21 && patch < 2) ||
(major == 1 && minor == 20 && patch < 8) ||
(major == 1 && minor == 19 && patch < 12) ||
(major == 1 && minor == 18 && patch < 20) ||
(major == 1 && minor < 18) {
osVersion = "1804"
} else if (major == 1 && minor == 25 && patch < 3) ||
(major == 1 && minor == 24 && patch < 7) ||
(major == 1 && minor == 23 && patch < 13) ||
Copy link
Member

Choose a reason for hiding this comment

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

My understanding is that cgroupv2 is enabled by default on ubuntu 22.04. If so, I don't think we should publish images for < k8s 1.24.

Copy link
Contributor Author

@mboersma mboersma Dec 5, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

Right you are (according to my Googling), thanks for pointing this out. On the Kubernetes cgroups doc, it says about cgroups v2:

FEATURE STATE: Kubernetes v1.25 [stable]

Should we restrict Ubuntu 22.04 to >= v1.25 then?

@CecileRobertMichon
Copy link
Contributor

/lgtm cancel

Per discussion in office hours this morning

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 2, 2022
@mboersma
Copy link
Contributor Author

mboersma commented Dec 5, 2022

After researching cgroups v2 support, I updated this PR so Ubuntu 22.04 is the default only for Kubernetes v1.25.3 and forward. (We didn't actually publish 22.04 images for v1.25.2 or earlier patches.) Let me know if that's playing it too safe.

@mboersma
Copy link
Contributor Author

mboersma commented Dec 5, 2022

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 5, 2022
@mboersma
Copy link
Contributor Author

mboersma commented Dec 5, 2022

/approve cancel

Need fresh reviews since the intent of this PR has changed.

@mboersma
Copy link
Contributor Author

mboersma commented Dec 5, 2022

/remove-approve

Why "approve" commands aren't parallel to "lgtm" commands, I don't know.

@mtougeron
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 6, 2022
@mboersma
Copy link
Contributor Author

mboersma commented Dec 6, 2022

/test pull-cluster-api-provider-azure-e2e

@mboersma mboersma removed the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 6, 2022
CecileRobertMichon
CecileRobertMichon reviewed Dec 6, 2022
View reviewed changes
Copy link
Contributor

@CecileRobertMichon CecileRobertMichon left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: CecileRobertMichon, jackfrancis

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [CecileRobertMichon,jackfrancis]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 6, 2022
@k8s-ci-robot k8s-ci-robot merged commit 53d25f2 into kubernetes-sigs:main Dec 6, 2022
@k8s-infra-cherrypick-robot
Copy link

@jackfrancis: cannot checkout release-1.5 release-1.6: error checking out release-1.5 release-1.6: exit status 1. output: error: pathspec 'release-1.5 release-1.6' did not match any file(s) known to git

In response to this:

/cherry-pick release-1.5 release-1.6

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@jackfrancis
Copy link
Contributor

/cherry-pick release-1.5

@jackfrancis
Copy link
Contributor

/cherry-pick release-1.6

@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Dec 6, 2022
Closed
@k8s-infra-cherrypick-robot
Copy link

@jackfrancis: new pull request created: #2907

In response to this:

/cherry-pick release-1.5

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-infra-cherrypick-robot
Copy link

@jackfrancis: new pull request created: #2908

In response to this:

/cherry-pick release-1.6

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Dec 6, 2022
Closed
@nojnhuh nojnhuh mentioned this pull request Nov 1, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nawazkh nawazkh nawazkh left review comments

@CecileRobertMichon CecileRobertMichon CecileRobertMichon left review comments

@mtougeron mtougeron mtougeron left review comments

@willie-yao willie-yao willie-yao approved these changes

@jackfrancis jackfrancis jackfrancis approved these changes

@Jont828 Jont828 Awaiting requested review from Jont828

Assignees

@mtougeron mtougeron

@jackfrancis jackfrancis

@CecileRobertMichon CecileRobertMichon

@nawazkh nawazkh

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/feature Categorizes issue or PR as related to a new feature. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
v1.7
Development

Successfully merging this pull request may close these issues.
8 participants
@mboersma @jackfrancis @nawazkh @k8s-infra-cherrypick-robot @CecileRobertMichon @mtougeron @k8s-ci-robot @willie-yao