Skip to content

[release-4.19] OCPBUGS-78742: fix(sync-global-pullsecret): compare content ignoring trailing newlines#7992

Merged
openshift-merge-bot[bot] merged 1 commit intoopenshift:release-4.19from
openshift-cherrypick-robot:cherry-pick-7976-to-release-4.19
Mar 19, 2026
Merged

[release-4.19] OCPBUGS-78742: fix(sync-global-pullsecret): compare content ignoring trailing newlines#7992
openshift-merge-bot[bot] merged 1 commit intoopenshift:release-4.19from
openshift-cherrypick-robot:cherry-pick-7976-to-release-4.19

Conversation

@openshift-cherrypick-robot

This is an automated cherry-pick of #7976

/assign sjenning

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>
@openshift-ci-robot
Copy link

@openshift-cherrypick-robot: An error was encountered cloning bug for cherrypick for bug OCPBUGS-78741 on the Jira server at https://redhat.atlassian.net. No known errors were detected, please see the full error message for details.

Full error message. request failed. Please analyze the request body for more details. Status code: 400: {"errorMessages":["[CHART] Date of First Response: Invalid date format. Please enter the date in the format \"d/MMM/yy\"."],"errors":{"customfield_10024":"Invalid date format. Please enter the date in the format \"d/MMM/yy\"."}}

Please contact an administrator to resolve this issue, then request a bug refresh with /jira refresh.
/retitle [release-4.19] : fix(sync-global-pullsecret): compare content ignoring trailing newlines

Details

In response to this:

This is an automated cherry-pick of #7976

/assign sjenning

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
Copy link
Contributor

coderabbitai bot commented Mar 17, 2026

Important

Review skipped

Auto reviews are limited based on label configuration.

🚫 Review skipped — only excluded labels are configured. (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: fc9b9738-34fd-4047-a7c2-631a14ff5581

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.

@openshift-ci openshift-ci bot changed the title [release-4.19] OCPBUGS-78741: fix(sync-global-pullsecret): compare content ignoring trailing newlines [release-4.19] : fix(sync-global-pullsecret): compare content ignoring trailing newlines Mar 17, 2026
@sjenning
Copy link
Contributor

unmodified pick
/approve
/lgtm

@sjenning
Copy link
Contributor

/verified by e2e tests
Which are currently broken. If they pass, the fix works.

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Mar 17, 2026
@openshift-ci-robot
Copy link

@sjenning: This PR has been marked as verified by e2e tests.

Details

In response to this:

/verified by e2e tests
Which are currently broken. If they pass, the fix works.

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 requested review from hasueki and rtheis March 17, 2026 21:10
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 17, 2026

[APPROVALNOTIFIER] This PR is APPROVED

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

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 approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. labels Mar 17, 2026
@rtheis
Copy link
Contributor

rtheis commented Mar 17, 2026

/uncc @rtheis

@openshift-ci openshift-ci bot removed the request for review from rtheis March 17, 2026 21:12
@sjenning sjenning changed the title [release-4.19] : fix(sync-global-pullsecret): compare content ignoring trailing newlines [release-4.19] OCPBUGS-78742: fix(sync-global-pullsecret): compare content ignoring trailing newlines Mar 17, 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 Mar 17, 2026
@openshift-ci-robot
Copy link

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

  • expected Jira Issue OCPBUGS-78742 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:

This is an automated cherry-pick of #7976

/assign sjenning

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.

@sjenning
Copy link
Contributor

/jira refresh

@openshift-ci-robot 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 Mar 17, 2026
@openshift-ci-robot
Copy link

@sjenning: This pull request references Jira Issue OCPBUGS-78742, 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 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-78741 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-78741 targets the "4.20.z" version, which is one of the valid target versions: 4.20.0, 4.20.z
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira (yli2@redhat.com), skipping review request.

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.

@sjenning
Copy link
Contributor

/area control-plane-operator

@openshift-ci openshift-ci bot added area/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release and removed do-not-merge/needs-area labels Mar 17, 2026
@sjenning sjenning added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Mar 17, 2026
@bryan-cox
Copy link
Member

/retest-required

@bryan-cox
Copy link
Member

/retest

@sjenning
Copy link
Contributor

/override ci/prow/e2e-aws

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 19, 2026

@sjenning: Overrode contexts on behalf of sjenning: ci/prow/e2e-aws

Details

In response to this:

/override ci/prow/e2e-aws

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
Copy link
Contributor

openshift-ci bot commented Mar 19, 2026

@openshift-cherrypick-robot: 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-merge-bot openshift-merge-bot bot merged commit 6292155 into openshift:release-4.19 Mar 19, 2026
16 checks passed
@openshift-ci-robot
Copy link

@openshift-cherrypick-robot: Jira Issue Verification Checks: Jira Issue OCPBUGS-78742
✔️ 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-78742 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:

This is an automated cherry-pick of #7976

/assign sjenning

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.

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/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. jira/valid-bug Indicates that a referenced Jira bug is valid 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. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants