OCPBUGS-46513: Fix issue with bridge flag for conditional CSP features

[TheRealJon]

No description provided.

[openshift-ci-robot]

@TheRealJon: This pull request references Jira Issue OCPBUGS-46513, 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.19.0) matches configured target version for branch (4.19.0)
• bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @yapei

The bug has been updated to refer to the pull request using the external bug tracker.

In 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.

[spadgett]

/lgtm

[TheRealJon]

/label acknowledge-critical-fixes-only

[TheRealJon]

/cherry-pick release-4.18

[openshift-cherrypick-robot]

@TheRealJon: once the present PR merges, I will cherry-pick it on top of release-4.18 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.18

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]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: spadgett, TheRealJon

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:

• cmd/OWNERS [TheRealJon,spadgett]

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

[rhamilto]

/retest

[TheRealJon]

/retest

[openshift-ci-robot]

/retest-required

Remaining retests: 0 against base HEAD fcbb414 and 2 for PR HEAD 7f1d3a4 in total

[openshift-ci-robot]

/retest-required

Remaining retests: 0 against base HEAD 73fcabf and 1 for PR HEAD 7f1d3a4 in total

[openshift-ci-robot]

/retest-required

Remaining retests: 0 against base HEAD 73fcabf and 2 for PR HEAD 7f1d3a4 in total

[yapei]

tested the fix and it's working well
/label qe-approved

[openshift-ci-robot]

@TheRealJon: This pull request references Jira Issue OCPBUGS-46513, which is valid.

3 validation(s) were run on this bug

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

Requesting review from QA contact:
/cc @yapei

In 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-robot]

/retest-required

Remaining retests: 0 against base HEAD c126b66 and 1 for PR HEAD 7f1d3a4 in total

[rhamilto]

/test okd-scos-e2e-aws-ovn

[openshift-ci]

@TheRealJon: 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/okd-scos-e2e-aws-ovn	7f1d3a4	link	false	/test okd-scos-e2e-aws-ovn
ci/prow/e2e-gcp-console	7f1d3a4	link	unknown	/test e2e-gcp-console

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]

@TheRealJon: Jira Issue OCPBUGS-46513: All pull requests linked via external trackers have merged:

• openshift/console#14710
• openshift/console-operator#957
• openshift/console#14727

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

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

@TheRealJon: #14727 failed to apply on top of branch "release-4.18":

Applying: OCPBUGS-46513: Fix issue with bridge flag for conditional CSP features
Using index info to reconstruct a base tree...
M	cmd/bridge/main.go
Falling back to patching base and 3-way merge...
Auto-merging cmd/bridge/main.go
CONFLICT (content): Merge conflict in cmd/bridge/main.go
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 OCPBUGS-46513: Fix issue with bridge flag for conditional CSP features

In response to this:

/cherry-pick release-4.18

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

[ART PR BUILD NOTIFIER]

Distgit: openshift-enterprise-console
This PR has been included in build openshift-enterprise-console-container-v4.19.0-202502080407.p0.g3bdcd54.assembly.stream.el9.
All builds following this will include this PR.