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

feat(kuma-cp): add gateway support for external services (backport #2990) #3025

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 27, 2021

This is an automatic backport of pull request #2990 done by Mergify.
Cherry-pick of ad2e07d has failed:

On branch mergify/bp/release-1.3/pr-2990
Your branch is up to date with 'origin/release-1.3'.

You are currently cherry-picking commit ad2e07dc.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   pkg/plugins/runtime/gateway/cluster_generator.go
	modified:   pkg/plugins/runtime/gateway/generator.go
	new file:   pkg/plugins/runtime/gateway/match/external.go
	new file:   pkg/plugins/runtime/gateway/testdata/18-gateway-route.yaml
	new file:   pkg/plugins/runtime/gateway/testdata/19-gateway-route.yaml
	modified:   pkg/xds/topology/outbound.go
	modified:   test/e2e/gateway/gateway_universal.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   pkg/plugins/runtime/gateway/gateway_route_generator_test.go
	both modified:   pkg/plugins/runtime/gateway/plugin.go
	both modified:   pkg/plugins/runtime/gateway/route_table_generator.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

Add Gateway generator support for ExternalService backends.  Like
mesh services, ExternalService backends are selected by matching
the `kuma.io/service` tag. Where the tags are ambiguous (i.e. we
have both Dataplane and ExternalService resources for the same
service), ExternalService takes priority.

This change separates the cluster generation from the route table
generation just to reduce the amount of complexity in a single generator.

Signed-off-by: James Peach <james.peach@konghq.com>
(cherry picked from commit ad2e07d)

# Conflicts:
#	pkg/plugins/runtime/gateway/gateway_route_generator_test.go
#	pkg/plugins/runtime/gateway/plugin.go
#	pkg/plugins/runtime/gateway/route_table_generator.go
@mergify mergify bot requested a review from a team as a code owner October 27, 2021 21:22
@mergify mergify bot added the conflicts label Oct 27, 2021
@jpeach
Copy link
Contributor

jpeach commented Oct 27, 2021

Has conflicts because #2954 didn't get merged (because it had conflicts too).

@jpeach
Copy link
Contributor

jpeach commented Nov 4, 2021

Has conflicts because #2954 didn't get merged (because it had conflicts too).

Closing due to missing dependencies

@jpeach jpeach closed this Nov 4, 2021
@mergify mergify bot deleted the mergify/bp/release-1.3/pr-2990 branch November 4, 2021 22:16
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.

1 participant