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

fix: sort resources when building MeshContext (backport #5391) #5409

Merged
merged 1 commit into from
Dec 2, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 2, 2022

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

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

You are currently cherry-picking commit ff4463e99.
  (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:
	modified:   pkg/core/resources/store/pagination_store.go
	modified:   pkg/plugins/runtime/gateway/gateway_route_generator_test.go
	modified:   pkg/plugins/runtime/gateway/generator.go
	modified:   pkg/plugins/runtime/gateway/testdata/tcp/tcp-route-no-egress.yaml
	modified:   pkg/test/resources/builders/dataplane_builder.go
	modified:   pkg/test/runtime/runtime.go
	modified:   pkg/xds/context/mesh_context_builder.go
	modified:   pkg/xds/server/v3/components.go
	modified:   pkg/xds/server/v3/reconcile.go
	deleted:    pkg/xds/server/v3/testdata/dataplane.input.yaml
	renamed:    pkg/xds/server/v3/testdata/envoy-config.golden.yaml -> pkg/xds/server/v3/testdata/hook-before-pt.golden.yaml
	new file:   pkg/xds/server/v3/testdata/stable-es.golden.yaml
	modified:   pkg/xds/sync/egress_proxy_builder.go
	modified:   pkg/xds/sync/ingress_proxy_builder.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   pkg/core/resources/store/options.go
	both modified:   pkg/xds/server/v3/snapshot_generator_test.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.com

@mergify mergify bot requested a review from a team as a code owner December 2, 2022 14:28
@mergify mergify bot added the conflicts label Dec 2, 2022
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
# Conflicts:
#	pkg/core/resources/store/options.go
#	pkg/xds/server/v3/snapshot_generator_test.go
@lobkovilya lobkovilya force-pushed the mergify/bp/release-2.0/pr-5391 branch from 4577d33 to 05653d7 Compare December 2, 2022 14:40
@lobkovilya lobkovilya merged commit d004fbc into release-2.0 Dec 2, 2022
@lobkovilya lobkovilya deleted the mergify/bp/release-2.0/pr-5391 branch December 2, 2022 15:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant