github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

run hack/update-netparse-cve.sh

Browse Source
This commit is contained in:
Antonio Ojea
2021-08-20 01:16:14 +02:00
parent e9ddac5d85
commit 0cd75e8fec
159 changed files with 1071 additions and 988 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/e2e_kubeadm/networking_test.go
View File

@@ -18,12 +18,12 @@ package kubeadm
import (
"context"
"net"
"strings"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/kubernetes/test/e2e/framework"
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
netutils "k8s.io/utils/net"
"github.com/onsi/ginkgo"
)
@@ -163,14 +163,14 @@ var _ = Describe("networking [setup-networking]", func() {
// ipWithinSubnet returns true if an IP (targetIP) falls within the reference subnet (refIPNet)
func ipWithinSubnet(refIPNet, targetIP string) bool {
_, rNet, _ := net.ParseCIDR(refIPNet)
tIP := net.ParseIP(targetIP)
_, rNet, _ := netutils.ParseCIDRSloppy(refIPNet)
tIP := netutils.ParseIPSloppy(targetIP)
return rNet.Contains(tIP)
}
// subnetWithinSubnet returns true if a subnet (targetNet) falls within the reference subnet (refIPNet)
func subnetWithinSubnet(refIPNet, targetNet string) bool {
_, rNet, _ := net.ParseCIDR(refIPNet)
tNet, _, _ := net.ParseCIDR(targetNet)
_, rNet, _ := netutils.ParseCIDRSloppy(refIPNet)
tNet, _, _ := netutils.ParseCIDRSloppy(targetNet)
return rNet.Contains(tNet)
}