From 1fb6daffd0fc84bbb562c1a489c2f1f38d798e42 Mon Sep 17 00:00:00 2001 From: zhangzujian Date: Wed, 4 Sep 2024 06:19:49 +0000 Subject: [PATCH] remove incorrect error logging Signed-off-by: zhangzujian --- pkg/util/net.go | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkg/util/net.go b/pkg/util/net.go index 23bf0e4a8f5..947ff5e3f28 100644 --- a/pkg/util/net.go +++ b/pkg/util/net.go @@ -121,7 +121,7 @@ func CIDRContainIP(cidrStr, ipStr string) bool { if len(cidrs) == 1 { for _, ip := range ips { if CheckProtocol(cidrStr) != CheckProtocol(ip) { - klog.Errorf("ip %s and cidr %s should be the same protocol", ip, cidrStr) + klog.Warningf("ip %q and cidr %q should be the same protocol", ip, cidrStr) return false } } @@ -140,12 +140,10 @@ func CIDRContainIP(cidrStr, ipStr string) bool { } ipAddr := net.ParseIP(ip) if ipAddr == nil { - klog.Errorf("invalid ip %s", ip) + klog.Errorf("invalid ip %q", ip) return false } - if !cidrNet.Contains(ipAddr) { - klog.Errorf("ip %s is not in cidr %s", ip, cidr) return false } } @@ -155,6 +153,10 @@ func CIDRContainIP(cidrStr, ipStr string) bool { } func CheckProtocol(address string) string { + if address == "" { + return "" + } + ips := strings.Split(address, ",") if len(ips) == 2 { IP1 := net.ParseIP(strings.Split(ips[0], "/")[0]) @@ -165,7 +167,7 @@ func CheckProtocol(address string) string { if IP2.To4() != nil && IP1.To4() == nil && IP1.To16() != nil { return kubeovnv1.ProtocolDual } - err := fmt.Errorf("invalid address %s", address) + err := fmt.Errorf("invalid address %q", address) klog.Error(err) return "" } @@ -179,7 +181,7 @@ func CheckProtocol(address string) string { } // cidr format error - err := fmt.Errorf("invalid address %s", address) + err := fmt.Errorf("invalid address %q", address) klog.Error(err) return "" }