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

Skip to content

Conversation

@jrvaldes
Copy link
Contributor

@jrvaldes jrvaldes commented Jan 10, 2023

This is a manual backport of 935652c

Do not wipe images when the filename is empty.

@openshift-ci openshift-ci bot 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 Jan 10, 2023
@openshift-ci openshift-ci bot requested review from klihub and wgahnagl January 10, 2023 20:50
@codecov
Copy link

codecov bot commented Jan 10, 2023

Codecov Report

Merging #6509 (541502b) into release-1.24 (1d7361a) will decrease coverage by 0.04%.
The diff coverage is 85.71%.

❗ Current head 541502b differs from pull request most recent head c2af294. Consider uploading reports for the commit c2af294 to get more accurate results

Additional details and impacted files
@@               Coverage Diff                @@
##           release-1.24    #6509      +/-   ##
================================================
- Coverage         42.91%   42.87%   -0.05%     
================================================
  Files               124      124              
  Lines             12741    12740       -1     
================================================
- Hits               5468     5462       -6     
- Misses             6749     6751       +2     
- Partials            524      527       +3     

@haircommander
Copy link
Member

@jrvaldes
Copy link
Contributor Author

docs validation is still failing

@haircommander , I think #6510 will fix that. PTAL

docs/crio.8.md Outdated
**--seccomp-use-default-when-empty**: Use the default seccomp profile when an empty one is specified

**--selinux**: Enable selinux support (default: false)
**--selinux**: Enable selinux support (default: true)
Copy link
Member

Choose a reason for hiding this comment

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

@jrvaldes this line is the problem

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I may need to read more about this. Are you suggesting that this change should be reverted (not included in the PR)?

Copy link
Member

Choose a reason for hiding this comment

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

yeah. basically, the docs-validation make target runs against the config that's generated on your machine. If selinux is enabled, then this will be switched. you can run

alias replace_selinux="sed -i 's/Enable selinux support (default: true)/Enable selinux support (default: false)/g' completions/fish/crio.fish docs/crio.8.md"

which is what I do. This is part of the context for wanting a fix to #6499

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Understood. Addressed in 541502b.

Signed-off-by: Peter Hunt <[email protected]>
(cherry picked from commit 935652c)
@jrvaldes jrvaldes force-pushed the cherry-pick-6022-to-release-1.24 branch from bb3d811 to 541502b Compare January 10, 2023 21:25
@jrvaldes
Copy link
Contributor Author

jrvaldes commented Jan 10, 2023

@haircommander
Copy link
Member

/approve

LGTM @cri-o/cri-o-maintainers PTAL

@haircommander
Copy link
Member

oops, sorry 🙃

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 10, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: haircommander, jrvaldes

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 openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 10, 2023
@jrvaldes
Copy link
Contributor Author

/cherry-pick release-1.23

@openshift-cherrypick-robot

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

Details

In response to this:

/cherry-pick release-1.23

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.

@haircommander
Copy link
Member

wait

/hold

I just realized we need to drop the second commit. we shouldn't be making a default change here, we should be just allowing for the wipe to be skipped by an empty version_file_persist (i.e. just c2af294)

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 11, 2023
@jrvaldes jrvaldes force-pushed the cherry-pick-6022-to-release-1.24 branch from 541502b to c2af294 Compare January 11, 2023 15:12
@jrvaldes
Copy link
Contributor Author

wait

/hold

I just realized we need to drop the second commit. we shouldn't be making a default change here, we should be just allowing for the wipe to be skipped by an empty version_file_persist (i.e. just c2af294)

Addressed. For my own education, what makes the diff from release-1.25?

Will this be the case for release-1.23 as well?

@haircommander PTAL.

@haircommander
Copy link
Member

Addressed. For my own education, what makes the diff from release-1.25?

the diff comes because it was released with 1.25.0. Typically, we shouldn't be changing fields in the config or default values in a z stream, unless there's a very good reason. Otherwise, folks upgrading hoping for stability will be potentially met with an unexpected config change.

Will this be the case for release-1.23 as well?

yup!

@haircommander
Copy link
Member

@saschagrunert PTAL

@haircommander
Copy link
Member

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 11, 2023
@haircommander
Copy link
Member

/retest

@haircommander
Copy link
Member

@jrvaldes can you update the PR description and the release note to drop the default change piece

@jrvaldes
Copy link
Contributor Author

@jrvaldes can you update the PR description and the release note to drop the default change piece

Done

@haircommander
Copy link
Member

/test e2e-gcp
/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 19, 2023
@jrvaldes
Copy link
Contributor Author

/retest-required

1 similar comment
@jrvaldes
Copy link
Contributor Author

jrvaldes commented Feb 3, 2023

/retest-required

@openshift-cherrypick-robot

@jrvaldes: new pull request created: #6608

Details

In response to this:

/cherry-pick release-1.23

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.

@jrvaldes jrvaldes changed the title [release-1.24] do not wipe images by default OCPBUGS-4849: [release-1.24] do not wipe images by default Feb 13, 2023
@openshift-ci-robot
Copy link

@jrvaldes: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-4849 has been moved to the MODIFIED state.

Details

In response to this:

This is a manual backport of 935652c

Do not wipe images when the filename is empty.

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.

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. 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.

5 participants