chore: update tproxy to v0.22.2

Signed-off-by: Bart Smykla <bartek@smykla.com>
kumahq · May 23, 2022 · 11fc569 · 11fc569
1 parent 579ebb4
commit 11fc569
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/go.mod b/go.mod
@@ -24,7 +24,7 @@ require (
 	github.com/gruntwork-io/terratest v0.40.8
 	github.com/hoisie/mustache v0.0.0-20160804235033-6375acf62c69
 	github.com/kelseyhightower/envconfig v1.4.0
-	github.com/kumahq/kuma-net v0.2.1
+	github.com/kumahq/kuma-net v0.2.2
 	github.com/kumahq/protoc-gen-kumadoc v0.2.0
 	github.com/lib/pq v1.10.6
 	github.com/miekg/dns v1.1.49

diff --git a/go.sum b/go.sum
@@ -973,6 +973,8 @@ github.com/kumahq/go-control-plane v0.9.10-0.20211022075049-d35edcf0813a h1:RtOj
 github.com/kumahq/go-control-plane v0.9.10-0.20211022075049-d35edcf0813a/go.mod h1:utjuSZ1DPHuYf0cTZ8WEsaQf5bwmT1TZiWaQjpJtBF0=
 github.com/kumahq/kuma-net v0.2.1 h1:tzubnThQQLGvUvgnc62oNpkzR7ewLWWqRrI0fssdnZw=
 github.com/kumahq/kuma-net v0.2.1/go.mod h1:dUqPEm6BP7TqQvaqYDXnwITekoxdtmXTd6UXVlq3n9w=
+github.com/kumahq/kuma-net v0.2.2 h1:crfuCBbfqFcTnXuiz4QMsuD6aNZ8JLVeYR+MlvEj7+Y=
+github.com/kumahq/kuma-net v0.2.2/go.mod h1:dUqPEm6BP7TqQvaqYDXnwITekoxdtmXTd6UXVlq3n9w=
 github.com/kumahq/protoc-gen-kumadoc v0.2.0 h1:3P1PZyw/tI1TYL6QmaePuLqGuarhYkL9ZxjN2yPTLXY=
 github.com/kumahq/protoc-gen-kumadoc v0.2.0/go.mod h1:F+c9RjgKlv1Q3UEoPJCtMJw8Fd+X5PfG5jlkTSfZOMA=
 github.com/lann/builder v0.0.0-20180802200727-47ae307949d0/go.mod h1:dXGbAdH5GtBTC4WfIxhKZfyBF/HBFgRZSWwZ9g/He9o=

diff --git a/pkg/transparentproxy/transparentproxy_experimental.go b/pkg/transparentproxy/transparentproxy_experimental.go
@@ -77,6 +77,19 @@ func (tp *ExperimentalTransparentProxy) Setup(tpConfig *config.TransparentProxyC
 		)
 	}
 
+	var redirectInboundPortIPv6 uint64
+
+	if tpConfig.RedirectPortInBoundV6 != "" {
+		redirectInboundPortIPv6, err = strconv.ParseUint(tpConfig.RedirectPortInBoundV6, 10, 16)
+		if err != nil {
+			return "", errors.Wrapf(
+				err,
+				"inbound redirect port IPv6 (%s), is not valid uint16",
+				tpConfig.RedirectPortInBound,
+			)
+		}
+	}
+
 	redirectOutboundPort, err := strconv.ParseUint(tpConfig.RedirectPortOutBound, 10, 16)
 	if err != nil {
 		return "", errors.Wrapf(
@@ -124,6 +137,7 @@ func (tp *ExperimentalTransparentProxy) Setup(tpConfig *config.TransparentProxyC
 			NamePrefix: "KUMA_",
 			Inbound: kumanet_config.TrafficFlow{
 				Port:         uint16(redirectInboundPort),
+				PortIPv6:     uint16(redirectInboundPortIPv6),
 				ExcludePorts: excludeInboundPorts,
 			},
 			Outbound: kumanet_config.TrafficFlow{