Skip to content

[release-4.20] OCPBUGS-61882: Add nil/null checks to image registry secret decode #5292

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
Merged
merged 1 commit into from
Sep 23, 2025
Merged

[release-4.20] OCPBUGS-61882: Add nil/null checks to image registry secret decode #5292

merged 1 commit into from
Sep 23, 2025

Conversation

openshift-cherrypick-robot
Copy link

This is an automated cherry-pick of #5253

/assign djoshy

@yuqi-zhang
Add nil/null checks to image registry secret decode
b12cccf 
The MCO pod can sometimes panic early on, seemingly with an empty docker
config json. Not sure if it's the json null literal, or if the decode
removed unknown fields to end up empty, so adding a check for both.
@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Sep 18, 2025
Merged
@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: Jira Issue OCPBUGS-60120 has been cloned as Jira Issue OCPBUGS-61882. Will retitle bug to link to clone.
/retitle [release-4.20] OCPBUGS-61882: Add nil/null checks to image registry secret decode

In response to this:

This is an automated cherry-pick of #5253

/assign djoshy

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.20] OCPBUGS-60120: Add nil/null checks to image registry secret decode [release-4.20] OCPBUGS-61882: Add nil/null checks to image registry secret decode Sep 18, 2025
@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 Sep 18, 2025
@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-61882, 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.

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.

In response to this:

This is an automated cherry-pick of #5253

/assign djoshy

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 djoshy and yuqi-zhang September 18, 2025 00:40
@djoshy
Copy link
Contributor

djoshy commented Sep 18, 2025

/lgtm

/label backport-risk-assessed

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Sep 18, 2025
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 18, 2025
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Sep 18, 2025

[APPROVALNOTIFIER] This PR is APPROVED

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

The full list of commands accepted by this bot can be found here.

The pull request process is described here

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 Sep 18, 2025
@yuqi-zhang
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 Sep 23, 2025
@openshift-ci-robot
Copy link
Contributor

@yuqi-zhang: This pull request references Jira Issue OCPBUGS-61882, 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.20.0) matches configured target version for branch (4.20.0)
  • 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-60120 is in the state Verified, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-60120 targets the "4.21.0" version, which is one of the valid target versions: 4.21.0
  • bug has dependents

Requesting review from QA contact:
/cc @sergiordlr

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.

@openshift-ci openshift-ci bot requested a review from sergiordlr September 23, 2025 00:39
@sdodson
Copy link
Member

sdodson commented Sep 23, 2025

/retest-required
The failed required jobs seem to be relatively flakey :-(

@sdodson
Copy link
Member

sdodson commented Sep 23, 2025

/verified later
Seems to have fixed the problem on master branch we can assume it will on this branch too but lets check back on runs after it merges

@openshift-ci-robot
Copy link
Contributor

@sdodson: Only users can be targets for the /verified later command.

In response to this:

/verified later
Seems to have fixed the problem on master branch we can assume it will on this branch too but lets check back on runs after it merges

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.

@sdodson
Copy link
Member

sdodson commented Sep 23, 2025

/verified later @ptalgulk01

@openshift-ci-robot openshift-ci-robot added verified-later verified Signifies that the PR passed pre-merge verification criteria labels Sep 23, 2025
@openshift-ci-robot
Copy link
Contributor

@sdodson: This PR has been marked to be verified later by @ptalgulk01.

In response to this:

/verified later @ptalgulk01

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

/retest-required

Remaining retests: 0 against base HEAD feec989 and 2 for PR HEAD b12cccf in total

@djoshy
Copy link
Contributor

djoshy commented Sep 23, 2025

/retest-required

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Sep 23, 2025 •
edited
Loading

@openshift-cherrypick-robot: The following tests 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-gcp-mco-disruptive b12cccf link false /test e2e-gcp-mco-disruptive
ci/prow/e2e-azure-ovn-upgrade-out-of-change b12cccf link false /test e2e-azure-ovn-upgrade-out-of-change
ci/prow/e2e-gcp-op-ocl b12cccf link false /test e2e-gcp-op-ocl
ci/prow/bootstrap-unit b12cccf link false /test bootstrap-unit
ci/prow/e2e-aws-mco-disruptive b12cccf link false /test e2e-aws-mco-disruptive

Full PR test history. Your PR dashboard.

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

/retest-required

Remaining retests: 0 against base HEAD 1e4bcd6 and 1 for PR HEAD b12cccf in total

@sdodson
Copy link
Member

sdodson commented Sep 23, 2025

/skip
optional, looks like all required tests have passed at least once so overriding everything until this merges

@sdodson
Copy link
Member

sdodson commented Sep 23, 2025

/override ci/prow/e2e-aws-ovn ci/prow/e2e-aws-ovn-upgrade ci/prow/e2e-gcp-op-1of2 ci/prow/e2e-gcp-op-2of2

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Sep 23, 2025

@sdodson: Overrode contexts on behalf of sdodson: ci/prow/e2e-aws-ovn, ci/prow/e2e-aws-ovn-upgrade, ci/prow/e2e-gcp-op-1of2, ci/prow/e2e-gcp-op-2of2

In response to this:

/override ci/prow/e2e-aws-ovn ci/prow/e2e-aws-ovn-upgrade ci/prow/e2e-gcp-op-1of2 ci/prow/e2e-gcp-op-2of2

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.

@sdodson sdodson merged commit ce66fd8 into openshift:release-4.20 Sep 23, 2025
20 of 21 checks passed
@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: Jira Issue OCPBUGS-61882: All pull requests linked via external trackers have merged:

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

In response to this:

This is an automated cherry-pick of #5253

/assign djoshy

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
Reviewers

@djoshy djoshy Awaiting requested review from djoshy

@yuqi-zhang yuqi-zhang Awaiting requested review from yuqi-zhang

@sergiordlr sergiordlr Awaiting requested review from sergiordlr

Assignees

@rbbratta rbbratta

@eurijon eurijon

@djoshy djoshy

@lyman9966 lyman9966

@anuragthehatter anuragthehatter

@sergiordlr sergiordlr

@imatza-rh imatza-rh

@rioliu-rh rioliu-rh

@mhanss mhanss

@ptalgulk01 ptalgulk01

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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 verified-later
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.