feat(transparent-proxy): fix failed e2e tests

Signed-off-by: Jay Chen <1180092+jijiechen@users.noreply.github.com>
kumahq · Mar 13, 2024 · 063bc90 · 063bc90
1 parent 1fc16c4
commit 063bc90
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/app/cni/pkg/cni/annotations.go b/app/cni/pkg/cni/annotations.go
@@ -1,6 +1,7 @@
 package cni
 
 import (
+	"fmt"
 	"strconv"
 	"strings"
 
@@ -25,7 +26,7 @@ var annotationRegistry = map[string]*annotationParam{
 	"excludeOutboundPorts":        {"traffic.kuma.io/exclude-outbound-ports", defaultRedirectExcludePort, validatePortList},
 	"inboundPort":                 {"kuma.io/transparent-proxying-inbound-port", defaultInboundPort, validatePortList},
 	"inboundPortV6":               {"kuma.io/transparent-proxying-inbound-v6-port", defaultInboundPortV6, validatePortList},
-	"ipFamilyMode":                {"kuma.io/transparent-proxying-ip-family-mode", defaultIPFamilyMode, validateBool},
+	"ipFamilyMode":                {"kuma.io/transparent-proxying-ip-family-mode", defaultIPFamilyMode, validateIpFamilyMode},
 	"outboundPort":                {"kuma.io/transparent-proxying-outbound-port", defaultOutboundPort, validatePortList},
 	"isGateway":                   {"kuma.io/gateway", "false", alwaysValidFunc},
 	"builtinDNS":                  {"kuma.io/builtin-dns", "false", alwaysValidFunc},
@@ -97,18 +98,18 @@ func validatePortList(ports string) error {
 	return nil
 }
 
-func validateBool(val string) error {
+func validateIpFamilyMode(val string) error {
 	if val == "" {
 		return errors.New("value is empty")
 	}
 
-	validValues := []string{"yes", "no", "true", "false"}
+	validValues := []string{"dualstack", "ipv4", "ipv6"}
 	for _, valid := range validValues {
 		if valid == val {
 			return nil
 		}
 	}
-	return errors.New("value is not valid")
+	return errors.New(fmt.Sprintf("value '%s' is not a valid IP family mode", val))
 }
 
 func getAnnotationOrDefault(name string, annotations map[string]string) (string, error) {

diff --git a/pkg/transparentproxy/kubernetes/kubernetes.go b/pkg/transparentproxy/kubernetes/kubernetes.go
@@ -172,7 +172,7 @@ func (pr *PodRedirect) AsKumactlCommandLine() []string {
 	}
 
 	result = append(result, "--ip-family-mode", pr.IpFamilyMode)
-	if pr.IpFamilyMode == metadata.IpFamilyModeDualStack &&
+	if pr.IpFamilyMode != metadata.IpFamilyModeIPv4 &&
 		pr.RedirectPortInboundV6 > 0 &&
 		pr.RedirectPortInboundV6 != pr.RedirectPortInbound {
 		result = append(result,