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

chore(kuma-cp) migrate DiscoveryRequest/Response in KDS to V3 (backport #2541) #2551

Merged
merged 1 commit into from
Aug 13, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 11, 2021

This is an automatic backport of pull request #2541 done by Mergify.
Cherry-pick of 5752bd6 has failed:

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

You are currently cherry-picking commit 5752bd67.
  (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:   api/mesh/v1alpha1/kds.pb.go
	modified:   api/mesh/v1alpha1/kds.proto
	modified:   api/mesh/v1alpha1/mux.pb.go
	modified:   api/mesh/v1alpha1/mux.proto
	modified:   pkg/kds/client/sink_test.go
	modified:   pkg/kds/client/stream.go
	modified:   pkg/kds/mux/client.go
	modified:   pkg/kds/mux/clientstream.go
	modified:   pkg/kds/mux/serverstream.go
	modified:   pkg/kds/mux/session.go
	modified:   pkg/kds/mux/session_test.go
	new file:   pkg/kds/mux/version.go
	modified:   pkg/kds/reconcile/interfaces.go
	modified:   pkg/kds/reconcile/reconciler.go
	modified:   pkg/kds/reconcile/snapshot_generator.go
	modified:   pkg/kds/server/components.go
	modified:   pkg/kds/server/kds.go
	modified:   pkg/kds/server/server_test.go
	modified:   pkg/kds/server/status_tracker.go
	modified:   pkg/kds/util/resource.go
	modified:   pkg/test/grpc/clientstream.go
	modified:   pkg/test/grpc/serverstream.go
	modified:   pkg/test/kds/verifier/context.go
	modified:   pkg/test/kds/verifier/executables.go
	modified:   test/e2e/compatibility/compatibility_suite_test.go
	new file:   test/e2e/compatibility/cp_compatibility_kubernetes_multizone.go
	new file:   test/e2e/compatibility/cp_compatibility_kubernetes_multizone_test.go
	modified:   test/framework/setup.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   pkg/kds/cache/snapshot.go
	both modified:   pkg/kds/server/type_adjust_callbacks.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/

@mergify mergify bot requested a review from a team as a code owner August 11, 2021 15:44
@mergify mergify bot added the conflicts label Aug 11, 2021
@codecov-commenter
Copy link

Codecov Report

❗ No coverage uploaded for pull request base (release-1.2@82dd4ec). Click here to learn what that means.
The diff coverage is n/a.

❗ Current head 5752bd6 differs from pull request most recent head 6d46374. Consider uploading reports for the commit 6d46374 to get more accurate results
Impacted file tree graph

@@              Coverage Diff               @@
##             release-1.2    #2551   +/-   ##
==============================================
  Coverage               ?   52.36%           
==============================================
  Files                  ?      871           
  Lines                  ?    48437           
  Branches               ?        0           
==============================================
  Hits                   ?    25366           
  Misses                 ?    21020           
  Partials               ?     2051           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 82dd4ec...6d46374. Read the comment docs.

@jakubdyszkiewicz
Copy link
Contributor

@Mergifyio refresh

@mergify
Copy link
Contributor Author

mergify bot commented Aug 13, 2021

Command refresh: success

Pull request refreshed

Signed-off-by: Jakub Dyszkiewicz <jakub.dyszkiewicz@gmail.com>
@jakubdyszkiewicz jakubdyszkiewicz force-pushed the mergify/bp/release-1.2/pr-2541 branch from 6d46374 to 163d808 Compare August 13, 2021 11:19
@jakubdyszkiewicz jakubdyszkiewicz merged commit cfc610a into release-1.2 Aug 13, 2021
@jakubdyszkiewicz jakubdyszkiewicz deleted the mergify/bp/release-1.2/pr-2541 branch August 13, 2021 12:48
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.

2 participants