Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Conversation

@harche
Copy link
Contributor

@harche harche commented Aug 19, 2020

Signed-off-by: Harshal Patil [email protected]

What type of PR is this?

/kind bug

What this PR does / why we need it:

Which issue(s) this PR fixes:

91d3d27 introduced a regression that would cause CRIO to fail at startup if the runc binary is not present on the system.

This PR attempts to preserve the changes brought in by 91d3d27 as well as fix the #4069

Fixes #4069

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Yes

If the default_runtime is changed from the default configuration, the corresponding existing default entry in the runtime map in the configuration will be ignored. 

@harche harche requested review from mrunalp and runcom as code owners August 19, 2020 07:07
@openshift-ci-robot openshift-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. labels Aug 19, 2020
@openshift-ci-robot openshift-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Aug 19, 2020
@openshift-ci-robot
Copy link

Hi @harche. Thanks for your PR.

I'm waiting for a cri-o 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.

Details

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.

@harche
Copy link
Contributor Author

harche commented Aug 19, 2020

#4069 (comment) for more info.

Copy link
Member

@saschagrunert saschagrunert left a comment

Choose a reason for hiding this comment

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

/ok-to-test
LGTM

@openshift-ci-robot openshift-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 Aug 19, 2020
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: harche, saschagrunert

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

The pull request process is described here

Details 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

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 19, 2020
@saschagrunert
Copy link
Member

@harche thank you for the fix! If you don't mind we may add a bats integration test for this use-case.

@saschagrunert
Copy link
Member

/retest

@harche
Copy link
Contributor Author

harche commented Aug 19, 2020

@harche thank you for the fix! If you don't mind we may add a bats integration test for this use-case.

Sure, I will update the PR with the bats test.

@codecov
Copy link

codecov bot commented Aug 19, 2020

Codecov Report

Merging #4097 into master will increase coverage by 0.00%.
The diff coverage is 60.00%.

@@           Coverage Diff           @@
##           master    #4097   +/-   ##
=======================================
  Coverage   41.11%   41.12%           
=======================================
  Files         109      109           
  Lines        9030     9034    +4     
=======================================
+ Hits         3713     3715    +2     
- Misses       4978     4979    +1     
- Partials      339      340    +1     

@saschagrunert
Copy link
Member

/retest

@umohnani8
Copy link
Member

LGTM

1 similar comment
@TomSweeneyRedHat
Copy link
Contributor

LGTM

@rhatdan
Copy link
Contributor

rhatdan commented Aug 19, 2020

/retest

@saschagrunert
Copy link
Member

/test e2e-aws

@haircommander
Copy link
Member

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Aug 20, 2020
@haircommander
Copy link
Member

/cherry-pick release-1.19

@openshift-cherrypick-robot

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

Details

In response to this:

/cherry-pick release-1.19

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.

@mrunalp mrunalp merged commit fdf2349 into cri-o:master Aug 24, 2020
@mrunalp
Copy link
Member

mrunalp commented Aug 24, 2020

/cherry-pick release-1.19

@openshift-cherrypick-robot

@mrunalp: failed to push cherry-picked changes in GitHub: pushing failed, output: "To https://github.com/openshift-cherrypick-robot/cri-o\n ! [remote rejected] cherry-pick-4097-to-release-1.19 -> cherry-pick-4097-to-release-1.19 (cannot lock ref 'refs/heads/cherry-pick-4097-to-release-1.19': reference already exists)\nerror: failed to push some refs to 'https://openshift-cherrypick-robot:[email protected]/openshift-cherrypick-robot/cri-o'\n", error: exit status 1

Details

In response to this:

/cherry-pick release-1.19

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.

@openshift-cherrypick-robot

@haircommander: new pull request created: #4113

Details

In response to this:

/cherry-pick release-1.19

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.

@harche
Copy link
Contributor Author

harche commented Aug 27, 2020

Oh, this got merged. @saschagrunert I will send a separate PR to add a bats test.

@harche harche deleted the runc_abst branch August 27, 2020 05:27
@saschagrunert
Copy link
Member

Oh, this got merged. @saschagrunert I will send a separate PR to add a bats test.

Thank you! 🙏

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. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. lgtm 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. release-note Denotes a PR that will be considered when it comes time to generate release notes.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

runtime validation: \"runc\" not found in $PATH: exec: \"runc\": executable file not found in $PATH"

9 participants