Skip to content

[release-4.20] OCPBUGS-74177: lib/resourcemerge/core: Reconcile ConfigMap binaryData too #1303

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
openshift-cherrypick-robot wants to merge 1 commit into
base: release-4.20
Choose a base branch
from
Open

[release-4.20] OCPBUGS-74177: lib/resourcemerge/core: Reconcile ConfigMap binaryData too #1303

openshift-cherrypick-robot wants to merge 1 commit into from
+16 −0

Conversation

@openshift-cherrypick-robot
Copy link

@openshift-cherrypick-robot openshift-cherrypick-robot commented Jan 20, 2026

This is an automated cherry-pick of #1295

/assign openshift-cherrypick-robot

@wking
lib/resourcemerge/core: Reconcile ConfigMap binaryData too
79e0104 
Since 4.20, some Cluster-API ConfigMap manifests have wanted to set
this:

  $ oc adm release extract --to manifests quay.io/openshift-release-dev/ocp-release:4.20.10-x86_64
  $ grep -r binaryData manifests
  manifests/0000_30_cluster-api_04_cm.infrastructure-aws.yaml:binaryData:

so we need to compare the in-cluster ConfigMap with this property as
well, when deciding if the resource needs updating.
@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Jan 20, 2026
Merged
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Jan 20, 2026

@openshift-cherrypick-robot: Jira Issue OCPBUGS-74009 has been cloned as Jira Issue OCPBUGS-74177. Will retitle bug to link to clone.
/retitle [release-4.20] OCPBUGS-74177: lib/resourcemerge/core: Reconcile ConfigMap binaryData too

Details

In response to this:

This is an automated cherry-pick of #1295

/assign openshift-cherrypick-robot

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

coderabbitai bot commented Jan 20, 2026 •
edited
Loading

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.

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

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

@openshift-ci openshift-ci bot changed the title [release-4.20] OCPBUGS-74009: lib/resourcemerge/core: Reconcile ConfigMap binaryData too [release-4.20] OCPBUGS-74177: lib/resourcemerge/core: Reconcile ConfigMap binaryData too Jan 20, 2026
@openshift-ci-robot openshift-ci-robot added jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. 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 Jan 20, 2026
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Jan 20, 2026

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

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

/assign openshift-cherrypick-robot

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.

@damdo
Copy link
Member

damdo commented Jan 20, 2026

/assign @hongkailiu @wking

damdo
damdo reviewed Jan 20, 2026
View reviewed changes
Copy link
Member

@damdo damdo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 20, 2026
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 20, 2026

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: damdo, openshift-cherrypick-robot
Once this PR has been reviewed and has the lgtm label, please ask for approval from hongkailiu. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found 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

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

Reviewers

1 more reviewer

@damdo damdo damdo left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@wking wking

@hongkailiu hongkailiu

@damdo damdo

@openshift-cherrypick-robot openshift-cherrypick-robot

Labels

jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. jira/severity-moderate Referenced Jira bug's severity is moderate 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

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@openshift-cherrypick-robot @openshift-ci-robot @damdo @wking @hongkailiu