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

[2.14] Backport: 6758, 6853 and 7003 to fix CRI-O pkg #7209

Merged
merged 3 commits into from
Jan 26, 2021
Merged

[2.14] Backport: 6758, 6853 and 7003 to fix CRI-O pkg #7209

merged 3 commits into from
Jan 26, 2021

Conversation

RickHaan
Copy link
Contributor

@RickHaan RickHaan commented Jan 25, 2021 •
edited
Loading

What type of PR is this?

/kind failing-test

What this PR does / why we need it:

I am running into issues with the Kubespray CI with PR-7197.
I have created this PR to (cherry-pick) backport PR #6758, PR #6853 and PR #7003 into release-2.14

Does this PR introduce a user-facing change?:

NONE

@k8s-ci-robot k8s-ci-robot added kind/failing-test Categorizes issue or PR as related to a consistently or frequently failing test. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jan 25, 2021
@k8s-ci-robot k8s-ci-robot requested a review from bozzo January 25, 2021 11:15
@k8s-ci-robot
Copy link
Contributor

Hi @RickHaan. 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 requested a review from EppO January 25, 2021 11:15
@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/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 25, 2021
@RickHaan RickHaan changed the title [2.14] Backport: add support crio version for varios k8s vers WIP: [2.14] Backport: add support crio version for varios k8s vers Jan 25, 2021
@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 25, 2021
@RickHaan
Copy link
Contributor Author

I just noticed that this PR is incomplete. I need to backport and cherry-pick #6853 as well. Change status to WIP.

@RickHaan RickHaan changed the title WIP: [2.14] Backport: add support crio version for varios k8s vers WIP: [2.14] Backport: 6853 and 7003 to fix CRI-O pkg Jan 25, 2021
@RickHaan
Copy link
Contributor Author

RickHaan commented Jan 25, 2021 •
edited
Loading

I did a cherry-pick from #6758 as well since I especially needed the new apt repo task in crio_repo.yml.

Edit: I have cherry-picked to much, will start with a clean sheet and dive in deeper to keep original version specifications.

Edit2: Although it looks like the main problem is fixed. I probably need to address 2 things (some advise would be welcome):
* Do a correct cherry-pick where the original authors are visible
* Set the OS'es back to CRI-O 1.17 since that is what release 1.14 came with.

@RickHaan RickHaan changed the title WIP: [2.14] Backport: 6853 and 7003 to fix CRI-O pkg WIP: [2.14] Backport: 6853, 7003 and 6758 to fix CRI-O pkg Jan 25, 2021
@RickHaan RickHaan changed the title WIP: [2.14] Backport: 6853, 7003 and 6758 to fix CRI-O pkg WIP: [2.14] Backport: 6853, 6758 and 7003 to fix CRI-O pkg Jan 25, 2021
hafe and others added 3 commits January 25, 2021 18:18
@hafe @RickHaan
cherry-pick bump crio version to 1.19 (#6758)
bc6d99b 
cherry-pick modifications:
* keep default to 1.17 as release 2.14 came with
* don't change readme with newer versions

* bump crio version to 1.19

* crio package name has changed for debian/ubuntu
* crio upgrade does not work, see #6757

* update crio info in docs
@hafe @RickHaan
Install cri-o with package version (#6853)
474ebef 
and thereby support upgrade from e.g. 1.18.x to 1.19.y

Included OSes:
- Centos7/8
- Ubuntu18/20

New variables for overriding by default installed packages:
- centos_crio_packages
- ubuntu_crio_packages
@LuckySB @RickHaan
add support crio version for varios k8s vers (#7003)
5e9f968 
* add support crio version for various k8s vers

* regexp in pkg versions
@RickHaan RickHaan changed the title WIP: [2.14] Backport: 6853, 6758 and 7003 to fix CRI-O pkg [2.14] Backport: 6758, 6853 and 7003 to fix CRI-O pkg Jan 25, 2021
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 25, 2021
@LuckySB
Copy link
Contributor

LuckySB commented Jan 26, 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 Jan 26, 2021
@LuckySB
Copy link
Contributor

LuckySB commented Jan 26, 2021

/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 Jan 26, 2021
floryut
floryut approved these changes Jan 26, 2021
View reviewed changes
Copy link
Member

@floryut floryut 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 Jan 26, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: floryut, LuckySB, RickHaan

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 merged commit 11b72e2 into kubernetes-sigs:release-2.14 Jan 26, 2021
@rhockenbury rhockenbury mentioned this pull request Jan 26, 2021
Merged
@RickHaan RickHaan mentioned this pull request Feb 2, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@floryut floryut floryut approved these changes

@bozzo bozzo Awaiting requested review from bozzo

@EppO EppO Awaiting requested review from EppO

Assignees

@floryut floryut

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/failing-test Categorizes issue or PR as related to a consistently or frequently failing test. 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/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@RickHaan @k8s-ci-robot @LuckySB @floryut @hafe