github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 23:47:50 +00:00
Code Issues Projects Releases Wiki Activity

Refactor to use k8s.io/utils/net/ package instead of kubernetes/pkg/util/net/sets

Browse Source 
Signed-off-by: Ashish Ranjan <ashishranjan738@gmail.com>
This commit is contained in:
Ashish Ranjan
2019-02-02 12:31:21 +05:30
parent 0bd35d1b68
commit 7be223e798
42 changed files with 396 additions and 688 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/proxy/iptables/proxier.go
View File

@@ -46,9 +46,9 @@ import (
"k8s.io/kubernetes/pkg/util/async"
"k8s.io/kubernetes/pkg/util/conntrack"
utiliptables "k8s.io/kubernetes/pkg/util/iptables"
utilnet "k8s.io/kubernetes/pkg/util/net"
utilsysctl "k8s.io/kubernetes/pkg/util/sysctl"
utilexec "k8s.io/utils/exec"
utilnet "k8s.io/utils/net"
)
const (
@@ -317,7 +317,7 @@ func NewProxier(ipt utiliptables.Interface,
if len(clusterCIDR) == 0 {
klog.Warning("clusterCIDR not specified, unable to distinguish between internal and external traffic")
} else if utilnet.IsIPv6CIDR(clusterCIDR) != ipt.IsIpv6() {
} else if utilnet.IsIPv6CIDRString(clusterCIDR) != ipt.IsIpv6() {
return nil, fmt.Errorf("clusterCIDR %s has incorrect IP version: expect isIPv6=%t", clusterCIDR, ipt.IsIpv6())
}