OCPBUGS-61183: cluster in workload identity mode is not applied with the token-auth-… #15459

cajieh · 2025-09-03T19:48:55Z

…azure annotation

openshift-ci-robot · 2025-09-03T19:49:10Z

@cajieh: This pull request references Jira Issue OCPBUGS-61183, 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:

…azure annotation

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.

cajieh · 2025-09-03T20:23:55Z

/jira refresh

openshift-ci-robot · 2025-09-03T20:24:04Z

@cajieh: This pull request references Jira Issue OCPBUGS-61183, 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 @yapei

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.

cajieh · 2025-09-04T12:19:33Z

/retest

cajieh · 2025-09-08T16:48:05Z

...d/packages/operator-lifecycle-manager/src/components/operator-hub/operator-hub-subscribe.tsx

  GridItem,
  Radio,
+  Stack,
+  StackItem,


Added these PF components to fix a margin issue, likely a regression from the recent Operator Hub changes. Although this was not part of the bug ticket.

A <Stack> with a single <StackItem> is a bit overkill to fix a margin issue. Simply adding a className="pf-v6-u-mb-md" to each <DismissableAlert> is a bit simpler.

Actually, I used the PF class at first but later changed to Stack based on previous feedback that discouraged the use of classes, although that work was more complex than this. I will go with your opinion.

The DismissableAlert was missing a className prop, so I added it to prevent the need for a wrapping div.

cajieh · 2025-09-08T20:24:45Z

frontend/packages/operator-lifecycle-manager/src/hooks/useOperatorCatalogItems.tsx

+      setTokenizedAuth('Azure');
+    } else if (clusterIsGCPWIF) {
+      setTokenizedAuth('GCP');
+    }


Could create a map of providers and use the .find() method to identify the first function that returns true, but I didn't see a need for it at this time. I might be wrong.

cajieh · 2025-09-09T11:27:31Z

/test okd-scos-e2e-aws-ovn

cajieh · 2025-09-11T12:30:46Z

/verified later @yapei

openshift-ci-robot · 2025-09-11T12:31:00Z

@cajieh: This PR has been marked to be verified later by @yapei.

Details

In response to this:

/verified later @yapei

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.

…azure annotation

rhamilto

/lgtm

openshift-ci · 2025-09-11T14:06:20Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cajieh, rhamilto, sg00dwin

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:

~~frontend/OWNERS~~ [cajieh,rhamilto]

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

cajieh · 2025-09-12T18:46:17Z

/verified later @yapei

cajieh · 2025-09-12T18:46:23Z

/retest

openshift-ci-robot · 2025-09-12T18:46:32Z

@cajieh: This PR has been marked to be verified later by @yapei.

Details

In response to this:

/verified later @yapei

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 · 2025-09-12T23:45:29Z

/retest-required

Remaining retests: 0 against base HEAD fd95953 and 2 for PR HEAD c054364 in total

openshift-ci · 2025-09-13T00:22:46Z

@cajieh: all tests passed!

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-ci-robot · 2025-09-13T00:25:25Z

@cajieh: Jira Issue OCPBUGS-61183: All pull requests linked via external trackers have merged:

openshift/console#15459

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

Details

In response to this:

…azure annotation

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.

cajieh · 2025-09-17T13:50:32Z

/cherry-pick release-4.20

openshift-cherrypick-robot · 2025-09-17T13:51:14Z

@cajieh: new pull request created: #15507

Details

In response to this:

/cherry-pick release-4.20

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-merge-robot · 2025-09-19T18:11:28Z

Fix included in accepted release 4.21.0-0.nightly-2025-09-13-162334

cajieh · 2025-10-02T18:11:37Z

/cherry-pick release-4.19

openshift-cherrypick-robot · 2025-10-02T18:12:48Z

@cajieh: #15459 failed to apply on top of branch "release-4.19":

Applying: cluster in workload identity mode is not applied with the token-auth-azure annotation
Using index info to reconstruct a base tree...
A	frontend/packages/console-shared/src/components/alerts/DismissableAlert.tsx
M	frontend/packages/operator-lifecycle-manager/src/components/operator-hub/operator-hub-subscribe.tsx
A	frontend/packages/operator-lifecycle-manager/src/hooks/useOperatorCatalogItems.tsx
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): frontend/packages/operator-lifecycle-manager/src/hooks/useOperatorCatalogItems.tsx deleted in HEAD and modified in cluster in workload identity mode is not applied with the token-auth-azure annotation. Version cluster in workload identity mode is not applied with the token-auth-azure annotation of frontend/packages/operator-lifecycle-manager/src/hooks/useOperatorCatalogItems.tsx left in tree.
Auto-merging frontend/packages/operator-lifecycle-manager/src/components/operator-hub/operator-hub-subscribe.tsx
CONFLICT (content): Merge conflict in frontend/packages/operator-lifecycle-manager/src/components/operator-hub/operator-hub-subscribe.tsx
CONFLICT (modify/delete): frontend/packages/console-shared/src/components/alerts/DismissableAlert.tsx deleted in HEAD and modified in cluster in workload identity mode is not applied with the token-auth-azure annotation. Version cluster in workload identity mode is not applied with the token-auth-azure annotation of frontend/packages/console-shared/src/components/alerts/DismissableAlert.tsx left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 cluster in workload identity mode is not applied with the token-auth-azure annotation

Details

In response to this:

/cherry-pick release-4.19

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.

cajieh · 2025-10-02T18:25:19Z

Oh, it appears this regression was introduced in 4.20, but the target version in the ticket is 4.17. I couldn't reproduce the issue in versions 4.19 or older, and I believe @yapei couldn't either, correct?

openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Sep 3, 2025

openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 3, 2025

openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Sep 3, 2025

openshift-ci bot requested review from TheRealJon and spadgett September 3, 2025 19:49

openshift-ci bot added component/olm Related to OLM approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Sep 3, 2025

cajieh force-pushed the cluster-workload-idp-mode-azure branch from c5e8fab to e64ba92 Compare September 3, 2025 20:02

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 3, 2025

openshift-ci bot requested a review from yapei September 3, 2025 20:24

cajieh force-pushed the cluster-workload-idp-mode-azure branch 2 times, most recently from 29ca6a1 to cfdad13 Compare September 8, 2025 14:41

cajieh changed the title ~~[WIP] OCPBUGS-61183: cluster in workload identity mode is not applied with the token-auth-…~~ OCPBUGS-61183: cluster in workload identity mode is not applied with the token-auth-… Sep 8, 2025

openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 8, 2025

cajieh changed the title ~~OCPBUGS-61183: cluster in workload identity mode is not applied with the token-auth-…~~ [WIP] OCPBUGS-61183: cluster in workload identity mode is not applied with the token-auth-… Sep 8, 2025

openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 8, 2025

cajieh force-pushed the cluster-workload-idp-mode-azure branch 2 times, most recently from 5fac09b to d4af0ee Compare September 8, 2025 14:53

cajieh changed the title ~~[WIP] OCPBUGS-61183: cluster in workload identity mode is not applied with the token-auth-…~~ OCPBUGS-61183: cluster in workload identity mode is not applied with the token-auth-… Sep 8, 2025

openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 8, 2025

cajieh commented Sep 8, 2025

View reviewed changes

cajieh force-pushed the cluster-workload-idp-mode-azure branch from d4af0ee to 64112b5 Compare September 8, 2025 20:14

cajieh commented Sep 8, 2025

View reviewed changes

sg00dwin approved these changes Sep 9, 2025

View reviewed changes

openshift-ci-robot added verified-later verified Signifies that the PR passed pre-merge verification criteria labels Sep 11, 2025

cajieh force-pushed the cluster-workload-idp-mode-azure branch from 64112b5 to d29415f Compare September 11, 2025 13:20

openshift-ci-robot removed verified Signifies that the PR passed pre-merge verification criteria verified-later labels Sep 11, 2025

cluster in workload identity mode is not applied with the token-auth-…

c054364

…azure annotation

cajieh force-pushed the cluster-workload-idp-mode-azure branch from d29415f to c054364 Compare September 11, 2025 13:49

openshift-ci bot added the component/shared Related to console-shared label Sep 11, 2025

rhamilto approved these changes Sep 11, 2025

View reviewed changes

openshift-ci bot assigned rhamilto Sep 11, 2025

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 11, 2025

openshift-ci-robot added verified-later verified Signifies that the PR passed pre-merge verification criteria labels Sep 12, 2025

openshift-merge-bot bot merged commit 2e1818e into openshift:main Sep 13, 2025
8 checks passed

openshift-cherrypick-robot mentioned this pull request Sep 17, 2025

[release-4.20] OCPBUGS-61861: cluster in workload identity mode is not applied with the token-auth-… #15507

Merged

OCPBUGS-61183: cluster in workload identity mode is not applied with the token-auth-… #15459

OCPBUGS-61183: cluster in workload identity mode is not applied with the token-auth-… #15459

Uh oh!

Conversation

cajieh commented Sep 3, 2025

Uh oh!

openshift-ci-robot commented Sep 3, 2025

Uh oh!

cajieh commented Sep 3, 2025

Uh oh!

openshift-ci-robot commented Sep 3, 2025

Uh oh!

cajieh commented Sep 4, 2025

Uh oh!

cajieh Sep 8, 2025

Choose a reason for hiding this comment

Uh oh!

rhamilto Sep 11, 2025

Choose a reason for hiding this comment

Uh oh!

cajieh Sep 11, 2025

Choose a reason for hiding this comment

Uh oh!

cajieh Sep 11, 2025

Choose a reason for hiding this comment

Uh oh!

cajieh Sep 8, 2025

Choose a reason for hiding this comment

Uh oh!

cajieh commented Sep 9, 2025

Uh oh!

cajieh commented Sep 11, 2025

Uh oh!

openshift-ci-robot commented Sep 11, 2025

Uh oh!

rhamilto left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-ci bot commented Sep 11, 2025

Uh oh!

cajieh commented Sep 12, 2025

Uh oh!

cajieh commented Sep 12, 2025

Uh oh!

openshift-ci-robot commented Sep 12, 2025

Uh oh!

openshift-ci-robot commented Sep 12, 2025

Uh oh!

openshift-ci bot commented Sep 13, 2025

Uh oh!

Uh oh!

openshift-ci-robot commented Sep 13, 2025

Uh oh!

cajieh commented Sep 17, 2025

Uh oh!

openshift-cherrypick-robot commented Sep 17, 2025

Uh oh!

openshift-merge-robot commented Sep 19, 2025

Uh oh!

cajieh commented Oct 2, 2025

Uh oh!

openshift-cherrypick-robot commented Oct 2, 2025

Uh oh!

cajieh commented Oct 2, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants