From 5381c9afe1e4c2aad7f56509241cfa7f719fbe9e Mon Sep 17 00:00:00 2001 From: chendotjs Date: Sun, 3 Nov 2019 16:48:16 +0800 Subject: [PATCH] simplify check for IPv6 in kubelet. --- pkg/kubelet/BUILD | 1 + pkg/kubelet/kubelet.go | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/kubelet/BUILD b/pkg/kubelet/BUILD index fd7662d4352..e6a4deed629 100644 --- a/pkg/kubelet/BUILD +++ b/pkg/kubelet/BUILD @@ -149,6 +149,7 @@ go_library( "//vendor/k8s.io/klog:go_default_library", "//vendor/k8s.io/utils/exec:go_default_library", "//vendor/k8s.io/utils/integer:go_default_library", + "//vendor/k8s.io/utils/net:go_default_library", "//vendor/k8s.io/utils/path:go_default_library", ], ) diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index 9f69dd4b61e..40486e829a8 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -119,6 +119,7 @@ import ( "k8s.io/kubernetes/pkg/volume/util/volumepathhandler" utilexec "k8s.io/utils/exec" "k8s.io/utils/integer" + utilnet "k8s.io/utils/net" ) const ( @@ -484,7 +485,7 @@ func NewMainKubelet(kubeCfg *kubeletconfiginternal.KubeletConfiguration, httpClient := &http.Client{} parsedNodeIP := net.ParseIP(nodeIP) protocol := utilipt.ProtocolIpv4 - if parsedNodeIP != nil && parsedNodeIP.To4() == nil { + if utilnet.IsIPv6(parsedNodeIP) { klog.V(0).Infof("IPv6 node IP (%s), assume IPv6 operation", nodeIP) protocol = utilipt.ProtocolIpv6 }