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

[release-4.12] Bug 2172832: CNV-23494 Ssh select load balancer #1073

Conversation

upalatucci
Copy link
Member

📝 Description

manual cherry-pick of three prs
#1036
#1043
#1052

Ticket with its two bugs

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 22, 2023

@upalatucci: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

In response to this:

Ssh select load balancer

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/test-infra repository.

@upalatucci upalatucci changed the title Ssh select load balancer [release-4.12] CNV-23494 Ssh select load balancer Feb 22, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 22, 2023

@upalatucci: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

In response to this:

[release-4.12] CNV-23494 Ssh select load balancer

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/test-infra repository.

@hstastna
Copy link

hstastna commented Feb 22, 2023

Ticket with its two bugs

@upalatucci Which 2 bugs are related to this PR? Or can you, please, provide the links of all the related tickets/bugs explicitly in the description of the PR? As there is no any clear number in the title, and only one BZ number is provided in one of the commits. Thanks in advance! :)

@upalatucci
Copy link
Member Author

#1036 is the feature
#1043 is a second pr that fixes a bug but I've considered it as part of the feature
#1052 is the bug https://bugzilla.redhat.com/show_bug.cgi?id=2168032

@hstastna
Copy link

@upalatucci Note that we need a BZ ticket to 4.12, if we want to backport a fix done in 4.13 to 4.12.

@upalatucci
Copy link
Member Author

Okay. The bug was created by the actual feature that I implemented. So backporting the feature means backporting also the bug. I didn't think about that. But if we need to do that, I'll do it

@upalatucci
Copy link
Member Author

the bugzilla ticket for the bug backport is this: https://bugzilla.redhat.com/show_bug.cgi?id=2172832

@upalatucci upalatucci changed the title [release-4.12] CNV-23494 Ssh select load balancer [release-4.12] Bug 2172832: CNV-23494 Ssh select load balancer Feb 23, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 23, 2023

@upalatucci: This pull request references Bugzilla bug 2172832, which is invalid:

  • expected the bug to target the "4.12.z" release, but it targets "4.12.2" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

[release-4.12] Bug 2172832: CNV-23494 Ssh select load balancer

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/test-infra repository.

@metalice
Copy link
Member

/lgtm

@openshift-ci openshift-ci bot added the lgtm Passed code review, ready for merge label Feb 23, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 23, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: metalice, upalatucci

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 This issue is something we want to fix label Feb 23, 2023
@openshift-merge-robot openshift-merge-robot merged commit f572b47 into kubevirt-ui:release-4.12 Feb 23, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 23, 2023

@upalatucci: All pull requests linked via external trackers have merged:

Bugzilla bug 2172832 has been moved to the MODIFIED state.

In response to this:

[release-4.12] Bug 2172832: CNV-23494 Ssh select load balancer

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/test-infra repository.

@upalatucci
Copy link
Member Author

/cherry-pick release-4.11

@openshift-cherrypick-robot
Copy link
Collaborator

@upalatucci: #1073 failed to apply on top of branch "release-4.11":

Applying: CNV-23494: Select loadbalancer as ssh service type
Using index info to reconstruct a base tree...
M	locales/en/plugin__kubevirt-plugin.json
M	src/utils/components/SSHAccess/components/SSHCommand.tsx
M	src/utils/components/SSHAccess/utils.ts
Falling back to patching base and 3-way merge...
Auto-merging src/utils/components/SSHAccess/utils.ts
CONFLICT (content): Merge conflict in src/utils/components/SSHAccess/utils.ts
Auto-merging src/utils/components/SSHAccess/components/SSHCommand.tsx
CONFLICT (content): Merge conflict in src/utils/components/SSHAccess/components/SSHCommand.tsx
Removing src/utils/components/SSHAccess/components/SSHCheckbox.tsx
Auto-merging locales/en/plugin__kubevirt-plugin.json
CONFLICT (content): Merge conflict in locales/en/plugin__kubevirt-plugin.json
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 CNV-23494: Select loadbalancer as ssh service type
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:

/cherry-pick release-4.11

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/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved This issue is something we want to fix bugzilla/severity-medium bugzilla/valid-bug lgtm Passed code review, ready for merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants