Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SECURESIGN-1002] Move creation of cli server to manager startup cycle #450

Merged
merged 1 commit into from
Jun 19, 2024

Conversation

osmman
Copy link
Contributor

@osmman osmman commented Jun 19, 2024

No description provided.

@openshift-ci openshift-ci bot requested review from JasonPowr and lance June 19, 2024 09:46
Copy link
Contributor

@JasonPowr JasonPowr left a comment

Choose a reason for hiding this comment

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

/lgtm

Copy link

openshift-ci bot commented Jun 19, 2024

[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

@JasonPowr
Copy link
Contributor

/cherrypick release-1.0

@openshift-cherrypick-robot

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

In response to this:

/cherrypick release-1.0

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-bot openshift-merge-bot bot merged commit a349b60 into main Jun 19, 2024
11 checks passed
@openshift-cherrypick-robot

@JasonPowr: #450 failed to apply on top of branch "release-1.0":

Applying: Move creation of cli server to manager startup cycle
Using index info to reconstruct a base tree...
M	Dockerfile
M	Dockerfile.rhtas-operator.rh
A	cmd/main.go
A	internal/controller/common/utils/kubernetes/common.go
Falling back to patching base and 3-way merge...
Auto-merging main.go
CONFLICT (content): Merge conflict in main.go
Auto-merging Dockerfile.rhtas-operator.rh
CONFLICT (content): Merge conflict in Dockerfile.rhtas-operator.rh
Auto-merging Dockerfile
CONFLICT (content): Merge conflict in Dockerfile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Move creation of cli server to manager startup cycle
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-1.0

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 deleted the SECURESIGN-1002_cli branch June 19, 2024 13:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants