[release-4.19] OCPBUGS-77221: Prevent unnecessary systemd unit disable by isabella-janssen · Pull Request #5688 · openshift/machine-config-operator

isabella-janssen · 2026-02-24T13:59:04Z

Closes: OCPBUGS-77221

- What I did
This is a manual cherrypick of #5664, which was needed due to the OCL and standard update paths being separate in <=4.19 (ref #4996 for 4.20 convergence of code path).

- How to verify it
See #5148 (comment) and #5612 (comment) for verification details.

- Description for the changelog
OCPBUGS-77221: Prevent unnecessary systemd unit disable

openshift-ci · 2026-02-24T13:59:09Z

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

isabella-janssen · 2026-02-24T13:59:12Z

/test verify

isabella-janssen · 2026-02-24T14:04:34Z

/jira cherrypick OCPBUGS-76921

openshift-ci-robot · 2026-02-24T14:04:45Z

@isabella-janssen: Jira Issue OCPBUGS-76921 has been cloned as Jira Issue OCPBUGS-77221. Will retitle bug to link to clone.
/retitle OCPBUGS-77221: Prevent unnecessary systemd unit disable

Details

In response to this:

/jira cherrypick OCPBUGS-76921

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 openshift-eng/jira-lifecycle-plugin repository.

openshift-ci-robot · 2026-02-24T14:05:03Z

@isabella-janssen: This pull request references Jira Issue OCPBUGS-77221, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.22.0) matches configured target version for branch (4.22.0)
bug is in the state New, 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.

Details

In response to this:

Closes: OCPBUGS-

What I did
This is a manual cherrypick of [release-4.20] OCPBUGS-76921: Prevent unnecessary systemd unit disable #5664.

How to verify it
See OCPBUGS-58023: Prevent unnecessary systemd unit disable #5148 (comment) and OCPBUGS-74692: Write all units when forcefile exists to recover from systemd unit config drift #5612 (comment) for verification details.

Description for the changelog
: Prevent unnecessary systemd unit disable

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 openshift-eng/jira-lifecycle-plugin repository.

isabella-janssen · 2026-02-24T14:06:10Z

/retitle [release-4.19] OCPBUGS-77221: Prevent unnecessary systemd unit disable

openshift-ci-robot · 2026-02-24T14:06:27Z

@isabella-janssen: This pull request references Jira Issue OCPBUGS-77221, which is invalid:

expected the bug to target either version "4.19." or "openshift-4.19.", but it targets "4.22.0" instead
expected dependent Jira Issue OCPBUGS-76921 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is ON_QA instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

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

Details

In response to this:

Closes: OCPBUGS-

What I did
This is a manual cherrypick of [release-4.20] OCPBUGS-76921: Prevent unnecessary systemd unit disable #5664.

How to verify it
See OCPBUGS-58023: Prevent unnecessary systemd unit disable #5148 (comment) and OCPBUGS-74692: Write all units when forcefile exists to recover from systemd unit config drift #5612 (comment) for verification details.

Description for the changelog
: Prevent unnecessary systemd unit disable

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 openshift-eng/jira-lifecycle-plugin repository.

update: only write added or updated systemd units unless forcefile exists then rewrite all systemd units on_disk_validation: check if systemd units in config enabled correctly tests: update MCN condition transition test to account for quick transitions through 'Unknown' state (cherry picked from commit 4512ec4)

isabella-janssen · 2026-02-24T14:14:35Z

/test verify

isabella-janssen · 2026-02-24T14:33:52Z

/test verify

isabella-janssen · 2026-02-24T14:46:56Z

/test verify

isabella-janssen · 2026-02-24T15:09:22Z

/test verify

isabella-janssen · 2026-02-24T15:24:29Z

/test all

openshift-ci · 2026-03-02T11:20:37Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: isabella-janssen, pablintino

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:

~~OWNERS~~ [isabella-janssen,pablintino]

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

isabella-janssen · 2026-03-03T19:45:37Z

/test unit

isabella-janssen · 2026-03-03T20:19:04Z

/test unit

isabella-janssen · 2026-03-05T15:38:04Z

/label backport-risk-assessed

ptalgulk01 · 2026-03-09T13:29:34Z

Pre-merge verified:

Environment Setup:
OCP version: 4.19.0-0-2026-03-09-055948-test-ci-ln-fgidiyt-latest
Platform: AWS

Steps:
Executed below test-case related to config_drift

