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) proxy template V3 (bp #1398) #1405

Merged
merged 1 commit into from
Jan 12, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 11, 2021

This is an automated backport of pull request #1398 done by Mergify

Cherry-pick of 5eaee19 has failed:

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

You are currently cherry-picking commit 5eaee1904.
  (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/xds/resource.go
	modified:   pkg/xds/envoy/clusters/v3/circuit_breaker_configurer_test.go
	modified:   pkg/xds/envoy/clusters/v3/client_side_mtls_configurer_test.go
	modified:   pkg/xds/envoy/clusters/v3/client_side_tls_configurer_test.go
	modified:   pkg/xds/envoy/clusters/v3/eds_cluster_configurer.go
	modified:   pkg/xds/envoy/clusters/v3/eds_cluster_configurer_test.go
	modified:   pkg/xds/envoy/clusters/v3/lb_subset_configurer_test.go
	modified:   pkg/xds/generator/modifications/modifications.go
	renamed:    pkg/xds/generator/modifications/cluster.go -> pkg/xds/generator/modifications/v2/cluster.go
	renamed:    pkg/xds/generator/modifications/cluster_test.go -> pkg/xds/generator/modifications/v2/cluster_test.go
	renamed:    pkg/xds/generator/modifications/http_filter.go -> pkg/xds/generator/modifications/v2/http_filter.go
	renamed:    pkg/xds/generator/modifications/http_filter_test.go -> pkg/xds/generator/modifications/v2/http_filter_test.go
	renamed:    pkg/xds/generator/modifications/listener.go -> pkg/xds/generator/modifications/v2/listener.go
	renamed:    pkg/xds/generator/modifications/listener_test.go -> pkg/xds/generator/modifications/v2/listener_test.go
	new file:   pkg/xds/generator/modifications/v2/modifications.go
	renamed:    pkg/xds/generator/modifications/modifications_suite_test.go -> pkg/xds/generator/modifications/v2/modifications_suite_test.go
	renamed:    pkg/xds/generator/modifications/network_filter.go -> pkg/xds/generator/modifications/v2/network_filter.go
	renamed:    pkg/xds/generator/modifications/network_filter_test.go -> pkg/xds/generator/modifications/v2/network_filter_test.go
	renamed:    pkg/xds/generator/modifications/virtual_host.go -> pkg/xds/generator/modifications/v2/virtual_host.go
	renamed:    pkg/xds/generator/modifications/virtual_host_test.go -> pkg/xds/generator/modifications/v2/virtual_host_test.go
	new file:   pkg/xds/generator/modifications/v3/cluster.go
	new file:   pkg/xds/generator/modifications/v3/cluster_test.go
	new file:   pkg/xds/generator/modifications/v3/http_filter.go
	new file:   pkg/xds/generator/modifications/v3/http_filter_test.go
	new file:   pkg/xds/generator/modifications/v3/listener.go
	new file:   pkg/xds/generator/modifications/v3/listener_test.go
	new file:   pkg/xds/generator/modifications/v3/modifications.go
	new file:   pkg/xds/generator/modifications/v3/modifications_suite_test.go
	new file:   pkg/xds/generator/modifications/v3/network_filter.go
	new file:   pkg/xds/generator/modifications/v3/network_filter_test.go
	new file:   pkg/xds/generator/modifications/v3/virtual_host.go
	new file:   pkg/xds/generator/modifications/v3/virtual_host_test.go
	modified:   pkg/xds/generator/proxy_template.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   pkg/xds/envoy/clusters/v3/health_check_configurer_test.go

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/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 January 11, 2021 15:21
@mergify mergify bot added the conflicts label Jan 11, 2021
@jakubdyszkiewicz jakubdyszkiewicz force-pushed the mergify/bp/release-1.0/pr-1398 branch from 4c5d2cb to 696bd93 Compare January 12, 2021 09:50
@jakubdyszkiewicz jakubdyszkiewicz merged commit df61c52 into release-1.0 Jan 12, 2021
@jakubdyszkiewicz jakubdyszkiewicz deleted the mergify/bp/release-1.0/pr-1398 branch January 12, 2021 11: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