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.

Sign up for GitHub

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

Jump to bottom

Bug 1791277: Add support for listeners on the same port but different protocol #139

Merged
merged 3 commits into from Jan 16, 2020
Merged

Bug 1791277: Add support for listeners on the same port but different protocol #139

merged 3 commits into from Jan 16, 2020

Conversation

luis5tb
Copy link
Contributor

@luis5tb luis5tb commented Jan 16, 2020

Due to a bug in Octavia this was previously avoided. This is now
supported for the amphora provider, so it won't be blocked on the
kuryr side

Change-Id: If7d32023e467d1a63812057e1d151901ce462c7f

luis5tb and others added 3 commits January 15, 2020 17:47
@luis5tb
Add support for listeners on the same port but different protocol
3196021 
Due to a bug in Octavia this was previously avoided. This is now
supported for the amphora provider, so it won't be blocked on the
kuryr side

Change-Id: If7d32023e467d1a63812057e1d151901ce462c7f
@openstack-gerrit
Merge "Add support for listeners on the same port but different proto…
0e603c0 
…col"
@luis5tb
Merge remote-tracking branch 'origin/master' into 1791277
e69934d 
Change-Id: I9018b9805a4a07294fd68fb634d3418de80dee89
@openshift-ci-robot
Copy link

@luis5tb: This pull request references Bugzilla bug 1791277, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

Bug 1791277: Add support for listeners on the same port but different protocol

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.

@openshift-ci-robot openshift-ci-robot added bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 16, 2020
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 16, 2020
@gryf
Copy link
Member

gryf commented Jan 16, 2020

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 16, 2020
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: gryf, luis5tb

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-merge-robot openshift-merge-robot merged commit 7c52546 into openshift:master Jan 16, 2020
@luis5tb
Copy link
Contributor Author

luis5tb commented Feb 4, 2020

/cherry-pick release-4.3

@openshift-cherrypick-robot
Copy link

@luis5tb: #139 failed to apply on top of branch "release-4.3":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	kuryr_kubernetes/controller/drivers/lbaasv2.py
Falling back to patching base and 3-way merge...
Auto-merging kuryr_kubernetes/controller/drivers/lbaasv2.py
CONFLICT (content): Merge conflict in kuryr_kubernetes/controller/drivers/lbaasv2.py
Patch failed at 0001 Add support for listeners on the same port but different protocol

In response to this:

/cherry-pick release-4.3

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.

@luis5tb
Copy link
Contributor Author

luis5tb commented Feb 4, 2020

/cherry-pick release-4.3

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Feb 4, 2020
Merged
@openshift-cherrypick-robot
Copy link

@luis5tb: new pull request created: #154

In response to this:

/cherry-pick release-4.3

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.

MaysaMacedo pushed a commit to MaysaMacedo/kuryr-kubernetes-1 that referenced this pull request Jul 1, 2021
@openshift-merge-robot
Merge pull request openshift#139 from danwinship/multus-apiserver
697fd49 
Pass the "real" apiserver info to the multus setup script
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@celebdor celebdor Awaiting requested review from celebdor

@MaysaMacedo MaysaMacedo Awaiting requested review from MaysaMacedo

Assignees

@gryf gryf

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@luis5tb @openshift-ci-robot @gryf @openshift-cherrypick-robot @openshift-merge-robot