OCPBUGS-8113: daemon: Only switchkernel if we are doing an OS update or kernel change

[cgwalters]

This fixes a regression with the previous commit
8ac5bee where we would simply fail to roll out on RT node systems any further MachineConfig changes.

Also of note: It seems like this (quite common thing) is actually not in our CI here nor in the periodics.

[openshift-ci-robot]

@cgwalters: This pull request references Jira Issue OCPBUGS-8113, which is valid.

3 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.14.0) matches configured target version for branch (4.14.0)
• bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @sergiordlr

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

This fixes a regression with the previous commit
8ac5bee where we would simply fail to roll out on RT node systems any further MachineConfig changes.

Also of note: It seems like this (quite common thing) is actually not in our CI here nor in the periodics.

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]

xref #3599 (comment)

[sinnykumari]

yeah, this makes sense.
Before PR #3580, we were not hitting this issue because it was running rt->rt if condition and in that we run rpm-ostree update which was kind of no-op.
In new flow, we are resetting kernel-rt override first but only during OSUpdate/RT kernel switch. https://github.com/openshift/machine-config-operator/pull/3580/files#diff-349c0748c3f52201852d3027c29daf618b45300b949482728df6666a3f9ba245R2062 but we missed adding this guard during RT kernel apply.

/lgtm

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cgwalters, sinnykumari

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

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [cgwalters,sinnykumari]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[sinnykumari]

Don't think blocking this PR for qe is required as this is follow-up PR from QE performing test on OCPBUGS-8113

[openshift-ci-robot]

/retest-required

Remaining retests: 0 against base HEAD 7b3939c and 2 for PR HEAD 1440c41 in total

[cgwalters]

Going to
/override ci/prow/e2e-aws-ovn-upgrade
since this is a new CI-wide problem (see openshift/release#37135 )not related to this change, and that job is not using kernel-rt and we have sufficient non-kernel-rt from other jobs.

[openshift-ci]

@cgwalters: Overrode contexts on behalf of cgwalters: ci/prow/e2e-aws-ovn-upgrade

In response to this:

Going to
/override ci/prow/e2e-aws-ovn-upgrade
since this is a new CI-wide problem not related to this change, and that job is not using kernel-rt and we have sufficient non-kernel-rt from other jobs.

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-ci]

@cgwalters: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/e2e-hypershift	1440c41	link	false	/test e2e-hypershift
ci/prow/okd-scos-e2e-gcp-ovn-upgrade	1440c41	link	false	/test okd-scos-e2e-gcp-ovn-upgrade
ci/prow/e2e-alibabacloud-ovn	1440c41	link	false	/test e2e-alibabacloud-ovn

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

[cgwalters]

/skip

[cgwalters]

/cherrypick release-4.13

[openshift-cherrypick-robot]

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

In response to this:

/cherrypick release-4.13

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-ci-robot]

@cgwalters: Jira Issue OCPBUGS-8113: All pull requests linked via external trackers have merged:

• openshift/machine-config-operator#3580
• openshift/machine-config-operator#3599
• openshift/machine-config-operator#3600

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

In response to this:

This fixes a regression with the previous commit
8ac5bee where we would simply fail to roll out on RT node systems any further MachineConfig changes.

Also of note: It seems like this (quite common thing) is actually not in our CI here nor in the periodics.

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]

@cgwalters: new pull request created: #3602

In response to this:

/cherrypick release-4.13

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.