"[sig-mco] MCO config drift Author:sregidor-Longduration-NonPreRelease-High-46943-[P1][OnCLayer] Config Drift. Config file. [Serial]"
"[sig-mco] MCO config drift Author:sregidor-Longduration-NonPreRelease-High-46999-[P1] Config Drift. Config file permissions. [Serial]"
"[sig-mco] MCO config drift Author:sregidor-Longduration-NonPreRelease-High-47045-[P2] Config Drift. Compressed files. [Serial]"
"[sig-mco] MCO Author:sregidor-Longduration-NonPreRelease-High-47008-Config Drift. Dropin file. [Serial]"
"[sig-mco] MCO config drift Author:sregidor-Longduration-NonPreRelease-High-47009-Config Drift. New Service Unit. [Serial]"
"[sig-mco] MCO Author:ptalgulk-NonHyperShiftHOST-NonPreRelease-Longduration-High-74540-[P1][OnCLayer] kubelet does not start after reboot due to dependency issue[Disruptive] [Serial]"

Applied the below MC

oc apply -f - << EOF
apiVersion: machineconfiguration.openshift.io/v1
kind: MachineConfig
metadata:
  labels:
    machineconfiguration.openshift.io/role: worker
  name: check-worker
spec:
  config:
    ignition:
      version: 3.2.0
    systemd:
      units:
      - contents: |
          [Unit]
          Description=Restart the host
          [Service]
          Type=oneshot
          ExecStart=/usr/sbin/shutdown -r now
        enabled: true
        name: restart-host.service
      - contents: |
          [Unit]
          Description=Timer to gracefully restart the host
          [Timer]
          OnCalendar=*-*-* 02:00:00 UTC
          Persistent=true
          [Install]
          WantedBy=timers.target
        enabled: true
        name: restart-host.timer
EOF
machineconfig.machineconfiguration.openshift.io/check-worker created

Edited the the MC eg:
OnCalendar=* 02:00:00 UTC to OnCalendar=* 04:00:00 UTC
Monitored the MCD logs and verified MCP update is complete.
No issues seen.

/label qe-approve
/verified by @ptalgulk01

openshift-ci · 2026-03-09T13:29:38Z

@ptalgulk01: The label(s) /label qe-approve cannot be applied. These labels are supported: acknowledge-critical-fixes-only, platform/aws, platform/azure, platform/baremetal, platform/google, platform/libvirt, platform/openstack, ga, tide/merge-method-merge, tide/merge-method-rebase, tide/merge-method-squash, px-approved, docs-approved, qe-approved, ux-approved, no-qe, downstream-change-needed, rebase/manual, cluster-config-api-changed, run-integration-tests, approved, backport-risk-assessed, bugzilla/valid-bug, cherry-pick-approved, jira/valid-bug, ok-to-test, stability-fix-approved, staff-eng-approved. Is this label configured under labels -> additional_labels or labels -> restricted_labels in plugin.yaml?

Details

In response to this:

Pre-merge verified:

Environment Setup:
OCP version: 4.19.0-0-2026-03-09-055948-test-ci-ln-fgidiyt-latest
Platform: AWS

Steps:
Executed below test-case related to config_drift

"[sig-mco] MCO config drift Author:sregidor-Longduration-NonPreRelease-High-46943-[P1][OnCLayer] Config Drift. Config file. [Serial]"
"[sig-mco] MCO config drift Author:sregidor-Longduration-NonPreRelease-High-46999-[P1] Config Drift. Config file permissions. [Serial]"
"[sig-mco] MCO config drift Author:sregidor-Longduration-NonPreRelease-High-47045-[P2] Config Drift. Compressed files. [Serial]"
"[sig-mco] MCO Author:sregidor-Longduration-NonPreRelease-High-47008-Config Drift. Dropin file. [Serial]"
"[sig-mco] MCO config drift Author:sregidor-Longduration-NonPreRelease-High-47009-Config Drift. New Service Unit. [Serial]"
"[sig-mco] MCO Author:ptalgulk-NonHyperShiftHOST-NonPreRelease-Longduration-High-74540-[P1][OnCLayer] kubelet does not start after reboot due to dependency issue[Disruptive] [Serial]"

Applied the below MC

oc apply -f - << EOF
apiVersion: machineconfiguration.openshift.io/v1
kind: MachineConfig
metadata:
 labels:
   machineconfiguration.openshift.io/role: worker
 name: check-worker
spec:
 config:
   ignition:
     version: 3.2.0
   systemd:
     units:
     - contents: |
         [Unit]
         Description=Restart the host
         [Service]
         Type=oneshot
         ExecStart=/usr/sbin/shutdown -r now
       enabled: true
       name: restart-host.service
     - contents: |
         [Unit]
         Description=Timer to gracefully restart the host
         [Timer]
         OnCalendar=*-*-* 02:00:00 UTC
         Persistent=true
         [Install]
         WantedBy=timers.target
       enabled: true
       name: restart-host.timer
EOF
machineconfig.machineconfiguration.openshift.io/check-worker created

Edited the the MC eg:
OnCalendar=* 02:00:00 UTC to OnCalendar=* 04:00:00 UTC
Monitored the MCD logs and verified MCP update is complete.
No issues seen.

/label qe-approve
/verified by @ptalgulk01

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-sigs/prow repository.

openshift-ci-robot · 2026-03-09T13:29:46Z

@ptalgulk01: This PR has been marked as verified by @ptalgulk01.

Details

In response to this:

Pre-merge verified:

Environment Setup:
OCP version: 4.19.0-0-2026-03-09-055948-test-ci-ln-fgidiyt-latest
Platform: AWS

Steps:
Executed below test-case related to config_drift

"[sig-mco] MCO config drift Author:sregidor-Longduration-NonPreRelease-High-46943-[P1][OnCLayer] Config Drift. Config file. [Serial]"
"[sig-mco] MCO config drift Author:sregidor-Longduration-NonPreRelease-High-46999-[P1] Config Drift. Config file permissions. [Serial]"
"[sig-mco] MCO config drift Author:sregidor-Longduration-NonPreRelease-High-47045-[P2] Config Drift. Compressed files. [Serial]"
"[sig-mco] MCO Author:sregidor-Longduration-NonPreRelease-High-47008-Config Drift. Dropin file. [Serial]"
"[sig-mco] MCO config drift Author:sregidor-Longduration-NonPreRelease-High-47009-Config Drift. New Service Unit. [Serial]"
"[sig-mco] MCO Author:ptalgulk-NonHyperShiftHOST-NonPreRelease-Longduration-High-74540-[P1][OnCLayer] kubelet does not start after reboot due to dependency issue[Disruptive] [Serial]"

Applied the below MC

oc apply -f - << EOF
apiVersion: machineconfiguration.openshift.io/v1
kind: MachineConfig
metadata:
 labels:
   machineconfiguration.openshift.io/role: worker
 name: check-worker
spec:
 config:
   ignition:
     version: 3.2.0
   systemd:
     units:
     - contents: |
         [Unit]
         Description=Restart the host
         [Service]
         Type=oneshot
         ExecStart=/usr/sbin/shutdown -r now
       enabled: true
       name: restart-host.service
     - contents: |
         [Unit]
         Description=Timer to gracefully restart the host
         [Timer]
         OnCalendar=*-*-* 02:00:00 UTC
         Persistent=true
         [Install]
         WantedBy=timers.target
       enabled: true
       name: restart-host.timer
EOF
machineconfig.machineconfiguration.openshift.io/check-worker created

Edited the the MC eg:
OnCalendar=* 02:00:00 UTC to OnCalendar=* 04:00:00 UTC
Monitored the MCD logs and verified MCP update is complete.
No issues seen.

/label qe-approve
/verified by @ptalgulk01

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 openshift-eng/jira-lifecycle-plugin repository.

isabella-janssen · 2026-03-09T13:35:33Z

/test unit

isabella-janssen · 2026-03-09T13:56:15Z

/cherrypick release-4.18 release-4.17

openshift-cherrypick-robot · 2026-03-09T13:56:18Z

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

Details

In response to this:

/cherrypick release-4.18 release-4.17

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-sigs/prow repository.

openshift-ci · 2026-03-09T18:04:58Z

@isabella-janssen: all tests passed!

Full PR test history. Your PR dashboard.

Details

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

openshift-ci-robot · 2026-03-09T18:10:25Z

@isabella-janssen: Jira Issue Verification Checks: Jira Issue OCPBUGS-77221
✔️ This pull request was pre-merge verified.
✔️ All associated pull requests have merged.
✔️ All associated, merged pull requests were pre-merge verified.

Jira Issue OCPBUGS-77221 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓

Details

In response to this:

Closes: OCPBUGS-77221

- What I did
This is a manual cherrypick of #5664, which was needed due to the OCL and standard update paths being separate in <=4.19 (ref #4996 for 4.20 convergence of code path).

- How to verify it
See #5148 (comment) and #5612 (comment) for verification details.

- Description for the changelog
OCPBUGS-77221: Prevent unnecessary systemd unit disable

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 openshift-eng/jira-lifecycle-plugin repository.

openshift-cherrypick-robot · 2026-03-09T18:11:18Z

@isabella-janssen: new pull request created: #5751

Details

In response to this:

/cherrypick release-4.18 release-4.17

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-sigs/prow repository.

openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 24, 2026

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 24, 2026

openshift-ci bot changed the title ~~Prevent unnecessary systemd unit disable~~ OCPBUGS-77221: Prevent unnecessary systemd unit disable Feb 24, 2026

openshift-ci bot requested a review from sergiordlr February 24, 2026 14:05

openshift-ci bot changed the title ~~OCPBUGS-77221: Prevent unnecessary systemd unit disable~~ [release-4.19] OCPBUGS-77221: Prevent unnecessary systemd unit disable Feb 24, 2026

isabella-janssen changed the base branch from main to release-4.19 February 24, 2026 14:06

openshift-ci-robot added jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. and removed jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Feb 24, 2026

isabella-janssen force-pushed the ocpbugs-58023-419 branch from f5a73fa to cd32621 Compare February 24, 2026 14:14

fix

1976bc7

fix

c8acea3

fix

4b8f17e

isabella-janssen marked this pull request as ready for review February 27, 2026 16:43

openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 27, 2026

openshift-ci bot assigned pablintino Mar 2, 2026

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 2, 2026

openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Mar 5, 2026

openshift-ci bot assigned anuragthehatter, imatza-rh, lyman9966, mhanss, ptalgulk01, rbbratta, rioliu-rh, sergiordlr and zhaozhanqi Mar 5, 2026

openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Mar 9, 2026

openshift-merge-bot bot merged commit c7b7e15 into openshift:release-4.19 Mar 9, 2026
14 checks passed

openshift-cherrypick-robot mentioned this pull request Mar 9, 2026

[release-4.18] OCPBUGS-78056: Prevent unnecessary systemd unit disable #5751

Closed

isabella-janssen mentioned this pull request Mar 11, 2026

[release-4.18] OCPBUGS-78056: Prevent unnecessary systemd unit disable #5758

Merged

isabella-janssen deleted the ocpbugs-58023-419 branch March 11, 2026 14:07

Conversation

isabella-janssen commented Feb 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci bot commented Feb 24, 2026

Uh oh!

isabella-janssen commented Feb 24, 2026

Uh oh!

isabella-janssen commented Feb 24, 2026

Uh oh!

openshift-ci-robot commented Feb 24, 2026

Uh oh!

openshift-ci-robot commented Feb 24, 2026

Uh oh!

isabella-janssen commented Feb 24, 2026

Uh oh!

openshift-ci-robot commented Feb 24, 2026

Uh oh!

isabella-janssen commented Feb 24, 2026

Uh oh!

isabella-janssen commented Feb 24, 2026

Uh oh!

isabella-janssen commented Feb 24, 2026

Uh oh!

isabella-janssen commented Feb 24, 2026

Uh oh!

isabella-janssen commented Feb 24, 2026

Uh oh!

openshift-ci bot commented Mar 2, 2026

Uh oh!

isabella-janssen commented Mar 3, 2026

Uh oh!

isabella-janssen commented Mar 3, 2026

Uh oh!

isabella-janssen commented Mar 5, 2026

Uh oh!

ptalgulk01 commented Mar 9, 2026

Uh oh!

openshift-ci bot commented Mar 9, 2026

Uh oh!

openshift-ci-robot commented Mar 9, 2026

Uh oh!

isabella-janssen commented Mar 9, 2026

Uh oh!

isabella-janssen commented Mar 9, 2026

Uh oh!

openshift-cherrypick-robot commented Mar 9, 2026

Uh oh!

openshift-ci bot commented Mar 9, 2026

Uh oh!

Uh oh!

openshift-ci-robot commented Mar 9, 2026

Uh oh!

openshift-cherrypick-robot commented Mar 9, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

14 participants

isabella-janssen commented Feb 24, 2026 •

edited

Loading