OCPBUGS-62828: MCO degraded when an empty pull-secret is configured

[dkhater-redhat]

- What I did
Fixed a bug where MCO becomes degraded when an empty pull-secret is configured in the cluster. Modified
getImageRegistryPullSecrets() in pkg/operator/sync.go to gracefully handle empty pull-secrets by
checking if the pull-secret data is empty or contains only {} before attempting to convert and merge
it. When an empty pull-secret is detected, the operator now skips the merge operation instead of
erroring out. Also added test coverage in pkg/secrets/secrets_test.go for empty JSON object and null
literal edge cases.
- How to verify it
1. Configure an empty pull-secret in the cluster

$ oc -n openshift-config set data secret/pull-secret '.dockerconfigjson={}'

and verify MCO is not degraded.

- Description for the changelog

[openshift-ci-robot]

@dkhater-redhat: This pull request references Jira Issue OCPBUGS-62828, which is invalid:

• expected the bug to target the "4.21.0" version, but no target version was set

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:

- What I did
Fixed a bug where MCO becomes degraded when an empty pull-secret is configured in the cluster. Modified
getImageRegistryPullSecrets() in pkg/operator/sync.go to gracefully handle empty pull-secrets by
checking if the pull-secret data is empty or contains only {} before attempting to convert and merge
it. When an empty pull-secret is detected, the operator now skips the merge operation instead of
erroring out. Also added test coverage in pkg/secrets/secrets_test.go for empty JSON object and null
literal edge cases.
- How to verify it

1. Configure an empty pull-secret in the cluster

$ oc -n openshift-config set data secret/pull-secret '.dockerconfigjson={}'

and verify MCO is not degraded.

- Description for the changelog

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.

[dkhater-redhat]

/jira refresh

[openshift-ci-robot]

@dkhater-redhat: This pull request references Jira Issue OCPBUGS-62828, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.21.0) matches configured target version for branch (4.21.0)
• bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @sergiordlr

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.

[cheesesashimi]

praise: Thanks for adding these test cases!

[cheesesashimi]

/lgtm
/approve

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cheesesashimi, dkhater-redhat

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:

• OWNERS [cheesesashimi,dkhater-redhat]

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

[dkhater-redhat]

/test unit

[openshift-ci]

@dkhater-redhat: 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/bootstrap-unit	37cdfeb	link	false	/test bootstrap-unit

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-bot]

/jira refresh

The requirements for Jira bugs have changed (Jira issues linked to PRs on main branch need to target different OCP), recalculating validity.

[openshift-ci-robot]

@openshift-bot: This pull request references Jira Issue OCPBUGS-62828, which is invalid:

• expected the bug to target either version "4.22." or "openshift-4.22.", but it targets "4.21.0" 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

The requirements for Jira bugs have changed (Jira issues linked to PRs on main branch need to target different OCP), recalculating validity.

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.

[dkhater-redhat]

/test e2e-hypershift

[dkhater-redhat]

/jira refresh

[openshift-ci-robot]

@dkhater-redhat: This pull request references Jira Issue OCPBUGS-62828, which is valid.

3 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.22.0) matches configured target version for branch (4.22.0)
• bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @sergiordlr

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.

[sergiordlr]

Verified using IPI on AWS

Test case OCP-57595 has been modified to check the machine-config CO, so that this issue doesn't escape again.

Executed test cases:

• "[sig-mco] MCO Author:sregidor-NonPreRelease-Longduration-Medium-57595-[OnCLayer] Use empty pull-secret[Disruptive] [Serial]"
• "[sig-mco] MCO Author:mhanss-NonPreRelease-Longduration-High-42680-[P2] change pull secret in the openshift-config namespace [Serial]"

A MC deploying a file was properly deployed too.

No issues found.

/label qe-approved
/verified by @sergiordlr

[openshift-ci-robot]

@sergiordlr: This PR has been marked as verified by @sergiordlr.

Details

In response to this:

Verified using IPI on AWS

Test case OCP-57595 has been modified to check the machine-config CO, so that this issue doesn't escape again.

Executed test cases:

• "[sig-mco] MCO Author:sregidor-NonPreRelease-Longduration-Medium-57595-[OnCLayer] Use empty pull-secret[Disruptive] [Serial]"
• "[sig-mco] MCO Author:mhanss-NonPreRelease-Longduration-High-42680-[P2] change pull secret in the openshift-config namespace [Serial]"

A MC deploying a file was properly deployed too.

No issues found.

/label qe-approved
/verified by @sergiordlr

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]

@dkhater-redhat: This pull request references Jira Issue OCPBUGS-62828, which is valid.

3 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.22.0) matches configured target version for branch (4.22.0)
• bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @sergiordlr

Details

In response to this:

- What I did
Fixed a bug where MCO becomes degraded when an empty pull-secret is configured in the cluster. Modified
getImageRegistryPullSecrets() in pkg/operator/sync.go to gracefully handle empty pull-secrets by
checking if the pull-secret data is empty or contains only {} before attempting to convert and merge
it. When an empty pull-secret is detected, the operator now skips the merge operation instead of
erroring out. Also added test coverage in pkg/secrets/secrets_test.go for empty JSON object and null
literal edge cases.
- How to verify it

1. Configure an empty pull-secret in the cluster

$ oc -n openshift-config set data secret/pull-secret '.dockerconfigjson={}'

and verify MCO is not degraded.

- Description for the changelog

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.

[umohnani8]

Great work! LGTM

[dkhater-redhat]

/label acknowledge-critical-fixes-only

[openshift-ci-robot]

@dkhater-redhat: Jira Issue OCPBUGS-62828: Some pull requests linked via external trackers have merged:

The following pull request, linked via external tracker, has not merged:

• openshift/openshift-tests-private#27648 is open

All associated pull requests must be merged or unlinked from the Jira bug in order for it to move to the next state. Once unlinked, request a bug refresh with /jira refresh.

Jira Issue OCPBUGS-62828 has not been moved to the MODIFIED state.

This PR is marked as verified. If the remaining PRs listed above are marked as verified before merging, the issue will automatically be moved to VERIFIED after all of the changes from the PRs are available in an accepted nightly payload.

Details

In response to this:

- What I did
Fixed a bug where MCO becomes degraded when an empty pull-secret is configured in the cluster. Modified
getImageRegistryPullSecrets() in pkg/operator/sync.go to gracefully handle empty pull-secrets by
checking if the pull-secret data is empty or contains only {} before attempting to convert and merge
it. When an empty pull-secret is detected, the operator now skips the merge operation instead of
erroring out. Also added test coverage in pkg/secrets/secrets_test.go for empty JSON object and null
literal edge cases.
- How to verify it

1. Configure an empty pull-secret in the cluster

$ oc -n openshift-config set data secret/pull-secret '.dockerconfigjson={}'

and verify MCO is not degraded.

- Description for the changelog

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.

[dkhater-redhat]

/cherry-pick release-4.21

[openshift-cherrypick-robot]

@dkhater-redhat: new pull request created: #5499

Details

In response to this:

/cherry-pick release-4.21

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.