Merge OKD-specific changes into master#2778
Merge OKD-specific changes into master#2778openshift-merge-robot merged 1 commit intoopenshift:masterfrom
Conversation
|
Skipping CI for Draft Pull Request. |
|
/test okd-e2e-aws |
|
/test e2e-aws |
openshift-ci
Bot
added
the
needs-rebase
openshift-ci
Bot
removed
the
needs-rebase
openshift-ci
Bot
added
the
needs-rebase
openshift-ci
Bot
removed
the
needs-rebase
|
I know this is a draft, but just noting for future discussion, wondering why this is reverting a (relatively) new crio PR: #2805 I think for this type of change would prefer to do it as a separate PR, but that can wait for now while this is still in draft. |
temporary fix until we get crio 1.23 released, slack thread (I wasn't aware this PR gets autoupdated) |
| if err := validateExtensions(newConfig.Spec.Extensions); err != nil && dn.os.IsRHCOS() { | ||
| return err | ||
| } | ||
| // if err := validateExtensions(newConfig.Spec.Extensions); err != nil && dn.os.IsRHCOS() { |
There was a problem hiding this comment.
This probably can be dropped - afaik we don't use extensions since 4.8, so it won't affect upgrades.
I'll give that a try later on
There was a problem hiding this comment.
I believe this would be a no-op on FCOS anyway, due to the err != nil && dn.os.IsRHCOS(), no?
| // from /var/home/core/.ssh/authorized_keys.d/ignition if missing | ||
| if err := dn.writeMissingAuthorizedKeys(); err != nil { | ||
| return err | ||
| } |
| return tuneableFCOSArgsAllowlist[arg], nil | ||
| } | ||
| return false, nil | ||
| return true, nil |
There was a problem hiding this comment.
} else if os.IsFCOS() {
return true, nil
}
return false, nil
in order to still consider other systems this may run on, like RHEL.
| } | ||
|
|
||
| // Check to see if we need to tune kernel arguments | ||
| tuningChanged, err := daemon.UpdateTuningArgs(daemon.KernelTuningFile, daemon.CmdLineFile) |
There was a problem hiding this comment.
since we're not using the kernel-args file anymore for the bootstrap pivot in 4.9+, I think this commit can be dropped too
There was a problem hiding this comment.
We use kernel-args for bootstrap
There was a problem hiding this comment.
I think now that openshift/installer#5439 has merged, the installer doesn't use it anymore either. I think that was the last place?
| Restart=always | ||
| ExecStartPre=-/bin/sh -c '/usr/bin/chown -R ${OVS_USER_ID} /var/lib/openvswitch' | ||
| ExecStartPre=-/bin/sh -c '/usr/bin/chown -R ${OVS_USER_ID} /etc/openvswitch' | ||
| ExecStartPre=-/bin/sh -c '/usr/bin/chown -R ${OVS_USER_ID} /run/openvswitch' |
There was a problem hiding this comment.
We have to check if upgrades from 4.9 to 4.10 are still affected by this. If not, this commit can be dropped.
|
/uncc |
openshift-ci
Bot
added
the
needs-rebase
openshift-ci
Bot
removed
the
needs-rebase
vrutkovs
force-pushed
the
master-okd
branch
2 times, most recently
from
37613d3 to
f302aa1
Compare
|
@LorbusChris: 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. |
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: LorbusChris The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
vrutkovs
force-pushed
the
master-okd
branch
2 times, most recently
from
90c99ca to
adcc3bb
Compare
Recent podman in F35 is hanging during `cat`
5 participants
I'm opening this draft PR to open a forum for MCO and OKD maintainers to discuss how the OKD-specific changes to the MCO code base can be merged back into master. This would allow for dropping the fork and lighten the OKD maintenance burden.
I'd like to ask @fortinj66 and @vrutkovs to expand on the reasoning behind those individual changes, and provide links to associated issue/bug reports (if any). I am open to opening more fine-grained PRs against master for each issue addressed with these changes.
My hopes are this will make it easier for @openshift/openshift-team-mco to review the changes.