[release-4.21] OCPBUGS-74009: lib/resourcemerge/core: Reconcile ConfigMap binaryData too #1295
Conversation
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.
|
Important Review skippedAuto reviews are limited based on label configuration. 🚫 Review skipped — only excluded labels are configured. (1)
Please check the settings in the CodeRabbit UI or the You can disable this status message by setting the Comment |
|
@openshift-cherrypick-robot: Jira Issue OCPBUGS-73929 has been cloned as Jira Issue OCPBUGS-74009. Will retitle bug to link to clone. DetailsIn response to this:
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
bot
changed the title
openshift-ci-robot
added
jira/severity-moderate
|
@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-74009, which is valid. The bug has been moved to the POST state. 7 validation(s) were run on this bug
Requesting review from QA contact: The bug has been updated to refer to the pull request using the external bug tracker. DetailsIn response to this:
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-cherrypick-robot: all tests passed! Full PR test history. Your PR dashboard. DetailsInstructions 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. |
|
/assign @wking @hongkailiu |
|
/lgtm |
|
/appove |
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: hongkailiu, openshift-cherrypick-robot, theobarberbany The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
bot
added
the
approved
|
/label backport-risk-assessed |
openshift-ci
bot
added
the
backport-risk-assessed
|
Are you able to also verify it? Or should I ask QE? TY |
|
Repeating my 4.22/dev verification steps, this time with a $ oc -n openshift-cluster-api get -o jsonpath-as-json='{.binaryData.components\-zstd}' configmap aws | cut -b -80
[
"KLUv/QRolCYC2g+iWDOgaoxqDt6xwE7Zvyk57mwiafsazqcoDN8KhhZ3P5BbAujrQ8ApDwHPgX1
]
$ oc -n openshift-cluster-api patch configmap aws --type json -p '[{"op": "add", "path": "/binaryData/components-zstd", "value": "dGVzdGluZwo="}]'
configmap/aws patched
$ oc -n openshift-cluster-version logs -l k8s-app=cluster-version-operator --tail -1 | grep -i 'openshift-cluster-api/aws\|Result of work' | tail -n3
I0120 18:18:58.576914 1 task_graph.go:564] Result of work: errs=[]
I0120 18:21:52.031544 1 task_graph.go:564] Result of work: errs=[]
I0120 18:24:45.535156 1 task_graph.go:564] Result of work: errs=[]
$ oc -n openshift-cluster-api get -o jsonpath-as-json='{.binaryData.components\-zstd}' configmap aws | cut -b -80
[
"dGVzdGluZwo="
]
$ oc -n openshift-cluster-version logs -l k8s-app=cluster-version-operator --tail -1 | grep -i 'openshift-cluster-api/aws\|Result of work' | tail -n3
I0120 18:24:45.535156 1 task_graph.go:564] Result of work: errs=[]
I0120 18:27:37.754228 1 core.go:138] Updating ConfigMap openshift-cluster-api/aws due to diff: &v1.ConfigMap{
I0120 18:27:39.036554 1 task_graph.go:564] Result of work: errs=[]
$ oc -n openshift-cluster-api get -o jsonpath-as-json='{.binaryData.components\-zstd}' configmap aws | cut -b -80
[
"KLUv/QRolCYC2g+iWDOgaoxqDt6xwE7Zvyk57mwiafsazqcoDN8KhhZ3P5BbAujrQ8ApDwHPgX1
]So this one looks good to me too :) /verified by @wking |
openshift-ci-robot
added
the
verified
|
@wking: This PR has been marked as verified by DetailsIn response to this:
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-merge-bot
bot
merged commit 6fb3e84
into
openshift:release-4.21
|
@openshift-cherrypick-robot: Jira Issue Verification Checks: Jira Issue OCPBUGS-74009 Jira Issue OCPBUGS-74009 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓 DetailsIn response to this:
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-cherrypick-robot: new pull request created: #1303 DetailsIn response to this:
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. |
6 participants
This is an automated cherry-pick of #1294
/assign damdo
/cherrypick release-4.20