From 88a849626f56a8f6defc13df7a7f6bd3bd71e7d0 Mon Sep 17 00:00:00 2001 From: Sam Edwards Date: Fri, 8 Sep 2023 21:43:23 -0600 Subject: [PATCH] Don't use `To16() != nil` to detect IPv6 addresses The ip.To16() function returns non-nil if `ip` is any kind of IP address, including IPv4. To look for IPv6 specifically, use ip.To4() == nil. Signed-off-by: Sam Edwards --- pkg/cri/sbserver/sandbox_run.go | 2 +- pkg/cri/server/sandbox_run.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/cri/sbserver/sandbox_run.go b/pkg/cri/sbserver/sandbox_run.go index e86b867c5..056c452cf 100644 --- a/pkg/cri/sbserver/sandbox_run.go +++ b/pkg/cri/sbserver/sandbox_run.go @@ -612,7 +612,7 @@ func selectPodIPs(ctx context.Context, configs []*cni.IPConfig, preference strin } case "ipv6": for i, ip := range configs { - if ip.IP.To16() != nil { + if ip.IP.To4() == nil { return ipString(ip), append(extra, toStrings(configs[i+1:])...) } extra = append(extra, ipString(ip)) diff --git a/pkg/cri/server/sandbox_run.go b/pkg/cri/server/sandbox_run.go index 55e14e5a8..6cf051823 100644 --- a/pkg/cri/server/sandbox_run.go +++ b/pkg/cri/server/sandbox_run.go @@ -692,7 +692,7 @@ func selectPodIPs(ctx context.Context, configs []*cni.IPConfig, preference strin } case "ipv6": for i, ip := range configs { - if ip.IP.To16() != nil { + if ip.IP.To4() == nil { return ipString(ip), append(extra, toStrings(configs[i+1:])...) } extra = append(extra, ipString(ip))