chore(*) enable IPv6 support

.circleci/config.yml

@@ -24,14 +24,14 @@ commands:
 reusable:
 
   constants:
-  - &go_version "1.15.6"
+  - &go_version "1.15.11"
 
   docker_images:
-  - &golang_image "golang:1.15.6"
-  - &circleci_golang_image "circleci/golang:1.15.6"
+  - &golang_image "golang:1.15.11"
+  - &circleci_golang_image "circleci/golang:1.15.11"
 
   vm_images:
-  - &ubuntu_vm_image "ubuntu-1604:202007-01"
+  - &ubuntu_vm_image "ubuntu-2004:202101-01"
 
   snippets:
 
@@ -568,6 +568,10 @@ jobs:
         description: XDS API version
         type: string
         default: v3
+      ipv6:
+        description: use IPv6
+        type: boolean
+        default: false
     parallelism: 2
     environment:
       GOPATH: /home/circleci/.go-kuma-go
@@ -603,13 +607,29 @@ jobs:
           command: |
             export PATH=$HOME/go/bin:$PATH
             helm repo add kuma https://kumahq.github.io/charts
-      - run:
-          name: "Run E2E tests"
-          command: |
-            export PATH=$HOME/go/bin:$PATH
-            export E2E_PKG_LIST=$(circleci tests glob ./test/e2e/* | circleci tests split | xargs printf "./%s/... ")
-            export API_VERSION=<< parameters.api >>
-            make test/e2e
+      - when:
+          condition: << parameters.ipv6 >>
+          steps:
+            - run:
+                name: "Run IPv6 E2E tests"
+                command: |
+                  export PATH=$HOME/go/bin:$PATH
+                  export E2E_PKG_LIST=$(circleci tests glob ./test/e2e/* | circleci tests split | xargs printf "./%s/... ")
+                  export API_VERSION=<< parameters.api >>
+                  export IPV6=true
+                  export KUMA_DEFAULT_RETRIES=60
+                  export KUMA_DEFAULT_TIMEOUT="6s"
+                  make test/e2e
+      - unless:
+          condition: << parameters.ipv6 >>
+          steps:
+            - run:
+                name: "Run IPv4 E2E tests"
+                command: |
+                  export PATH=$HOME/go/bin:$PATH
+                  export E2E_PKG_LIST=$(circleci tests glob ./test/e2e/* | circleci tests split | xargs printf "./%s/... ")
+                  export API_VERSION=<< parameters.api >>
+                  make test/e2e
 
   build:
     executor: golang
@@ -695,7 +715,7 @@ jobs:
       kubernetes_version:
         description: The version of Kubernetes to test on.
         type: string
-        default: "v1.15.0"
+        default: "v1.20.0"
       use_local_kuma_images:
         description: Use local Docker images from CircleCI workspace instead of downloading ones from bintray.io.
         type: boolean
@@ -720,7 +740,7 @@ jobs:
           sudo apt-get install -y conntrack
     - run:
         name: Start Minikube
-        command: sudo CHANGE_MINIKUBE_NONE_USER=true $HOME/bin/minikube start --vm-driver=none --kubernetes-version=<< parameters.kubernetes_version >>
+        command: $HOME/bin/minikube start --vm-driver=docker --kubernetes-version=<< parameters.kubernetes_version >>
     - when:
         condition: << parameters.use_local_kuma_images >>
         steps:
@@ -887,10 +907,16 @@ workflows:
         use_local_kuma_images: true
     - e2e:
         <<: *commit_workflow_filters
-        name: test/e2e
+        name: test/e2e-ipv4
         requires:
           - images
           - check
+# keep this one disabled and enable only for development
+#    - e2e:
+#        <<: *commit_workflow_filters
+#        name: test/e2e-ipv6
+#        # custom parameters
+#        ipv6: true
 
   clean-eks:
     triggers:
@@ -1018,13 +1044,21 @@ workflows:
             - images
             - check
       - e2e:
-          <<: *commit_workflow_filters
+          <<: *master_workflow_filters
           name: test/e2e V2
           requires:
             - images
             - check
           # custom parameters
           api: v2
+      - e2e:
+          <<: *master_workflow_filters
+          name: test/e2e-ipv6
+          requires:
+            - images
+            - check
+          # custom parameters
+          ipv6: true
 
   kuma-release:
     jobs:

api/mesh/v1alpha1/dataplane.proto

@@ -141,6 +141,11 @@ message Dataplane {
 
       // List of services that will be access directly via IP:PORT
       repeated string direct_access_services = 3;
+
+      // Port on which all IPv6 inbound traffic is being transparently
+      // redirected.
+      uint32 redirect_port_inbound_v6 = 4
+          [ (validate.rules).uint32 = {lte : 65535} ];
     }
 
     // Gateway describes configuration of gateway of the dataplane.

api/mesh/v1alpha1/dataplane_helpers.go

@@ -2,8 +2,10 @@ package v1alpha1
 
 import (
 	"fmt"
+	"net"
 	"reflect"
 	"sort"
+	"strconv"
 	"strings"
 
 	"github.com/pkg/errors"
@@ -69,7 +71,8 @@ type OutboundInterface struct {
 }
 
 func (i OutboundInterface) String() string {
-	return fmt.Sprintf("%s:%d", i.DataplaneIP, i.DataplanePort)
+	return net.JoinHostPort(i.DataplaneIP,
+		strconv.FormatUint(uint64(i.DataplanePort), 10))
 }
 
 func (n *Dataplane_Networking) GetOutboundInterfaces() ([]OutboundInterface, error) {

api/mesh/v1alpha1/dataplane_helpers_test.go

@@ -76,6 +76,23 @@ var _ = Describe("Dataplane_Networking", func() {
 						{DataplaneIP: "192.168.0.1", DataplanePort: 443},
 					},
 				}),
+				Entry("2 outbound interfaces IPv6", testCase{
+					input: &Dataplane_Networking{
+						Outbound: []*Dataplane_Networking_Outbound{
+							{
+								Port: 8080,
+							},
+							{
+								Address: "fd00::1",
+								Port:    443,
+							},
+						},
+					},
+					expected: []OutboundInterface{
+						{DataplaneIP: "127.0.0.1", DataplanePort: 8080},
+						{DataplaneIP: "fd00::1", DataplanePort: 443},
+					},
+				}),
 			)
 		})
 	})

app/kuma-dp/cmd/context.go

@@ -5,6 +5,8 @@ import (
 	"net/http"
 	"time"
 
+	"github.com/kumahq/kuma/pkg/log"
+
 	"github.com/kumahq/kuma/app/kuma-dp/pkg/dataplane/envoy"
 	kumadp "github.com/kumahq/kuma/pkg/config/app/kuma-dp"
 	"github.com/kumahq/kuma/pkg/core/runtime/component"
@@ -17,6 +19,7 @@ type RootContext struct {
 	BootstrapGenerator       envoy.BootstrapConfigFactoryFunc
 	BootstrapDynamicMetadata map[string]string
 	Config                   *kumadp.Config
+	LogLevel                 log.LogLevel
 }
 
 func DefaultRootContext() *RootContext {

app/kuma-dp/cmd/root.go

@@ -30,6 +30,7 @@ func NewRootCmd(rootCtx *RootContext) *cobra.Command {
 				return err
 			}
 			core.SetLogger(core.NewLogger(level))
+			rootCtx.LogLevel = level
 
 			// once command line flags have been parsed,
 			// avoid printing usage instructions

app/kuma-dp/cmd/run.go

@@ -126,6 +126,7 @@ func newRunCmd(rootCtx *RootContext) *cobra.Command {
 				Stdout:          cmd.OutOrStdout(),
 				Stderr:          cmd.OutOrStderr(),
 				Quit:            shouldQuit,
+				LogLevel:        rootCtx.LogLevel,
 			})
 			if err != nil {
 				return err

app/kuma-dp/pkg/dataplane/envoy/envoy.go

@@ -12,6 +12,7 @@ import (
 	"time"
 
 	"github.com/kumahq/kuma/pkg/core/resources/model/rest"
+	pkg_log "github.com/kumahq/kuma/pkg/log"
 	"github.com/kumahq/kuma/pkg/xds/bootstrap/types"
 
 	"github.com/pkg/errors"
@@ -42,6 +43,7 @@ type Opts struct {
 	Stdout          io.Writer
 	Stderr          io.Writer
 	Quit            chan struct{}
+	LogLevel        pkg_log.LogLevel
 }
 
 func New(opts Opts) (*Envoy, error) {
@@ -154,6 +156,7 @@ func (e *Envoy) Start(stop <-chan struct{}) error {
 		// and we don't expect users to do "hot restart" manually.
 		// so, let's turn it off to simplify getting started experience.
 		"--disable-hot-restart",
+		"-l ", e.opts.LogLevel.String(),
 	}
 	if version != "" { // version is always send by Kuma CP, but we check empty for backwards compatibility reasons (new Kuma DP connects to old Kuma CP)
 		args = append(args, "--bootstrap-version", string(version))

app/kuma-dp/pkg/dataplane/envoy/envoy_test.go

@@ -112,7 +112,7 @@ var _ = Describe("Envoy", func() {
 			// then
 			Expect(err).ToNot(HaveOccurred())
 			// and
-			Expect(strings.TrimSpace(buf.String())).To(Equal(fmt.Sprintf("-c %s --drain-time-s 15 --disable-hot-restart --bootstrap-version 2", expectedConfigFile)))
+			Expect(strings.TrimSpace(buf.String())).To(Equal(fmt.Sprintf("-c %s --drain-time-s 15 --disable-hot-restart -l off --bootstrap-version 2", expectedConfigFile)))
 
 			By("verifying the contents Envoy config file")
 			// when

app/kumactl/cmd/completion/testdata/bash.golden

@@ -2399,6 +2399,9 @@ _kumactl_install_transparent-proxy()
     flags+=("--redirect-inbound-port=")
     two_word_flags+=("--redirect-inbound-port")
     local_nonpersistent_flags+=("--redirect-inbound-port=")
+    flags+=("--redirect-inbound-port-v6=")
+    two_word_flags+=("--redirect-inbound-port-v6")
+    local_nonpersistent_flags+=("--redirect-inbound-port-v6=")
     flags+=("--redirect-outbound-port=")
     two_word_flags+=("--redirect-outbound-port")
     local_nonpersistent_flags+=("--redirect-outbound-port=")

app/kumactl/cmd/completion/testdata/zsh.golden

@@ -976,6 +976,7 @@ function _kumactl_install_transparent-proxy {
     '--modify-iptables[modify the host iptables to redirect the traffic to Envoy]' \
     '--redirect-inbound[redirect the inbound traffic to the Envoy. Should be disabled for Gateway data plane proxies.]' \
     '--redirect-inbound-port[inbound port redirected to Envoy, as specified in dataplane'\''s `networking.transparentProxying.redirectPortInbound`]:' \
+    '--redirect-inbound-port-v6[IPv6 inbound port redirected to Envoy, as specified in dataplane'\''s `networking.transparentProxying.redirectPortInboundV6`]:' \
     '--redirect-outbound-port[outbound port redirected to Envoy, as specified in dataplane'\''s `networking.transparentProxying.redirectPortOutbound`]:' \
     '--skip-resolv-conf[skip modifying the host `/etc/resolv.conf`]' \
     '--store-firewalld[store the iptables changes with firewalld]' \

app/kumactl/cmd/install/context/install_control_plane_context.go

@@ -87,7 +87,7 @@ func DefaultInstallCpContext() InstallCpContext {
 			Cni_conf_name:                             "kuma-cni.conf",
 			Cni_image_registry:                        "docker.io",
 			Cni_image_repository:                      "lobkovilya/install-cni",
-			Cni_image_tag:                             "0.0.2",
+			Cni_image_tag:                             "0.0.4",
 			ControlPlane_mode:                         core.Standalone,
 			ControlPlane_zone:                         "",
 			ControlPlane_globalRemoteSyncService_type: "LoadBalancer",

app/kumactl/cmd/install/install_dns.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"net"
 	"regexp"
 	"strings"
 
@@ -66,7 +67,7 @@ This command requires that the KUBECONFIG environment is set`,
 				return err
 			}
 
-			kumaDNSAddress := fmt.Sprintf("%s:%s", kumaCPSVC.Spec.ClusterIP, args.Port)
+			kumaDNSAddress := net.JoinHostPort(kumaCPSVC.Spec.ClusterIP, args.Port)
 
 			var errs error
 			generated := false