Skip to content

[release-4.21] OCPBUGS-77371: fix(sync-global-pullsecret): compare content ignoring trailing newlines#7809

Open
openshift-cherrypick-robot wants to merge 1 commit intoopenshift:release-4.21from
openshift-cherrypick-robot:cherry-pick-7638-to-release-4.21
Open

[release-4.21] OCPBUGS-77371: fix(sync-global-pullsecret): compare content ignoring trailing newlines#7809
openshift-cherrypick-robot wants to merge 1 commit intoopenshift:release-4.21from
openshift-cherrypick-robot:cherry-pick-7638-to-release-4.21

Conversation

@openshift-cherrypick-robot

This is an automated cherry-pick of #7638

/assign devguyio

Remove newline preservation logic that caused E2E mismatch. Add
KubeletRestarter interface for testability with mock injection.

Generated with Claude Code 2.1.31 (Claude Opus 4.5)
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Signed-off-by: Ahmed Abdalla <aabdelre@redhat.com>
@coderabbitai
Copy link
Contributor

coderabbitai bot commented Feb 26, 2026

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.

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
  • Post copyable unit tests in a comment

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

@openshift-ci-robot
Copy link

@openshift-cherrypick-robot: Jira Issue OCPBUGS-67262 has been cloned as Jira Issue OCPBUGS-77371. Will retitle bug to link to clone.
/retitle [release-4.21] OCPBUGS-77371: fix(sync-global-pullsecret): compare content ignoring trailing newlines

Details

In response to this:

This is an automated cherry-pick of #7638

/assign devguyio

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 openshift-ci bot changed the title [release-4.21] OCPBUGS-67262: fix(sync-global-pullsecret): compare content ignoring trailing newlines [release-4.21] OCPBUGS-77371: fix(sync-global-pullsecret): compare content ignoring trailing newlines Feb 26, 2026
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Feb 26, 2026
@openshift-ci-robot
Copy link

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-77371, which is invalid:

  • 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 dependent Jira Issue OCPBUGS-67262 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is POST 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:

This is an automated cherry-pick of #7638

/assign devguyio

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.

@devguyio
Copy link
Contributor

/jira refresh

@openshift-ci-robot
Copy link

@devguyio: This pull request references Jira Issue OCPBUGS-77371, which is invalid:

  • expected dependent Jira Issue OCPBUGS-67262 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is POST 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.

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.

@enxebre
Copy link
Member

enxebre commented Feb 26, 2026

/approve

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 26, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: enxebre, openshift-cherrypick-robot

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:

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 26, 2026
@devguyio
Copy link
Contributor

/lgtm

@devguyio
Copy link
Contributor

/area ci-tooling

@openshift-ci openshift-ci bot added lgtm Indicates that a PR is ready to be merged. area/ci-tooling Indicates the PR includes changes for CI or tooling and removed do-not-merge/needs-area labels Feb 26, 2026
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 26, 2026

@openshift-cherrypick-robot: The following test 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-aks f0797db link true /test e2e-aks

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. area/ci-tooling Indicates the PR includes changes for CI or tooling jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants