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

chore(*) enable IPv6 support (bp #1734) #1783

Merged
merged 1 commit into from
Apr 8, 2021
Merged

chore(*) enable IPv6 support (bp #1734) #1783

merged 1 commit into from
Apr 8, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 8, 2021

This is an automatic backport of pull request #1734 done by Mergify.

Cherry-pick of f06bc7b has failed:

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

You are currently cherry-picking commit f06bc7b65.
  (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/dataplane.pb.go
	modified:   api/mesh/v1alpha1/dataplane.proto
	modified:   api/mesh/v1alpha1/dataplane_helpers.go
	modified:   api/mesh/v1alpha1/dataplane_helpers_test.go
	modified:   app/kuma-dp/cmd/context.go
	modified:   app/kuma-dp/cmd/root.go
	modified:   app/kuma-dp/cmd/run.go
	modified:   app/kuma-dp/pkg/dataplane/envoy/envoy.go
	modified:   app/kuma-dp/pkg/dataplane/envoy/envoy_test.go
	modified:   app/kumactl/cmd/completion/testdata/bash.golden
	modified:   app/kumactl/cmd/completion/testdata/zsh.golden
	modified:   app/kumactl/cmd/install/context/install_control_plane_context.go
	modified:   app/kumactl/cmd/install/install_dns.go
	modified:   app/kumactl/cmd/install/install_transparent_proxy.go
	modified:   app/kumactl/cmd/install/install_transparent_proxy_test.go
	modified:   app/kumactl/cmd/install/testdata/install-control-plane.cni-enabled.golden.yaml
	modified:   deployments/charts/kuma/README.md
	modified:   deployments/charts/kuma/values.yaml
	modified:   dev/examples/k8s/example-app/example-app.yaml
	modified:   docs/cmd/kumactl/HELP.md
	modified:   go.mod
	modified:   go.sum
	modified:   mk/dev.mk
	modified:   mk/e2e.mk
	modified:   mk/e2e.new.mk
	modified:   mk/kind.mk
	modified:   pkg/api-server/config_ws_test.go
	modified:   pkg/api-server/server.go
	modified:   pkg/config/app/kuma-cp/kuma-cp.defaults.yaml
	modified:   pkg/config/loader_test.go
	modified:   pkg/config/plugins/runtime/k8s/config.go
	modified:   pkg/config/plugins/runtime/k8s/config_test.go
	modified:   pkg/config/plugins/runtime/k8s/testdata/default-config.golden.yaml
	modified:   pkg/config/plugins/runtime/k8s/testdata/valid-config.input.yaml
	modified:   pkg/core/resources/apis/mesh/dataplane_helpers.go
	modified:   pkg/core/resources/apis/mesh/dataplane_helpers_test.go
	modified:   pkg/core/resources/apis/mesh/dataplane_validator.go
	modified:   pkg/core/resources/apis/mesh/dataplane_validator_test.go
	modified:   pkg/core/resources/apis/mesh/externalservice_validator.go
	modified:   pkg/core/resources/apis/mesh/externalservice_validator_test.go
	modified:   pkg/core/runtime/reports/reports.go
	modified:   pkg/dns/server.go
	modified:   pkg/dns/server_test.go
	modified:   pkg/envoy/admin/client.go
	modified:   pkg/plugins/resources/k8s/native/Dockerfile
	modified:   pkg/plugins/runtime/k8s/controllers/pod_converter.go
	modified:   pkg/plugins/runtime/k8s/controllers/pod_converter_test.go
	new file:   pkg/plugins/runtime/k8s/controllers/testdata/15.dataplane.yaml
	new file:   pkg/plugins/runtime/k8s/controllers/testdata/15.pod.yaml
	new file:   pkg/plugins/runtime/k8s/controllers/testdata/15.services-for-pod.yaml
	modified:   pkg/plugins/runtime/k8s/metadata/annotations.go
	modified:   pkg/plugins/runtime/k8s/webhooks/injector/injector.go
	modified:   pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.01.golden.yaml
	modified:   pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.02.golden.yaml
	modified:   pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.03.golden.yaml
	modified:   pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.04.golden.yaml
	modified:   pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.05.golden.yaml
	modified:   pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.06.golden.yaml
	modified:   pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.07.golden.yaml
	modified:   pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.08.golden.yaml
	modified:   pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.09.golden.yaml
	modified:   pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.11.golden.yaml
	modified:   pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.12.golden.yaml
	modified:   pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.13.golden.yaml
	modified:   pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.14.golden.yaml
	modified:   pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.15.golden.yaml
	modified:   pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.16.golden.yaml
	modified:   pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.17.golden.yaml
	modified:   pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.18.golden.yaml
	modified:   pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.19.golden.yaml
	modified:   pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.21.golden.yaml
	modified:   pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.22.golden.yaml
	modified:   pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.23.golden.yaml
	modified:   pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.24.golden.yaml
	modified:   pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.config-ports.yaml
	modified:   pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.config.yaml
	modified:   pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.env-vars.config.yaml
	modified:   pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.vp-disabled.config.yaml
	modified:   pkg/plugins/runtime/universal/outbound/outbound_test.go
	modified:   pkg/transparentproxy/config/config.go
	modified:   pkg/transparentproxy/istio/go.mod
	modified:   pkg/transparentproxy/istio/go.sum
	modified:   pkg/transparentproxy/istio/istio.go
	new file:   pkg/transparentproxy/istio/tools/doc.go
	new file:   pkg/transparentproxy/istio/tools/istio-clean-iptables/pkg/cmd/cleanup.go
	new file:   pkg/transparentproxy/istio/tools/istio-clean-iptables/pkg/cmd/root.go
	new file:   pkg/transparentproxy/istio/tools/istio-iptables/pkg/builder/iptables_builder.go
	new file:   pkg/transparentproxy/istio/tools/istio-iptables/pkg/builder/iptables_builder_impl.go
	new file:   pkg/transparentproxy/istio/tools/istio-iptables/pkg/builder/iptables_builder_test.go
	new file:   pkg/transparentproxy/istio/tools/istio-iptables/pkg/cmd/format.go
	new file:   pkg/transparentproxy/istio/tools/istio-iptables/pkg/cmd/root.go
	new file:   pkg/transparentproxy/istio/tools/istio-iptables/pkg/cmd/run.go
	new file:   pkg/transparentproxy/istio/tools/istio-iptables/pkg/cmd/run_test.go
	new file:   pkg/transparentproxy/istio/tools/istio-iptables/pkg/config/config.go
	new file:   pkg/transparentproxy/istio/tools/istio-iptables/pkg/constants/constants.go
	new file:   pkg/transparentproxy/istio/tools/istio-iptables/pkg/dependencies/implementation.go
	new file:   pkg/transparentproxy/istio/tools/istio-iptables/pkg/dependencies/interface.go
	new file:   pkg/transparentproxy/istio/tools/istio-iptables/pkg/dependencies/stub.go
	new file:   pkg/transparentproxy/istio/tools/istio-iptables/pkg/validation/linux.go
	new file:   pkg/transparentproxy/istio/tools/istio-iptables/pkg/validation/linux_test.go
	new file:   pkg/transparentproxy/istio/tools/istio-iptables/pkg/validation/validator.go
	modified:   pkg/xds/bootstrap/generator.go
	modified:   pkg/xds/bootstrap/generator_test.go
	modified:   pkg/xds/bootstrap/parameters.go
	modified:   pkg/xds/bootstrap/template_v2.go
	modified:   pkg/xds/bootstrap/template_v3.go
	modified:   pkg/xds/bootstrap/testdata/bootstrap.k8s.golden.yaml
	modified:   pkg/xds/bootstrap/testdata/bootstrap.overridden.golden.yaml
	modified:   pkg/xds/bootstrap/testdata/bootstrap.universal.golden.yaml
	modified:   pkg/xds/bootstrap/testdata/generator.custom-config-minimal-request.golden.yaml
	modified:   pkg/xds/bootstrap/testdata/generator.custom-config.golden.yaml
	modified:   pkg/xds/bootstrap/testdata/generator.default-config-minimal-request.golden.yaml
	modified:   pkg/xds/bootstrap/testdata/generator.default-config.golden.yaml
	modified:   pkg/xds/bootstrap/testdata/generator.default-config.kubernetes.golden.yaml
	new file:   pkg/xds/bootstrap/testdata/generator.default-config.kubernetes.ipv6.golden.yaml
	modified:   pkg/xds/envoy/clusters/configurers.go
	modified:   pkg/xds/envoy/clusters/v2/strict_dns_cluster_configurer.go
	modified:   pkg/xds/envoy/clusters/v2/strict_dns_cluster_configurer_test.go
	modified:   pkg/xds/envoy/clusters/v3/strict_dns_cluster_configurer.go
	modified:   pkg/xds/envoy/clusters/v3/strict_dns_cluster_configurer_test.go
	modified:   pkg/xds/envoy/listeners/v2/transparent_proxying_configurer_test.go
	modified:   pkg/xds/envoy/listeners/v3/transparent_proxying_configurer_test.go
	new file:   pkg/xds/envoy/names/names_suite_test.go
	modified:   pkg/xds/envoy/names/resource_names.go
	new file:   pkg/xds/envoy/names/resource_names_test.go
	modified:   pkg/xds/generator/outbound_proxy_generator.go
	modified:   pkg/xds/generator/testdata/profile-source/2-envoy-config.golden.yaml
	modified:   pkg/xds/generator/testdata/profile-source/4-envoy-config.golden.yaml
	modified:   pkg/xds/generator/testdata/template-proxy/1-envoy-config.golden.yaml
	modified:   pkg/xds/generator/testdata/transparent-proxy/02.envoy.golden.yaml
	modified:   pkg/xds/generator/testdata/transparent-proxy/03.envoy.golden.yaml
	new file:   pkg/xds/generator/testdata/transparent-proxy/04.envoy.golden.yaml
	modified:   pkg/xds/generator/transparent_proxy_generator_test.go
	modified:   pkg/xds/server/v2/testdata/envoy-config.golden.yaml
	modified:   pkg/xds/server/v3/testdata/envoy-config.golden.yaml
	modified:   pkg/xds/topology/outbound.go
	modified:   test/certs/server-cert.pem
	modified:   test/certs/server-key.pem
	modified:   test/dockerfiles/Dockerfile.universal
	modified:   test/e2e/healthcheck/healthcheck_hybrid_test.go
	new file:   test/e2e/hybrid/deploy_suite_test.go
	new file:   test/e2e/hybrid/foo.go
	renamed:    test/e2e/deploy/kuma_deploy_hybrid_kube_global_test.go -> test/e2e/hybrid/kuma_hybrid_kube_global_test.go
	renamed:    test/e2e/deploy/kuma_deploy_hybrid_test.go -> test/e2e/hybrid/kuma_hybrid_test.go
	modified:   test/framework/constants.go
	modified:   test/framework/deployments/tracing/universal.go
	new file:   test/framework/env.go
	modified:   test/framework/interface.go
	modified:   test/framework/k8s_cluster.go
	modified:   test/framework/k8s_clusters.go
	modified:   test/framework/k8s_controlplane.go
	modified:   test/framework/kumactl.go
	modified:   test/framework/setup.go
	modified:   test/framework/universal_app.go
	modified:   test/framework/universal_cluster.go
	modified:   test/framework/universal_controlplane.go
	new file:   test/kind/cluster-ipv6.yaml
	new file:   test/kind/cluster.yaml
	modified:   tools/releases/dockerfiles/Dockerfile.kuma-init

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .circleci/config.yml
	both modified:   app/kumactl/pkg/install/k8s/control-plane/helmtemplates_vfsdata.go
	both modified:   pkg/xds/generator/transparent_proxy_generator.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 April 8, 2021 14:00
@mergify mergify bot added the conflicts label Apr 8, 2021
chore(*) enable IPv6 support (#1734)
8efd119 
* chore(*) support IPv6

* test(circleci) enable IPv6 in e2e

* chore(*) bump go 1.15.11

* chore(*) bump minikube

* chore(*) transparent proxy for IPv4 and IPv6

* test(e2e) universal image will have ip tool

* chore(*) iptables for IPv4/IPv6 mixed hosts

* chore(*) introduce redirectPortInboundV6

* chore(*) strict dns for IPv6

* test(e2e) K8s privileged containers for iptables debugging

* chore(cni) bump version to 0.0.4

* test(*) ipv6 unit tests

* chore(envoy) pass log level

* fix(*) circleci for IPv6 on master

* test(e2e) split deploy and hybrid

* test(e2e) optimize GetEnv usage

* chore(*) IP generate for Envoy GRPC

* test(ci) bump image to ubuntu-2004:202101-01

Signed-off-by: Nikolay Nikolaev <nikolay.nikolaev@konghq.com>
# Conflicts:
#	.circleci/config.yml
#	app/kumactl/pkg/install/k8s/control-plane/helmtemplates_vfsdata.go
#	pkg/xds/generator/transparent_proxy_generator.go

Signed-off-by: Nikolay Nikolaev <nikolay.nikolaev@konghq.com>
@nickolaev nickolaev force-pushed the mergify/bp/release-1.1/pr-1734 branch from ae1630c to 8efd119 Compare April 8, 2021 14:37
@nickolaev nickolaev merged commit db63ce7 into release-1.1 Apr 8, 2021
@nickolaev nickolaev deleted the mergify/bp/release-1.1/pr-1734 branch April 8, 2021 15:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
conflicts
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@nickolaev