[release-4.20] OCPBUGS-76921: Prevent unnecessary systemd unit disable by isabella-janssen · Pull Request #5664 · openshift/machine-config-operator

isabella-janssen · 2026-02-13T18:20:51Z

- What I did
This is a manual cherrypick of #5648.

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

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

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)

openshift-ci · 2026-02-13T18:20:55Z

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-13T18:21:05Z

/jira cherrypick OCPBUGS-73805

openshift-ci-robot · 2026-02-13T18:21:16Z

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

Details

In response to this:

/jira cherrypick OCPBUGS-73805

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-13T18:21:28Z

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

expected dependent Jira Issue OCPBUGS-73805 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:

- What I did
This is a manual cherrypick of #5648.

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

- Description for the changelog
OCPBUGS-: 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-13T18:22:03Z

/test verify

isabella-janssen · 2026-02-13T19:07:44Z

/test all

isabella-janssen · 2026-02-16T13:15:36Z

/jira refresh

openshift-ci-robot · 2026-02-16T13:15:44Z

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

7 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.20.z) matches configured target version for branch (4.20.z)
bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
release note type set to "Release Note Not Required"
dependent bug Jira Issue OCPBUGS-73805 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
dependent Jira Issue OCPBUGS-73805 targets the "4.21.z" version, which is one of the valid target versions: 4.21.0, 4.21.z
bug has dependents

Requesting review from QA contact:
/cc @sergiordlr

Details

In response to this:

/jira refresh

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.

djoshy · 2026-02-16T14:38:20Z

clean backport; the only manual edit was the extended test suite I think?

/lgtm

/label backport-risk-assessed

openshift-ci · 2026-02-16T14:39:15Z

[APPROVALNOTIFIER] This PR is APPROVED

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

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~~ [djoshy,isabella-janssen]

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-02-16T14:39:36Z

the only manual edit was the extended test suite I think?

That's correct @djoshy

ptalgulk01 · 2026-02-23T11:42:57Z

Pre-merge verified:

Environment Setup:
OCP version: 4.20.0-0-2026-02-23-044741-test-ci-ln-2li9i22-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-02-23T11:43:00Z

@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.20.0-0-2026-02-23-044741-test-ci-ln-2li9i22-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-02-23T11:43:10Z

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

Details

In response to this:

Pre-merge verified:

Environment Setup:
OCP version: 4.20.0-0-2026-02-23-044741-test-ci-ln-2li9i22-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.

ptalgulk01 · 2026-02-23T11:43:21Z

/label qe-approved

openshift-ci-robot · 2026-02-23T11:43:29Z

@isabella-janssen: This pull request references Jira Issue OCPBUGS-76921, which is valid.

7 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.20.z) matches configured target version for branch (4.20.z)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
release note type set to "Release Note Not Required"
dependent bug Jira Issue OCPBUGS-73805 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
dependent Jira Issue OCPBUGS-73805 targets the "4.21.z" version, which is one of the valid target versions: 4.21.0, 4.21.z
bug has dependents

Requesting review from QA contact:
/cc @sergiordlr

Details

In response to this:

- What I did
This is a manual cherrypick of #5648.

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

- Description for the changelog
OCPBUGS-76921: 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-ci · 2026-02-23T15:12:25Z

@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-02-23T15:16:07Z

@isabella-janssen: Jira Issue Verification Checks: Jira Issue OCPBUGS-76921
✔️ 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-76921 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:

- What I did
This is a manual cherrypick of #5648.

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

- Description for the changelog
OCPBUGS-76921: 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-24T13:42:25Z

/cherrypick release-4.19 release-4.18 release 4.17

openshift-cherrypick-robot · 2026-02-24T13:43:08Z

@isabella-janssen: #5664 failed to apply on top of branch "release-4.19":

Applying: helpers: compute systemdUnits that added and changed between Ign configs 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 4512ec46f7b13a6e85588bbf480c4d029990724a)
Using index info to reconstruct a base tree...
M	pkg/controller/common/helpers.go
M	pkg/daemon/update.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/daemon/update.go
CONFLICT (content): Merge conflict in pkg/daemon/update.go
Auto-merging pkg/controller/common/helpers.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 helpers: compute systemdUnits that added and changed between Ign configs 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 4512ec46f7b13a6e85588bbf480c4d029990724a)

Details

In response to this:

/cherrypick release-4.19 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 13, 2026

openshift-ci Bot changed the title ~~Prevent unnecessary systemd unit disable~~ OCPBUGS-76921: Prevent unnecessary systemd unit disable Feb 13, 2026

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

isabella-janssen changed the title ~~OCPBUGS-76921: Prevent unnecessary systemd unit disable~~ [release-4.20] OCPBUGS-76921: Prevent unnecessary systemd unit disable Feb 13, 2026

openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Feb 16, 2026

openshift-ci-robot removed the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Feb 16, 2026

openshift-ci Bot requested a review from sergiordlr February 16, 2026 13:15

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

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 16, 2026

openshift-ci Bot requested review from pablintino and umohnani8 February 16, 2026 14:35

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

openshift-ci Bot assigned anuragthehatter, imatza-rh, lyman9966, mhanss and ptalgulk01 Feb 16, 2026

openshift-ci Bot assigned rbbratta, rioliu-rh, sergiordlr, zhaozhanqi and djoshy Feb 16, 2026

openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Feb 16, 2026

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

openshift-ci Bot added the qe-approved Signifies that QE has signed off on this PR label Feb 23, 2026

openshift-merge-bot Bot merged commit ecf42ae into openshift:release-4.20 Feb 23, 2026
16 checks passed

isabella-janssen deleted the ocpbugs-58023-420 branch February 24, 2026 13:41

isabella-janssen mentioned this pull request Feb 24, 2026

[release-4.19] OCPBUGS-77221: Prevent unnecessary systemd unit disable #5688

Merged

Conversation

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

Uh oh!

Uh oh!

openshift-ci Bot commented Feb 13, 2026

Uh oh!

isabella-janssen commented Feb 13, 2026

Uh oh!

openshift-ci-robot commented Feb 13, 2026

Uh oh!

openshift-ci-robot commented Feb 13, 2026

Uh oh!

isabella-janssen commented Feb 13, 2026

Uh oh!

isabella-janssen commented Feb 13, 2026

Uh oh!

isabella-janssen commented Feb 16, 2026

Uh oh!

openshift-ci-robot commented Feb 16, 2026

Uh oh!

djoshy commented Feb 16, 2026

Uh oh!

openshift-ci Bot commented Feb 16, 2026

Uh oh!

isabella-janssen commented Feb 16, 2026

Uh oh!

ptalgulk01 commented Feb 23, 2026

Uh oh!

openshift-ci Bot commented Feb 23, 2026

Uh oh!

openshift-ci-robot commented Feb 23, 2026

Uh oh!

ptalgulk01 commented Feb 23, 2026

Uh oh!

openshift-ci-robot commented Feb 23, 2026

Uh oh!

openshift-ci Bot commented Feb 23, 2026

Uh oh!

Uh oh!

openshift-ci-robot commented Feb 23, 2026

Uh oh!

isabella-janssen commented Feb 24, 2026

Uh oh!

openshift-cherrypick-robot commented Feb 24, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

14 participants

isabella-janssen commented Feb 13, 2026 •

edited

Loading