-
Notifications
You must be signed in to change notification settings - Fork 1.1k
OCPBUGS-4849: [release-1.24] do not wipe images by default #6509
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
OCPBUGS-4849: [release-1.24] do not wipe images by default #6509
Conversation
Codecov Report
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 , 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) |
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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)?
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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)
bb3d811 to
541502b
Compare
|
/approve LGTM @cri-o/cri-o-maintainers PTAL |
|
oops, sorry 🙃 |
|
[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 DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/cherry-pick release-1.23 |
|
@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. DetailsIn response to this:
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. |
|
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 |
541502b to
c2af294
Compare
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. |
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.
yup! |
|
@saschagrunert PTAL |
|
/hold cancel |
|
/retest |
|
@jrvaldes can you update the PR description and the release note to drop the default change piece |
Done |
|
/test e2e-gcp |
|
/retest-required |
1 similar comment
|
/retest-required |
|
@jrvaldes: new pull request created: #6608 DetailsIn response to this:
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: All pull requests linked via external trackers have merged: Jira Issue OCPBUGS-4849 has been moved to the MODIFIED state. DetailsIn response to this:
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. |
This is a manual backport of 935652c