fix(cni): check to enable ipv6 flag on transparent proxy engine

Signed-off-by: slonka <slonka@users.noreply.github.com>
kumahq · Jul 19, 2022 · 094cf78 · 094cf78
1 parent 333ad04
commit 094cf78
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/app/cni/pkg/cni/injector_linux.go b/app/cni/pkg/cni/injector_linux.go
@@ -11,6 +11,8 @@ import (
 
 	"github.com/kumahq/kuma-net/iptables/builder"
 	"github.com/kumahq/kuma-net/iptables/config"
+
+	"github.com/kumahq/kuma/pkg/transparentproxy"
 )
 
 func convertToUint16(field string, value string) (uint16, error) {
@@ -93,6 +95,12 @@ func mapToConfig(intermediateConfig *IntermediateConfig) (*config.Config, error)
 		if err != nil {
 			return nil, err
 		}
+		enableIpV6, err := transparentproxy.ShouldEnableIPv6()
+		if err != nil {
+			return nil, err
+		}
+		cfg.IPv6 = enableIpV6
+
 		inboundPortV6, err := convertToUint16("inbound port ipv6", intermediateConfig.inboundPortV6)
 		if err != nil {
 			return nil, err

diff --git a/pkg/transparentproxy/transparentproxy_experimental.go b/pkg/transparentproxy/transparentproxy_experimental.go
@@ -51,7 +51,7 @@ func hasLocalIPv6() (bool, error) {
 	return false, nil
 }
 
-func shouldEnableIPv6() (bool, error) {
+func ShouldEnableIPv6() (bool, error) {
 	hasIPv6Address, err := hasLocalIPv6()
 	if !hasIPv6Address || err != nil {
 		return false, err
@@ -124,7 +124,7 @@ func (tp *ExperimentalTransparentProxy) Setup(tpConfig *config.TransparentProxyC
 		}
 	}
 
-	ipv6, err := shouldEnableIPv6()
+	ipv6, err := ShouldEnableIPv6()
 	if err != nil {
 		return "", errors.Wrap(err, "cannot verify if IPv6 should be enabled")
 	}