[release-4.19] OCPBUGS-86650: Apply password only if changes exist by pablintino · Pull Request #6097 · openshift/machine-config-operator

pablintino · 2026-05-28T07:34:32Z

This is a manual cherry-pick of #6068

- What I did

This change fixes the issue in SSH keys and user passwords that made the rollback useless as it tried to apply the new configuration instead of the previous one.

- How to verify it

TBD

- Description for the changelog

This change fixes the issue in SSH keys and user passwords that made the rollback useless as it tried to apply the new configuration instead of the previous one.

This bugfix ensures that the MCD only runs `usermod` if the password hash has actually changed and not in every update. This aligns the behavior we currently have for SSH passwords. Signed-off-by: Pablo Rodriguez Nava <git@amail.pablintino.eu>

When usermod -P is used, the last password change field is changed. When the MachineConfig is rolled back, this value remains the same even though the actual password value has been changed back to its previous value. Consequently, the E2E test should only compare the password hashes instead of the full line. Assisted-By: Claude Opus 4.6

openshift-merge-bot · 2026-05-28T07:34:35Z

Pipeline controller notification
This repo is configured to use the pipeline controller. Second-stage tests will be triggered either automatically or after lgtm label is added, depending on the repository configuration. The pipeline controller will automatically detect which contexts are required and will utilize /test Prow commands to trigger the second stage.

For optional jobs, comment /test ? to see a list of all defined jobs. To trigger manually all jobs from second stage use /pipeline required command.

This repository is configured in: LGTM mode

openshift-ci · 2026-05-28T07:34:37Z

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

openshift-ci-robot · 2026-05-28T07:34:41Z

@pablintino: This pull request references Jira Issue OCPBUGS-83830, which is invalid:

expected the bug to target either version "4.19." or "openshift-4.19.", but it targets "5.0.0" instead
expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is Verified instead
release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.
expected Jira Issue OCPBUGS-83830 to depend on a bug targeting a version in 4.20.0, 4.20.z and in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but no dependents were found

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-83830

This is a manual cherry-pick of #6068

- What I did

This change fixes the issue in SSH keys and user passwords that made the rollback useless as it tried to apply the new configuration instead of the previous one.

- How to verify it

TBD

- Description for the changelog

This change fixes the issue in SSH keys and user passwords that made the rollback useless as it tried to apply the new configuration instead of the previous one.

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.

coderabbitai · 2026-05-28T07:34:41Z

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

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: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: e1f76793-cdc3-43ee-956d-69818dafca1e

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

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

openshift-ci-robot · 2026-05-28T07:35:23Z

@pablintino: This pull request references Jira Issue OCPBUGS-86650, which is invalid:

expected dependent Jira Issue OCPBUGS-86313 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-83830

This is a manual cherry-pick of #6068

- What I did

This change fixes the issue in SSH keys and user passwords that made the rollback useless as it tried to apply the new configuration instead of the previous one.

- How to verify it

TBD

- Description for the changelog

This change fixes the issue in SSH keys and user passwords that made the rollback useless as it tried to apply the new configuration instead of the previous one.

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-05-28T20:14:52Z

/jira refresh

openshift-ci-robot · 2026-05-28T20:15:00Z

@isabella-janssen: This pull request references Jira Issue OCPBUGS-86650, 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.19.z) matches configured target version for branch (4.19.z)
bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)
release note type set to "Release Note Not Required"
dependent bug Jira Issue OCPBUGS-86313 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-86313 targets the "4.20.0" version, which is one of the valid target versions: 4.20.0, 4.20.z
bug has dependents

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.

isabella-janssen

/label backport-risk-assessed
/lgtm

openshift-merge-bot · 2026-05-28T20:17:20Z

Scheduling tests matching the pipeline_run_if_changed or not excluded by pipeline_skip_if_only_changed parameters:
/test e2e-aws-ovn
/test e2e-aws-ovn-upgrade
/test e2e-gcp-op
/test e2e-gcp-op-single-node
/test e2e-hypershift

openshift-ci · 2026-05-28T20:17:26Z

