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

crio: add supported versions 1.20 and 1.21 and align default with k8s version #7562

Merged
merged 3 commits into from
Apr 28, 2021

Conversation

cristicalin
Copy link
Contributor

In #7544, we added versions 1.20 and 1.21 but the defaults were not aligned with the change.

What type of PR is this?

Uncomment only one /kind <> line, hit enter to put that in a new line, and remove leading whitespaces from that line:

/kind api-change
/kind bug
/kind cleanup
/kind design
/kind documentation
/kind failing-test
/kind feature
/kind flake

What this PR does / why we need it:
This PR adds the new cri-o versions to the crio_kubernetes_version_matrix dict and bumps the default cri-o version to 1.20 to align with the default kube_version.

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

cri-o: bump default to 1.20 and align with kube version

@k8s-ci-robot k8s-ci-robot added 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. labels Apr 28, 2021
@k8s-ci-robot k8s-ci-robot requested review from EppO and oomichi April 28, 2021 07:12
@k8s-ci-robot
Copy link
Contributor

Hi @cristicalin. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Apr 28, 2021
@floryut
Copy link
Member

floryut commented Apr 28, 2021

Ah thx, I changed that but while rebasing I forgot to change it back ~~
Can you remove 1.17/1.18 ?

@muzi502
Copy link
Contributor

muzi502 commented Apr 28, 2021

Ah thx, I changed that but while rebasing I forgot to change it back ~~
Can you remove 1.17/1.18 ?

README.md also needs to be updated 😅

https://github.com/kubernetes-sigs/kubespray/blob/master/README.md#L135

@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Apr 28, 2021
@cristicalin
Copy link
Contributor Author

@floryut @muzi502 done, thanks for the hints

@floryut
Copy link
Member

floryut commented Apr 28, 2021

Ah thx, I changed that but while rebasing I forgot to change it back ~~
Can you remove 1.17/1.18 ?

README.md also needs to be updated 😅

https://github.com/kubernetes-sigs/kubespray/blob/master/README.md#L135

oh well it was late! 😅

@cristicalin
Copy link
Contributor Author

Molecule test failure seems to be a lemon.

@LuckySB
Copy link
Contributor

LuckySB commented Apr 28, 2021

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cristicalin, LuckySB

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:

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 Apr 28, 2021
@LuckySB
Copy link
Contributor

LuckySB commented Apr 28, 2021

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Apr 28, 2021
@oomichi
Copy link
Contributor

oomichi commented Apr 28, 2021

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 28, 2021
@k8s-ci-robot k8s-ci-robot merged commit 4c06aa9 into kubernetes-sigs:master Apr 28, 2021
LuckySB pushed a commit to southbridgeio/kubespray that referenced this pull request Jun 12, 2021
… version (kubernetes-sigs#7562)

* crio: add supported versions 1.20 and 1.21 and align default with k8s version

* cri-o: drop versions 1.17 and 1.18 from version matrix

* update note on cri-o version alignment
sakuraiyuta pushed a commit to sakuraiyuta/kubespray that referenced this pull request Apr 16, 2022
… version (kubernetes-sigs#7562)

* crio: add supported versions 1.20 and 1.21 and align default with k8s version

* cri-o: drop versions 1.17 and 1.18 from version matrix

* update note on cri-o version alignment
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants