Skip to content

Conversation

vikram-raj
Copy link
Member

Manual cherry-pick of PR #15072

@openshift-ci-robot openshift-ci-robot added jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. 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 Aug 5, 2025
@openshift-ci-robot
Copy link
Contributor

@vikram-raj: This pull request references Jira Issue OCPBUGS-59997, which is invalid:

  • expected the vulnerability to target the "4.15.z" version, but no target version was set
  • 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 Jira Issue OCPBUGS-59997 to depend on a bug targeting a version in 4.16.0, 4.16.z and in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but no dependents were found

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:

Manual cherry-pick of PR #15072

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 florkbr and jhadvig August 5, 2025 07:39
@openshift-ci openshift-ci bot added component/backend Related to backend component/core Related to console core functionality component/dev-console Related to dev-console component/git-service Related to git-service component/pipelines Related to pipelines-plugin labels Aug 5, 2025
@openshift-ci openshift-ci bot added the component/shared Related to console-shared label Aug 5, 2025
@vikram-raj
Copy link
Member Author

/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 Aug 5, 2025
@openshift-ci-robot
Copy link
Contributor

@vikram-raj: This pull request references Jira Issue OCPBUGS-59997, 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.15.z) matches configured target version for branch (4.15.z)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note type set to "Release Note Not Required"
  • dependent bug Jira Issue OCPBUGS-56472 is in the state Closed (Done-Errata), which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-56472 targets the "4.16.z" version, which is one of the valid target versions: 4.16.0, 4.16.z
  • bug has dependents

Requesting review from QA contact:
/cc @yapei

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 yapei August 5, 2025 07:41
@vikram-raj
Copy link
Member Author

/assign @jhadvig

}

for key, values := range headers {
if slices.Contains(proxyHeaderDenyList, key) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like we will need to manually implement the replacement.

// contains checks if a slice contains a string value (replaces slices.Contains for Go 1.20 compatibility)
func contains(slice []string, item string) bool {
	for _, s := range slice {
		if s == item {
			return true
		}
	}
	return false
}

...
if contains(proxyHeaderDenyList, key) {
...

Copy link
Member

@jhadvig jhadvig left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm
/label backport-risk-assessed
/approve

@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 Aug 5, 2025
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 5, 2025
Copy link
Contributor

openshift-ci bot commented Aug 5, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jhadvig, vikram-raj

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 Aug 5, 2025
@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD 1b40de5 and 2 for PR HEAD 3f87518 in total

1 similar comment
@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD 1b40de5 and 2 for PR HEAD 3f87518 in total

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD 45ceec1 and 1 for PR HEAD 3f87518 in total

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD 45ceec1 and 2 for PR HEAD 3f87518 in total

1 similar comment
@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD 45ceec1 and 2 for PR HEAD 3f87518 in total

@vikram-raj
Copy link
Member Author

/retest

Copy link
Contributor

openshift-ci bot commented Aug 11, 2025

@vikram-raj: all tests passed!

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-merge-bot openshift-merge-bot bot merged commit 69615d5 into openshift:release-4.15 Aug 11, 2025
6 checks passed
@openshift-ci-robot
Copy link
Contributor

@vikram-raj: Jira Issue OCPBUGS-59997: All pull requests linked via external trackers have merged:

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

In response to this:

Manual cherry-pick of PR #15072

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.

@vikram-raj vikram-raj deleted the cherry-pick-15072-to-release-4.15 branch August 11, 2025 11:54
@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: openshift-enterprise-console
This PR has been included in build openshift-enterprise-console-container-v4.15.0-202508111206.p0.g69615d5.assembly.stream.el8.
All builds following this will include this PR.

@vikram-raj
Copy link
Member Author

/cherry-pick release-4.14

@openshift-cherrypick-robot

@vikram-raj: #15359 failed to apply on top of branch "release-4.14":

Applying: Remove the devconsole backend common internet proxy and replace it with dedicated ones
Using index info to reconstruct a base tree...
M	cmd/bridge/main.go
M	frontend/packages/console-shared/src/utils/proxy.ts
A	frontend/packages/pipelines-plugin/src/components/pipelineruns/utils/tekton-results.ts
M	frontend/packages/pipelines-plugin/src/const.ts
M	pkg/devconsole/proxy/proxy.go
M	pkg/devconsole/proxy/proxy_test.go
M	pkg/devconsole/proxy/types.go
M	pkg/server/server.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/server/server.go
CONFLICT (content): Merge conflict in pkg/server/server.go
CONFLICT (modify/delete): pkg/devconsole/proxy/types.go deleted in Remove the devconsole backend common internet proxy and replace it with dedicated ones and modified in HEAD. Version HEAD of pkg/devconsole/proxy/types.go left in tree.
CONFLICT (modify/delete): pkg/devconsole/proxy/proxy_test.go deleted in Remove the devconsole backend common internet proxy and replace it with dedicated ones and modified in HEAD. Version HEAD of pkg/devconsole/proxy/proxy_test.go left in tree.
CONFLICT (modify/delete): pkg/devconsole/proxy/proxy.go deleted in Remove the devconsole backend common internet proxy and replace it with dedicated ones and modified in HEAD. Version HEAD of pkg/devconsole/proxy/proxy.go left in tree.
Auto-merging frontend/packages/pipelines-plugin/src/const.ts
CONFLICT (content): Merge conflict in frontend/packages/pipelines-plugin/src/const.ts
CONFLICT (modify/delete): frontend/packages/pipelines-plugin/src/components/pipelineruns/utils/tekton-results.ts deleted in HEAD and modified in Remove the devconsole backend common internet proxy and replace it with dedicated ones. Version Remove the devconsole backend common internet proxy and replace it with dedicated ones of frontend/packages/pipelines-plugin/src/components/pipelineruns/utils/tekton-results.ts left in tree.
CONFLICT (modify/delete): frontend/packages/console-shared/src/utils/proxy.ts deleted in Remove the devconsole backend common internet proxy and replace it with dedicated ones and modified in HEAD. Version HEAD of frontend/packages/console-shared/src/utils/proxy.ts left in tree.
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 Remove the devconsole backend common internet proxy and replace it with dedicated ones

In response to this:

/cherry-pick release-4.14

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

Fix included in accepted release 4.15.0-0.nightly-2025-08-20-015949

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. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. component/backend Related to backend component/core Related to console core functionality component/dev-console Related to dev-console component/git-service Related to git-service component/pipelines Related to pipelines-plugin component/shared Related to console-shared jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.