Skip to content

[release-4.21] OCPBUGS-91985: fall back to kube-system/global-pull-secret for Insights token#1310

Open
openshift-cherrypick-robot wants to merge 2 commits into
openshift:release-4.21from
openshift-cherrypick-robot:cherry-pick-1302-to-release-4.21
Open

[release-4.21] OCPBUGS-91985: fall back to kube-system/global-pull-secret for Insights token#1310
openshift-cherrypick-robot wants to merge 2 commits into
openshift:release-4.21from
openshift-cherrypick-robot:cherry-pick-1302-to-release-4.21

Conversation

@openshift-cherrypick-robot

Copy link
Copy Markdown

This is an automated cherry-pick of #1302

/assign opokornyy

judexzhu and others added 2 commits June 24, 2026 07:05
On ARO HCP clusters, openshift-config/pull-secret only contains the ACR
registry credential — no cloud.openshift.com token. Customers add their
Red Hat pull secret (including cloud.openshift.com) day-2 via the
additional-pull-secret method, which HCCO merges into
kube-system/global-pull-secret.

This change makes updateToken() check kube-system/global-pull-secret as
a fallback when openshift-config/pull-secret has no cloud.openshift.com
token, enabling Insights reporting on HCP clusters without requiring
platform-level changes.

Changes:
- Generalize fetchSecret() to accept a namespace parameter
- Add fallback lookup to kube-system/global-pull-secret in updateToken()
- Add read-only RBAC (Role+RoleBinding) for global-pull-secret in kube-system
- Include namespace in fetchSecret log/error messages for debuggability
- Add tests for fallback and primary-wins-over-fallback precedence

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Addresses review feedback to replace hardcoded string literals with
named constants for better readability and maintainability.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@coderabbitai

coderabbitai Bot commented Jun 24, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

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: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: 77292efb-5d23-419f-b534-204e27f24d36

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

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

@openshift-ci openshift-ci Bot requested review from katushiik11 and opokornyy June 24, 2026 07:05
@opokornyy

Copy link
Copy Markdown
Contributor

/cc @judexzhu

@openshift-ci openshift-ci Bot requested a review from judexzhu June 24, 2026 07:06
@openshift-ci-robot

Copy link
Copy Markdown
Contributor

@openshift-cherrypick-robot: Jira Issue OCPBUGS-87889 has been cloned as Jira Issue OCPBUGS-91985. Will retitle bug to link to clone.
/retitle [release-4.21] OCPBUGS-91985: fall back to kube-system/global-pull-secret for Insights token

Details

In response to this:

This is an automated cherry-pick of #1302

/assign opokornyy

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.21] OCPBUGS-87889: fall back to kube-system/global-pull-secret for Insights token [release-4.21] OCPBUGS-91985: fall back to kube-system/global-pull-secret for Insights token Jun 24, 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 Jun 24, 2026
@openshift-ci-robot

Copy link
Copy Markdown
Contributor

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-91985, 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.
  • expected dependent Jira Issue OCPBUGS-87889 to target a version in 4.22.0, but it targets "5.0.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.

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 #1302

/assign opokornyy

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.

@opokornyy

Copy link
Copy Markdown
Contributor

/jira refresh

@openshift-ci-robot

Copy link
Copy Markdown
Contributor

@opokornyy: This pull request references Jira Issue OCPBUGS-91985, which is invalid:

  • expected dependent Jira Issue OCPBUGS-88026 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.

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.

@opokornyy

Copy link
Copy Markdown
Contributor

/test insights-runtime-extractor-tests

@opokornyy

Copy link
Copy Markdown
Contributor

/retest

1 similar comment
@opokornyy

Copy link
Copy Markdown
Contributor

/retest

@judexzhu

Copy link
Copy Markdown
Contributor

/lgtm

@judexzhu

Copy link
Copy Markdown
Contributor

/retest-required

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jun 24, 2026
@opokornyy

Copy link
Copy Markdown
Contributor

/retest

@opokornyy

Copy link
Copy Markdown
Contributor

/override ci/prow/e2e-gcp-ovn-techpreview

Failures are caused by a known issue in the python kubernetes client

@opokornyy

Copy link
Copy Markdown
Contributor

/override ci/prow/insights-operator-e2e-tests

Failures are caused by a known issue in the python kubernetes client

@openshift-ci

openshift-ci Bot commented Jun 25, 2026

Copy link
Copy Markdown

@opokornyy: Overrode contexts on behalf of opokornyy: ci/prow/e2e-gcp-ovn-techpreview

Details

In response to this:

/override ci/prow/e2e-gcp-ovn-techpreview

Failures are caused by a known issue in the python kubernetes client

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

openshift-ci Bot commented Jun 25, 2026

Copy link
Copy Markdown

@opokornyy: Overrode contexts on behalf of opokornyy: ci/prow/insights-operator-e2e-tests

Details

In response to this:

/override ci/prow/insights-operator-e2e-tests

Failures are caused by a known issue in the python kubernetes client

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

openshift-ci Bot commented Jun 25, 2026

Copy link
Copy Markdown

@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-ovn-techpreview 2069d58 link true /test e2e-gcp-ovn-techpreview
ci/prow/insights-operator-e2e-tests 2069d58 link true /test insights-operator-e2e-tests

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.

@opokornyy

Copy link
Copy Markdown
Contributor

/lgtm

@opokornyy

Copy link
Copy Markdown
Contributor

/approve

@opokornyy

Copy link
Copy Markdown
Contributor

/verified later @judexzhu

@openshift-ci-robot openshift-ci-robot added verified-later verified Signifies that the PR passed pre-merge verification criteria labels Jun 25, 2026
@openshift-ci-robot

Copy link
Copy Markdown
Contributor

@opokornyy: This PR has been marked to be verified later by @judexzhu.

Details

In response to this:

/verified later @judexzhu

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 commented Jun 25, 2026

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

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

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 the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 25, 2026
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. jira/invalid-bug Indicates that a referenced Jira bug is invalid 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

Development

Successfully merging this pull request may close these issues.

4 participants