[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

pablintino · 2026-05-29T06:45:53Z

/retest-required

pablintino · 2026-06-01T20:11:13Z

/verify later @pablintino

isabella-janssen · 2026-06-02T02:04:52Z

/verified later @pablintino

openshift-ci-robot · 2026-06-02T02:05:05Z

@isabella-janssen: This PR has been marked to be verified later by @pablintino.

Details

In response to this:

/verified later @pablintino

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-06-02T02:46:25Z

@pablintino: 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-06-02T02:49:48Z

@pablintino: Jira Issue OCPBUGS-86650: All pull requests linked via external trackers have merged:

openshift/machine-config-operator#6097

This pull request has the verified-later tag and will need to be manually moved to VERIFIED after testing. Jira Issue OCPBUGS-86650 has been moved to the MODIFIED state.

Details

In response to this:

Closes: #OCPBUGS-83830

This is a manual cherry-pick of #6068

- What I did

This change fixes the issue in SSH keys and user passwords that made the rollback useless as it tried to apply the new configuration instead of the previous one.

- How to verify it

TBD

- Description for the changelog

This change fixes the issue in SSH keys and user passwords that made the rollback useless as it tried to apply the new configuration instead of the previous one.

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.

pablintino · 2026-06-02T07:14:43Z

/cherry-pick release-4.18

openshift-cherrypick-robot · 2026-06-02T07:15:38Z

@pablintino: new pull request created: #6113

Details

In response to this:

/cherry-pick release-4.18

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.

HarshwardhanPatil07

Post Merge Verification: Passed

Clusterversion: 4.19.0-0.nightly-2026-06-03-000446
Platform: AWS

Steps Performed:

Applied the MC

harshpat@harshpat-thinkpadp1gen4i:~/Downloads$ cat <<EOF | oc apply -f -
apiVersion: machineconfiguration.openshift.io/v1
kind: MachineConfig
metadata:
  name: 99-worker-core-password-test
  labels:
    machineconfiguration.openshift.io/role: worker
spec:
  config:
    ignition:
      version: 3.2.0
    passwd:
      users:
      - name: core
        passwordHash: "\$6\$rounds=4096\$saltsalt\$hashhash2"
EOF
machineconfig.machineconfiguration.openshift.io/99-worker-core-password-test created

Wait for rollout and Check the Logs

harshpat@harshpat-thinkpadp1gen4i:~/Downloads$ oc get mcp
NAME     CONFIG                                             UPDATED   UPDATING   DEGRADED   MACHINECOUNT   READYMACHINECOUNT   UPDATEDMACHINECOUNT   DEGRADEDMACHINECOUNT   AGE
master   rendered-master-f783fa9c086bc5314557cc597bc8d512   True      False      False      3              3                   3                     0                      40m
worker   rendered-worker-042169fd9c046a138afe87773c749037   True      False      False      3              3                   3                     0                      40m

harshpat@harshpat-thinkpadp1gen4i:~/Downloads$ oc logs -n openshift-machine-config-operator machine-config-daemon-4fjmm -c machine-config-daemon | grep -i pass
I0603 05:16:12.409538    2588 update.go:2970] "Starting update from rendered-worker-6c7f5c19bb1befc62c4c8646b3c3f27c to rendered-worker-caaa7bf5d4e59ce9f8f7ae97aa020b19: &{osUpdate:false kargs:false fips:false passwd:false files:true units:false kernelType:false extensions:false oclEnabled:false revertFromOCL:false}"
I0603 05:28:15.146853    2588 update.go:2970] "Starting update from rendered-worker-caaa7bf5d4e59ce9f8f7ae97aa020b19 to rendered-worker-042169fd9c046a138afe87773c749037: &{osUpdate:false kargs:false fips:false passwd:true files:false units:false kernelType:false extensions:false oclEnabled:false revertFromOCL:false}"
I0603 05:28:15.567308    2588 update.go:2546] Password has been configured

Update the password hash and Check Logs

      - name: core
        passwordHash: "\$6\$rounds=4096\$saltsalt\$differenthash3"

harshpat@harshpat-thinkpadp1gen4i:~/Downloads$ oc logs -n openshift-machine-config-operator machine-config-daemon-4fjmm -c machine-config-daemon | grep -i pass
I0603 05:16:12.409538    2588 update.go:2970] "Starting update from rendered-worker-6c7f5c19bb1befc62c4c8646b3c3f27c to rendered-worker-caaa7bf5d4e59ce9f8f7ae97aa020b19: &{osUpdate:false kargs:false fips:false passwd:false files:true units:false kernelType:false extensions:false oclEnabled:false revertFromOCL:false}"
I0603 05:28:15.146853    2588 update.go:2970] "Starting update from rendered-worker-caaa7bf5d4e59ce9f8f7ae97aa020b19 to rendered-worker-042169fd9c046a138afe87773c749037: &{osUpdate:false kargs:false fips:false passwd:true files:false units:false kernelType:false extensions:false oclEnabled:false revertFromOCL:false}"
I0603 05:28:15.567308    2588 update.go:2546] Password has been configured
I0603 05:33:28.910128    2588 update.go:2970] "Starting update from rendered-worker-042169fd9c046a138afe87773c749037 to rendered-worker-08289bd9cdf7cc5cac91ea7fbc317bf7: &{osUpdate:false kargs:false fips:false passwd:true files:false units:false kernelType:false extensions:false oclEnabled:false revertFromOCL:false}"
I0603 05:33:29.339289    2588 update.go:2546] Password has been configured

