WIP

[isabella-janssen]

PR #5688 introduced a bug in the rollback logic for systemd unit updates. When an update fails and needs to roll back, the code was using the forward-direction unit diffs (old->new) instead of recalculating the reverse-direction diffs (new->old). This caused incomplete rollbacks that could leave systemd units in an inconsistent state.

This issue manifested during upgrades where kube-apiserver pods failed to terminate gracefully, likely because kubelet or related systemd units weren't properly restored during rollback.

The fix ensures that:

1. In updateOnClusterLayering: configs are properly swapped (was using oldIgnConfig->newIgnConfig, now uses newIgnConfig->oldIgnConfig)
2. In all three update functions: unit diffs are recalculated for the rollback direction (new->old) to ensure only the correct units are written during rollback

Related: OCPBUGS-77221, OCPBUGS-58023
Test failure: periodic-ci-openshift-release-main-nightly-4.22-e2e-aws-ovn-upgrade-fips

- What I did

- How to verify it

- Description for the changelog

[openshift-ci]

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

[coderabbitai]

Important

Review skipped

Auto reviews are limited based on label configuration.

🚫 Excluded labels (none allowed) (1)

• do-not-merge/work-in-progress

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: b14473be-82f7-47d6-8a23-c50f2253bfad

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests

📝 Coding Plan

• Generate coding plan for human review comments

---

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[isabella-janssen]

/payload-job periodic-ci-openshift-release-main-nightly-4.22-e2e-aws-ovn-upgrade-fips

[openshift-ci]

@isabella-janssen: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

• periodic-ci-openshift-release-main-nightly-4.22-e2e-aws-ovn-upgrade-fips

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/8c879890-22f3-11f1-8dd6-21b60c063f9a-0

[isabella-janssen]

/payload-job periodic-ci-openshift-release-main-nightly-4.19-e2e-aws-ovn-upgrade-fips

[openshift-ci]

@isabella-janssen: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

• periodic-ci-openshift-release-main-nightly-4.19-e2e-aws-ovn-upgrade-fips

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/933271b0-22f3-11f1-9079-205649f0ebe8-0

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: 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 [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]

/payload-aggregate periodic-ci-openshift-release-main-nightly-4.19-e2e-aws-ovn-upgrade-fips 7

[openshift-ci]

@isabella-janssen: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

• periodic-ci-openshift-release-main-nightly-4.19-e2e-aws-ovn-upgrade-fips

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/d4ec9fd0-23c6-11f1-9fd3-a09afc387bd4-0