Bug 1875181: [4.4] crio: bump to v1.17.5#2056
Bug 1875181: [4.4] crio: bump to v1.17.5#2056haircommander wants to merge 2 commits intoopenshift:release-4.4from
Conversation
|
@haircommander: No Bugzilla bug is referenced in the title of this pull request. 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. |
|
@haircommander: This pull request references Bugzilla bug 1875181, which is invalid:
Comment 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. |
|
@runcom @kikisdeliveryservice @yuqi-zhang I believe I've done the correct vendoring. I ran |
|
Hmm this is a nontrivial PR targeted for 4.4. First: is this already fixed in 4.5? Does this really have the severity necessary to ship to 4.4? Are there any easy workarounds a 4.4 user could do instead? |
cgwalters
left a comment
There was a problem hiding this comment.
Also long term I think we need to better solve the fundamental structural problem that we have crio config in two places:
- Embedded in RHCOS as defaults
- Vendored in the MCO
And what would be much better IMO is to teach the MCO's rendering to use the drop-ins to only write values that it changed.
Yes, it's not an issue in 4.5 afaict, as 4.5 has a version of cri-o vendored that has this field
|
we recently started doing that if I'm not entirely mistaken, cc @umohnani8 |
|
Yup, in 4.5 we use drop-in files at crio.conf.d that only write the values have been changed. The drop-in files definitely avoid losing any information as everything else falls back to the cri-o defaults. |
|
/retest |
1 similar comment
|
/retest |
|
/bugzilla refresh |
|
@haircommander: This pull request references Bugzilla bug 1875181, which is invalid:
Comment 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. |
|
/bugzilla refresh |
|
@haircommander: This pull request references Bugzilla bug 1875181, which is valid. 6 validation(s) were run on this bug
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. |
|
@cgwalters do you still want changes here? @runcom PTAL |
|
LGTM |
|
LGTM but deferring to @cgwalters |
|
Ping @runcom @cgwalters |
|
Tentative I think someone else on the node team can add the /retest OK and it does look like there's at least an e2e that covers the container runtime configs in 4.4: https://github.com/openshift/machine-config-operator/blob/release-4.4/test/e2e/ctrcfg_test.go |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
2 similar comments
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
/hold |
|
Clearing stale cherry-pick-approved. I wish there were a way to stop retests without leaving the hold on here but I don't know of such a mechanism. Next Patch Manager please consult with the author to see what can be done to get this to merge successfully next week. |
|
/retest |
when the crio version falls out of sync with the verison in openshift, we end up rendering the incorect ignition config This fixes a problem where, upon creating a ctrcfg, we lose our default_env value Signed-off-by: Peter Hunt <pehunt@redhat.com>
d01c015 to
9814ba5
Compare
|
New changes are detected. LGTM label has been removed. |
|
let's see if a rebase fixes it! |
|
/retest |
Waiting for the previous MC isn't right here; we're deleting a config and so what we want to wait for is the previous pool target. Drop the racy `sleep()`.
|
also carrying #2229 |
|
/retest |
3 similar comments
|
/retest |
|
/retest |
|
/retest |
|
@haircommander: The following test failed, say
Full PR test history. Your PR dashboard. DetailsInstructions 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. I understand the commands that are listed here. |
|
/retest |
|
Are we still trying to get this into 4.4? |
|
yes but I have no idea why the test is failing and haven't had the capacity to check |
|
@haircommander: The following tests failed, say
Full PR test history. Your PR dashboard. DetailsInstructions 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. I understand the commands that are listed here. |
|
Issues go stale after 90d of inactivity. Mark the issue as fresh by commenting If this issue is safe to close now please do so with /lifecycle stale |
|
4.4 is EOL, good bye PR |
|
@haircommander: This pull request references Bugzilla bug 1875181. The bug has been updated to no longer refer to the pull request using the external bug tracker. 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. |
- What I did
when the crio version falls out of sync with the verison in openshift, we end up rendering the incorect ignition config
This fixes a problem where, upon creating a ctrcfg, we lose our default_env value
Signed-off-by: Peter Hunt pehunt@redhat.com
- How to verify it
run
crio configon a nodeapply any ctrcfg
run
crio configagaincheck the diff, noting the changes didn't strictly include that which came in the ctrcfg
note: this would be a good e2e test to add, however, running
crio configon a node has proven to be challenging. One has to chroot, or else there will be ldd issues. However, a combination of the way the go os/exec package works, along with the need to runchroot/ host /bin/bash -c 'crio confighas caused it to just fail for me. not sure why yet.- Description for the changelog