Skip to content

Conversation

@osmman
Copy link
Collaborator

@osmman osmman commented Apr 11, 2025

@osmman osmman marked this pull request as ready for review April 11, 2025 11:40
@openshift-ci
Copy link

openshift-ci bot commented Apr 11, 2025

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@osmman
Copy link
Collaborator Author

osmman commented Apr 11, 2025

Build-fbc fails because of #1034

@osmman osmman force-pushed the tturek/SECURESIGN-2150 branch from a53005b to 851b021 Compare April 11, 2025 13:21
@osmman
Copy link
Collaborator Author

osmman commented Apr 14, 2025

/cherry-pick release-1.2

@openshift-cherrypick-robot

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

In response to this:

/cherry-pick release-1.2

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.

@osmman osmman requested review from bouskaJ and tommyd450 April 14, 2025 12:39
@openshift-ci
Copy link

openshift-ci bot commented Apr 14, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JasonPowr, osmman

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

@osmman osmman merged commit 796c3a5 into main Apr 14, 2025
18 of 20 checks passed
@osmman osmman deleted the tturek/SECURESIGN-2150 branch April 14, 2025 13:54
@openshift-cherrypick-robot

@osmman: #1033 failed to apply on top of branch "release-1.2":

Applying: fix: add fulcio's legacy unix socket into no_proxy env vars
Using index info to reconstruct a base tree...
A	internal/controller/common/utils/kubernetes/ensure/deployment/deployment.go
A	internal/controller/common/utils/kubernetes/ensure/set_proxy_test.go
A	internal/controller/common/utils/kubernetes/ensure/utils.go
M	internal/controller/fulcio/actions/deployment.go
Falling back to patching base and 3-way merge...
Auto-merging internal/controller/fulcio/actions/deployment.go
CONFLICT (content): Merge conflict in internal/controller/fulcio/actions/deployment.go
Auto-merging internal/controller/common/utils/set_proxy_test.go
CONFLICT (content): Merge conflict in internal/controller/common/utils/set_proxy_test.go
CONFLICT (rename/delete): internal/controller/common/utils/kubernetes/ensure/utils.go deleted in HEAD and renamed to internal/controller/common/utils/kubernetes/ensure/set_proxy.go in fix: add fulcio's legacy unix socket into no_proxy env vars. Version fix: add fulcio's legacy unix socket into no_proxy env vars of internal/controller/common/utils/kubernetes/ensure/set_proxy.go left in tree.
CONFLICT (modify/delete): internal/controller/common/utils/kubernetes/ensure/deployment/deployment.go deleted in HEAD and modified in fix: add fulcio's legacy unix socket into no_proxy env vars. Version fix: add fulcio's legacy unix socket into no_proxy env vars of internal/controller/common/utils/kubernetes/ensure/deployment/deployment.go 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 fix: add fulcio's legacy unix socket into no_proxy env vars

In response to this:

/cherry-pick release-1.2

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.

@osmman osmman added the bug Something isn't working label Jun 9, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved bug Something isn't working lgtm

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants