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 minor fixes for 3.10 #8427

Merged
merged 3 commits into from May 18, 2018
Merged

Conversation

vrutkovs
Copy link
Member

  • Remove openshift_crio_use_rpm as RPM is the only way to use CRIO now
  • Update hosts.example with crio vars
  • Ignore errors in docker storage when openshift_use_crio_only is on

@openshift-ci-robot openshift-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels May 18, 2018
@vrutkovs vrutkovs requested review from ashcrow and michaelgugino and removed request for sdodson and michaelgugino May 18, 2018 08:42
@vrutkovs
Copy link
Member Author

/test gcp

@ashcrow
Copy link
Member

ashcrow commented May 18, 2018

I'm not against the removal of openshift_crio_use_rpm as long as it's documented and known anyone using cri-o before 3.10 will not be able to upgrade.

@ashcrow
Copy link
Member

ashcrow commented May 18, 2018

I'll let @michaelgugino make the go/no go for the PR but it looks fine to me.

Copy link
Contributor

@michaelgugino michaelgugino left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label May 18, 2018
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: michaelgugino, vrutkovs

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 [michaelgugino,vrutkovs]

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

@vrutkovs
Copy link
Member Author

I'm not against the removal of openshift_crio_use_rpm as long as it's documented and known anyone using cri-o before 3.10 will not be able to upgrade.

Its now would be impossible to upgrade if CRIO system container is used - that would be a doc change. In other cases RPM would be assumed

@vrutkovs
Copy link
Member Author

/test install

@openshift-merge-robot openshift-merge-robot merged commit 4796c1d into openshift:master May 18, 2018
@vrutkovs vrutkovs deleted the crio-only branch May 30, 2018 08:06
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. lgtm Indicates that a PR is ready to be merged. 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.

None yet

5 participants