Add SSH key only (password hash unchanged)

        passwordHash: "\$6\$rounds=4096\$saltsalt\$differenthash3"
        sshAuthorizedKeys:
          - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCnewkey123... test-ssh-key

harshpat@harshpat-thinkpadp1gen4i:~/Downloads$ oc logs -n openshift-machine-config-operator machine-config-daemon-4fjmm -c machine-config-daemon | grep -i pass
I0603 05:16:12.409538    2588 update.go:2970] "Starting update from rendered-worker-6c7f5c19bb1befc62c4c8646b3c3f27c to rendered-worker-caaa7bf5d4e59ce9f8f7ae97aa020b19: &{osUpdate:false kargs:false fips:false passwd:false files:true units:false kernelType:false extensions:false oclEnabled:false revertFromOCL:false}"
I0603 05:28:15.146853    2588 update.go:2970] "Starting update from rendered-worker-caaa7bf5d4e59ce9f8f7ae97aa020b19 to rendered-worker-042169fd9c046a138afe87773c749037: &{osUpdate:false kargs:false fips:false passwd:true files:false units:false kernelType:false extensions:false oclEnabled:false revertFromOCL:false}"
I0603 05:28:15.567308    2588 update.go:2546] Password has been configured
I0603 05:33:28.910128    2588 update.go:2970] "Starting update from rendered-worker-042169fd9c046a138afe87773c749037 to rendered-worker-08289bd9cdf7cc5cac91ea7fbc317bf7: &{osUpdate:false kargs:false fips:false passwd:true files:false units:false kernelType:false extensions:false oclEnabled:false revertFromOCL:false}"
I0603 05:33:29.339289    2588 update.go:2546] Password has been configured
I0603 05:37:10.671565    2588 update.go:2970] "Starting update from rendered-worker-08289bd9cdf7cc5cac91ea7fbc317bf7 to rendered-worker-13c89b1d17c8ad92048e09168f87d6d9: &{osUpdate:false kargs:false fips:false passwd:true files:false units:false kernelType:false extensions:false oclEnabled:false revertFromOCL:false}"

Delete the MC

harshpat@harshpat-thinkpadp1gen4i:~/Downloads$ oc delete mc 99-worker-core-password-test
machineconfig.machineconfiguration.openshift.io "99-worker-core-password-test" deleted

pablintino and others added 2 commits May 28, 2026 09:12

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 May 28, 2026

pablintino marked this pull request as ready for review May 28, 2026 07: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 May 28, 2026

pablintino changed the title ~~[release-4.19] OCPBUGS-83830: Apply password only if changes exist~~ [release-4.19] OCPBUGS-86650: Apply password only if changes exist May 28, 2026

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

openshift-ci Bot requested review from cheesesashimi and djoshy May 28, 2026 07:35

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

isabella-janssen reviewed May 28, 2026

View reviewed changes

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

openshift-ci Bot assigned anuragthehatter, imatza-rh, mhanss, ptalgulk01, rbbratta, sergiordlr and isabella-janssen May 28, 2026

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

openshift-ci-robot added verified-later verified Signifies that the PR passed pre-merge verification criteria labels Jun 2, 2026

openshift-merge-bot Bot merged commit 09ddec7 into openshift:release-4.19 Jun 2, 2026
14 checks passed

openshift-cherrypick-robot mentioned this pull request Jun 2, 2026

[release-4.18] OCPBUGS-86845: Apply password only if changes exist #6113

Open

HarshwardhanPatil07 reviewed Jun 3, 2026

View reviewed changes

Conversation

pablintino commented May 28, 2026

Uh oh!

openshift-merge-bot Bot commented May 28, 2026

Uh oh!

openshift-ci Bot commented May 28, 2026

Uh oh!

openshift-ci-robot commented May 28, 2026

Uh oh!

coderabbitai Bot commented May 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Review skipped

Uh oh!

openshift-ci-robot commented May 28, 2026

Uh oh!

isabella-janssen commented May 28, 2026

Uh oh!

openshift-ci-robot commented May 28, 2026

Uh oh!

isabella-janssen left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-merge-bot Bot commented May 28, 2026

Uh oh!

openshift-ci Bot commented May 28, 2026

Uh oh!

pablintino commented May 29, 2026

Uh oh!

pablintino commented Jun 1, 2026

Uh oh!

isabella-janssen commented Jun 2, 2026

Uh oh!

openshift-ci-robot commented Jun 2, 2026

Uh oh!

openshift-ci Bot commented Jun 2, 2026

Uh oh!

Uh oh!

openshift-ci-robot commented Jun 2, 2026

Uh oh!

pablintino commented Jun 2, 2026

Uh oh!

openshift-cherrypick-robot commented Jun 2, 2026

Uh oh!

HarshwardhanPatil07 left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants

coderabbitai Bot commented May 28, 2026 •

edited

Loading