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

3
test/e2e/framework/ingress/ingress_utils.go
View File

@@ -38,6 +38,7 @@ import (
compute "google.golang.org/api/compute/v1"
"k8s.io/klog/v2"
netutils "k8s.io/utils/net"
appsv1 "k8s.io/api/apps/v1"
v1 "k8s.io/api/core/v1"
@@ -332,7 +333,7 @@ func GenerateRSACerts(host string, isCA bool) ([]byte, []byte, error) {
hosts := strings.Split(host, ",")
for _, h := range hosts {
if ip := net.ParseIP(h); ip != nil {
if ip := netutils.ParseIPSloppy(h); ip != nil {
template.IPAddresses = append(template.IPAddresses, ip)
} else {
template.DNSNames = append(template.DNSNames, h)

12
test/e2e/framework/service/jig.go
View File

@@ -48,7 +48,7 @@ import (
e2erc "k8s.io/kubernetes/test/e2e/framework/rc"
testutils "k8s.io/kubernetes/test/utils"
imageutils "k8s.io/kubernetes/test/utils/image"
utilsnet "k8s.io/utils/net"
netutils "k8s.io/utils/net"
)
// NodePortRange should match whatever the default/configured range is
@@ -821,7 +821,7 @@ func testReachabilityOverServiceName(serviceName string, sp v1.ServicePort, exec
func testReachabilityOverClusterIP(clusterIP string, sp v1.ServicePort, execPod *v1.Pod) error {
// If .spec.clusterIP is set to "" or "None" for service, ClusterIP is not created, so reachability can not be tested over clusterIP:servicePort
if net.ParseIP(clusterIP) == nil {
if netutils.ParseIPSloppy(clusterIP) == nil {
return fmt.Errorf("unable to parse ClusterIP: %s", clusterIP)
}
return testEndpointReachability(clusterIP, sp.Port, sp.Protocol, execPod)
@@ -833,7 +833,7 @@ func testReachabilityOverExternalIP(externalIP string, sp v1.ServicePort, execPo
func testReachabilityOverNodePorts(nodes *v1.NodeList, sp v1.ServicePort, pod *v1.Pod, clusterIP string, externalIPs bool) error {
internalAddrs := e2enode.CollectAddresses(nodes, v1.NodeInternalIP)
isClusterIPV4 := utilsnet.IsIPv4String(clusterIP)
isClusterIPV4 := netutils.IsIPv4String(clusterIP)
for _, internalAddr := range internalAddrs {
// If the node's internal address points to localhost, then we are not
@@ -843,7 +843,7 @@ func testReachabilityOverNodePorts(nodes *v1.NodeList, sp v1.ServicePort, pod *v
continue
}
// Check service reachability on the node internalIP which is same family as clusterIP
if isClusterIPV4 != utilsnet.IsIPv4String(internalAddr) {
if isClusterIPV4 != netutils.IsIPv4String(internalAddr) {
framework.Logf("skipping testEndpointReachability() for internal adddress %s as it does not match clusterIP (%s) family", internalAddr, clusterIP)
continue
}
@@ -856,7 +856,7 @@ func testReachabilityOverNodePorts(nodes *v1.NodeList, sp v1.ServicePort, pod *v
if externalIPs {
externalAddrs := e2enode.CollectAddresses(nodes, v1.NodeExternalIP)
for _, externalAddr := range externalAddrs {
if isClusterIPV4 != utilsnet.IsIPv4String(externalAddr) {
if isClusterIPV4 != netutils.IsIPv4String(externalAddr) {
framework.Logf("skipping testEndpointReachability() for external adddress %s as it does not match clusterIP (%s) family", externalAddr, clusterIP)
continue
}
@@ -872,7 +872,7 @@ func testReachabilityOverNodePorts(nodes *v1.NodeList, sp v1.ServicePort, pod *v
// isInvalidOrLocalhostAddress returns `true` if the provided `ip` is either not
// parsable or the loopback address. Otherwise it will return `false`.
func isInvalidOrLocalhostAddress(ip string) bool {
parsedIP := net.ParseIP(ip)
parsedIP := netutils.ParseIPSloppy(ip)
if parsedIP == nil || parsedIP.IsLoopback() {
return true
}

3
test/e2e/framework/util.go
View File

@@ -63,6 +63,7 @@ import (
testutils "k8s.io/kubernetes/test/utils"
imageutils "k8s.io/kubernetes/test/utils/image"
uexec "k8s.io/utils/exec"
netutils "k8s.io/utils/net"
// TODO: Remove the following imports (ref: https://github.com/kubernetes/kubernetes/issues/81245)
e2ekubectl "k8s.io/kubernetes/test/e2e/framework/kubectl"
@@ -1265,7 +1266,7 @@ func getControlPlaneAddresses(c clientset.Interface) ([]string, []string, []stri
if err != nil {
Failf("Failed to parse hostname: %v", err)
}
if net.ParseIP(hostURL.Host) != nil {
if netutils.ParseIPSloppy(hostURL.Host) != nil {
externalIPs = append(externalIPs, hostURL.Host)
} else {
hostnames = append(hostnames, hostURL.Host)

3
test/e2e/network/netpol/kubemanager.go
View File

@@ -24,6 +24,7 @@ import (
"strings"
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
netutils "k8s.io/utils/net"
v1 "k8s.io/api/core/v1"
networkingv1 "k8s.io/api/networking/v1"
@@ -73,7 +74,7 @@ func (k *kubeManager) initializeCluster(model *Model) error {
if err != nil {
return err
}
if net.ParseIP(svc.Spec.ClusterIP) == nil {
if netutils.ParseIPSloppy(svc.Spec.ClusterIP) == nil {
return fmt.Errorf("empty IP address found for service %s/%s", svc.Namespace, svc.Name)
}
pod.ServiceIP = svc.Spec.ClusterIP

15
test/e2e/network/netpol/network_legacy.go
View File

@@ -20,13 +20,14 @@ import (
"context"
"encoding/json"
"fmt"
"k8s.io/kubernetes/test/e2e/storage/utils"
"net"
"regexp"
"strconv"
"strings"
"time"
"k8s.io/kubernetes/test/e2e/storage/utils"
"github.com/onsi/ginkgo"
v1 "k8s.io/api/core/v1"
networkingv1 "k8s.io/api/networking/v1"
@@ -42,7 +43,7 @@ import (
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
"k8s.io/kubernetes/test/e2e/network/common"
imageutils "k8s.io/kubernetes/test/utils/image"
utilnet "k8s.io/utils/net"
netutils "k8s.io/utils/net"
)
/*
@@ -1346,7 +1347,7 @@ var _ = common.SIGDescribe("NetworkPolicyLegacy [LinuxOnly]", func() {
framework.ExpectNoError(err, "Error occurred while getting pod status.")
}
hostMask := 32
if utilnet.IsIPv6String(podServerStatus.Status.PodIP) {
if netutils.IsIPv6String(podServerStatus.Status.PodIP) {
hostMask = 128
}
podServerCIDR := fmt.Sprintf("%s/%d", podServerStatus.Status.PodIP, hostMask)
@@ -1416,11 +1417,11 @@ var _ = common.SIGDescribe("NetworkPolicyLegacy [LinuxOnly]", func() {
allowMask := 24
hostMask := 32
if utilnet.IsIPv6String(podServerStatus.Status.PodIP) {
if netutils.IsIPv6String(podServerStatus.Status.PodIP) {
allowMask = 64
hostMask = 128
}
_, podServerAllowSubnet, err := net.ParseCIDR(fmt.Sprintf("%s/%d", podServerStatus.Status.PodIP, allowMask))
_, podServerAllowSubnet, err := netutils.ParseCIDRSloppy(fmt.Sprintf("%s/%d", podServerStatus.Status.PodIP, allowMask))
framework.ExpectNoError(err, "could not parse allow subnet")
podServerAllowCIDR := podServerAllowSubnet.String()
@@ -1479,11 +1480,11 @@ var _ = common.SIGDescribe("NetworkPolicyLegacy [LinuxOnly]", func() {
allowMask := 24
hostMask := 32
if utilnet.IsIPv6String(podServerStatus.Status.PodIP) {
if netutils.IsIPv6String(podServerStatus.Status.PodIP) {
allowMask = 64
hostMask = 128
}
_, podServerAllowSubnet, err := net.ParseCIDR(fmt.Sprintf("%s/%d", podServerStatus.Status.PodIP, allowMask))
_, podServerAllowSubnet, err := netutils.ParseCIDRSloppy(fmt.Sprintf("%s/%d", podServerStatus.Status.PodIP, allowMask))
framework.ExpectNoError(err, "could not parse allow subnet")
podServerAllowCIDR := podServerAllowSubnet.String()

4
test/e2e/network/netpol/probe.go
View File

@@ -18,11 +18,11 @@ package netpol
import (
"fmt"
"net"
"github.com/onsi/ginkgo"
v1 "k8s.io/api/core/v1"
"k8s.io/kubernetes/test/e2e/framework"
netutils "k8s.io/utils/net"
)
// decouple us from k8smanager.go
@@ -95,7 +95,7 @@ func probeWorker(prober Prober, jobs <-chan *ProbeJob, results chan<- *ProbeJobR
defer ginkgo.GinkgoRecover()
for job := range jobs {
podFrom := job.PodFrom
if net.ParseIP(job.PodTo.ServiceIP) == nil {
if netutils.ParseIPSloppy(job.PodTo.ServiceIP) == nil {
results <- &ProbeJobResults{
Job: job,
IsConnected: false,

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)
}

6
test/e2e_node/services/apiserver.go
View File

@@ -19,10 +19,10 @@ package services
import (
"fmt"
"io/ioutil"
"net"
"os"
"k8s.io/apiserver/pkg/storage/storagebackend"
netutils "k8s.io/utils/net"
utilerrors "k8s.io/apimachinery/pkg/util/errors"
apiserver "k8s.io/kubernetes/cmd/kube-apiserver/app"
@@ -60,14 +60,14 @@ func (a *APIServer) Start() error {
o := options.NewServerRunOptions()
o.Etcd.StorageConfig = a.storageConfig
_, ipnet, err := net.ParseCIDR(clusterIPRange)
_, ipnet, err := netutils.ParseCIDRSloppy(clusterIPRange)
if err != nil {
return err
}
if len(framework.TestContext.RuntimeConfig) > 0 {
o.APIEnablement.RuntimeConfig = framework.TestContext.RuntimeConfig
}
o.SecureServing.BindAddress = net.ParseIP("127.0.0.1")
o.SecureServing.BindAddress = netutils.ParseIPSloppy("127.0.0.1")
o.ServiceClusterIPRanges = ipnet.String()
o.AllowPrivileged = true
if err := generateTokenFile(tokenFilePath); err != nil {

3
test/images/agnhost/netexec/netexec.go
View File

@@ -38,6 +38,7 @@ import (
utilnet "k8s.io/apimachinery/pkg/util/net"
"k8s.io/apimachinery/pkg/util/sets"
netutils "k8s.io/utils/net"
)
var (
@@ -660,7 +661,7 @@ func parseAddresses(addresses string) ([]string, error) {
res := make([]string, 0)
split := strings.Split(addresses, ",")
for _, address := range split {
netAddr := net.ParseIP(address)
netAddr := netutils.ParseIPSloppy(address)
if netAddr == nil {
return nil, fmt.Errorf("parseAddress: invalid address %s", address)
}

6
test/images/agnhost/no-snat-test/main.go
View File

@@ -19,13 +19,13 @@ package nosnat
import (
"fmt"
"io/ioutil"
"net"
"net/http"
"os"
"strings"
"github.com/spf13/cobra"
"k8s.io/component-base/logs"
netutils "k8s.io/utils/net"
)
// CmdNoSnatTest is used by agnhost Cobra.
@@ -83,10 +83,10 @@ func (m *masqTester) Run() error {
}
// validate that pip and nip are ip addresses.
if net.ParseIP(pip) == nil {
if netutils.ParseIPSloppy(pip) == nil {
return fmt.Errorf("POD_IP env var contained %q, which is not an IP address", pip)
}
if net.ParseIP(nip) == nil {
if netutils.ParseIPSloppy(nip) == nil {
return fmt.Errorf("NODE_IP env var contained %q, which is not an IP address", nip)
}

10
test/images/regression-issue-74839/main.go
View File

@@ -23,6 +23,8 @@ import (
"os"
"strings"
"time"
netutils "k8s.io/utils/net"
)
// TCP port to listen
@@ -120,8 +122,8 @@ func probe(ip string) {
}
data := []byte("boom!!!")
remoteIP := net.ParseIP(addr.String())
localIP := net.ParseIP(conn.LocalAddr().String())
remoteIP := netutils.ParseIPSloppy(addr.String())
localIP := netutils.ParseIPSloppy(conn.LocalAddr().String())
_, err := conn.WriteTo(badPkt.encode(localIP, remoteIP, data[:]), addr)
if err != nil {
log.Printf("conn.WriteTo() error: %v", err)
@@ -141,10 +143,10 @@ func getIPs() []net.IP {
podIP, podIPs := os.Getenv("POD_IP"), os.Getenv("POD_IPS")
if podIPs != "" {
for _, ip := range strings.Split(podIPs, ",") {
ips = append(ips, net.ParseIP(ip))
ips = append(ips, netutils.ParseIPSloppy(ip))
}
} else if podIP != "" {
ips = append(ips, net.ParseIP(podIP))
ips = append(ips, netutils.ParseIPSloppy(podIP))
}
return ips
}

4
test/integration/controlplane/synthetic_controlplane_test.go
View File

@@ -22,7 +22,6 @@ import (
"encoding/json"
"fmt"
"io/ioutil"
"net"
"net/http"
"os"
"path"
@@ -51,6 +50,7 @@ import (
"k8s.io/kubernetes/pkg/controlplane"
"k8s.io/kubernetes/test/integration"
"k8s.io/kubernetes/test/integration/framework"
netutils "k8s.io/utils/net"
)
const (
@@ -638,7 +638,7 @@ func TestAPIServerService(t *testing.T) {
func TestServiceAlloc(t *testing.T) {
cfg := framework.NewIntegrationTestControlPlaneConfig()
_, cidr, err := net.ParseCIDR("192.168.0.0/29")
_, cidr, err := netutils.ParseCIDRSloppy("192.168.0.0/29")
if err != nil {
t.Fatalf("bad cidr: %v", err)
}

6
test/integration/dualstack/dualstack_endpoints_test.go
View File

@@ -19,7 +19,6 @@ package dualstack
import (
"context"
"fmt"
"net"
"testing"
"time"
@@ -38,6 +37,7 @@ import (
"k8s.io/kubernetes/pkg/controller/endpointslice"
"k8s.io/kubernetes/pkg/features"
"k8s.io/kubernetes/test/integration/framework"
netutils "k8s.io/utils/net"
)
func TestDualStackEndpoints(t *testing.T) {
@@ -52,13 +52,13 @@ func TestDualStackEndpoints(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.IPv6DualStack, dualStack)()
cfg := framework.NewIntegrationTestControlPlaneConfig()
_, cidr, err := net.ParseCIDR(serviceCIDR)
_, cidr, err := netutils.ParseCIDRSloppy(serviceCIDR)
if err != nil {
t.Fatalf("Bad cidr: %v", err)
}
cfg.ExtraConfig.ServiceIPRange = *cidr
_, secCidr, err := net.ParseCIDR(secondaryServiceCIDR)
_, secCidr, err := netutils.ParseCIDRSloppy(secondaryServiceCIDR)
if err != nil {
t.Fatalf("Bad cidr: %v", err)
}

36
test/integration/dualstack/dualstack_test.go
View File

@@ -54,7 +54,7 @@ func TestCreateServiceSingleStackIPv4(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.IPv6DualStack, true)()
cfg := framework.NewIntegrationTestControlPlaneConfig()
_, cidr, err := net.ParseCIDR(serviceCIDR)
_, cidr, err := netutils.ParseCIDRSloppy(serviceCIDR)
if err != nil {
t.Fatalf("bad cidr: %v", err)
}
@@ -271,7 +271,7 @@ func TestCreateServiceDualStackIPv6(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.IPv6DualStack, true)()
cfg := framework.NewIntegrationTestControlPlaneConfig()
_, cidr, err := net.ParseCIDR(serviceCIDR)
_, cidr, err := netutils.ParseCIDRSloppy(serviceCIDR)
if err != nil {
t.Fatalf("bad cidr: %v", err)
}
@@ -491,13 +491,13 @@ func TestCreateServiceDualStackIPv4IPv6(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.IPv6DualStack, true)()
cfg := framework.NewIntegrationTestControlPlaneConfig()
_, cidr, err := net.ParseCIDR(serviceCIDR)
_, cidr, err := netutils.ParseCIDRSloppy(serviceCIDR)
if err != nil {
t.Fatalf("bad cidr: %v", err)
}
cfg.ExtraConfig.ServiceIPRange = *cidr
_, secCidr, err := net.ParseCIDR(secondaryServiceCIDR)
_, secCidr, err := netutils.ParseCIDRSloppy(secondaryServiceCIDR)
if err != nil {
t.Fatalf("bad cidr: %v", err)
}
@@ -718,13 +718,13 @@ func TestCreateServiceDualStackIPv6IPv4(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.IPv6DualStack, true)()
cfg := framework.NewIntegrationTestControlPlaneConfig()
_, cidr, err := net.ParseCIDR(serviceCIDR)
_, cidr, err := netutils.ParseCIDRSloppy(serviceCIDR)
if err != nil {
t.Fatalf("bad cidr: %v", err)
}
cfg.ExtraConfig.ServiceIPRange = *cidr
_, secCidr, err := net.ParseCIDR(secondaryServiceCIDR)
_, secCidr, err := netutils.ParseCIDRSloppy(secondaryServiceCIDR)
if err != nil {
t.Fatalf("bad cidr: %v", err)
}
@@ -948,13 +948,13 @@ func TestUpgradeDowngrade(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.IPv6DualStack, true)()
cfg := framework.NewIntegrationTestControlPlaneConfig()
_, cidr, err := net.ParseCIDR(serviceCIDR)
_, cidr, err := netutils.ParseCIDRSloppy(serviceCIDR)
if err != nil {
t.Fatalf("bad cidr: %v", err)
}
cfg.ExtraConfig.ServiceIPRange = *cidr
_, secCidr, err := net.ParseCIDR(secondaryServiceCIDR)
_, secCidr, err := netutils.ParseCIDRSloppy(secondaryServiceCIDR)
if err != nil {
t.Fatalf("bad cidr: %v", err)
}
@@ -1063,13 +1063,13 @@ func TestConvertToFromExternalName(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.IPv6DualStack, true)()
cfg := framework.NewIntegrationTestControlPlaneConfig()
_, cidr, err := net.ParseCIDR(serviceCIDR)
_, cidr, err := netutils.ParseCIDRSloppy(serviceCIDR)
if err != nil {
t.Fatalf("bad cidr: %v", err)
}
cfg.ExtraConfig.ServiceIPRange = *cidr
_, secCidr, err := net.ParseCIDR(secondaryServiceCIDR)
_, secCidr, err := netutils.ParseCIDRSloppy(secondaryServiceCIDR)
if err != nil {
t.Fatalf("bad cidr: %v", err)
}
@@ -1153,7 +1153,7 @@ func TestExistingServiceDefaulting(t *testing.T) {
// Create an IPv4IPv6 dual stack control-plane
serviceCIDR := "10.0.0.0/16"
cfg := framework.NewIntegrationTestControlPlaneConfig()
_, cidr, err := net.ParseCIDR(serviceCIDR)
_, cidr, err := netutils.ParseCIDRSloppy(serviceCIDR)
if err != nil {
t.Fatalf("bad cidr: %v", err)
}
@@ -1236,13 +1236,13 @@ func TestPreferDualStack(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.IPv6DualStack, true)()
cfg := framework.NewIntegrationTestControlPlaneConfig()
_, cidr, err := net.ParseCIDR(serviceCIDR)
_, cidr, err := netutils.ParseCIDRSloppy(serviceCIDR)
if err != nil {
t.Fatalf("bad cidr: %v", err)
}
cfg.ExtraConfig.ServiceIPRange = *cidr
_, secCidr, err := net.ParseCIDR(secondaryServiceCIDR)
_, secCidr, err := netutils.ParseCIDRSloppy(secondaryServiceCIDR)
if err != nil {
t.Fatalf("bad cidr: %v", err)
}
@@ -1321,7 +1321,7 @@ func TestServiceUpdate(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.IPv6DualStack, false)()
cfg := framework.NewIntegrationTestControlPlaneConfig()
_, cidr, err := net.ParseCIDR(serviceCIDR)
_, cidr, err := netutils.ParseCIDRSloppy(serviceCIDR)
if err != nil {
t.Fatalf("bad cidr: %v", err)
}
@@ -1486,7 +1486,7 @@ func TestUpgradeServicePreferToDualStack(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.IPv6DualStack, true)()
cfg := framework.NewIntegrationTestControlPlaneConfig()
_, cidr, err := net.ParseCIDR(serviceCIDR)
_, cidr, err := netutils.ParseCIDRSloppy(serviceCIDR)
if err != nil {
t.Fatalf("bad cidr: %v", err)
}
@@ -1545,7 +1545,7 @@ func TestUpgradeServicePreferToDualStack(t *testing.T) {
closeFn()
secondaryServiceCIDR := "2001:db8:1::/48"
_, secCidr, err := net.ParseCIDR(secondaryServiceCIDR)
_, secCidr, err := netutils.ParseCIDRSloppy(secondaryServiceCIDR)
if err != nil {
t.Fatalf("bad cidr: %v", err)
}
@@ -1582,12 +1582,12 @@ func TestDowngradeServicePreferToDualStack(t *testing.T) {
secondaryServiceCIDR := "2001:db8:1::/48"
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.IPv6DualStack, true)()
dualStackCfg := framework.NewIntegrationTestControlPlaneConfig()
_, cidr, err := net.ParseCIDR(serviceCIDR)
_, cidr, err := netutils.ParseCIDRSloppy(serviceCIDR)
if err != nil {
t.Fatalf("bad cidr: %v", err)
}
dualStackCfg.ExtraConfig.ServiceIPRange = *cidr
_, secCidr, err := net.ParseCIDR(secondaryServiceCIDR)
_, secCidr, err := netutils.ParseCIDRSloppy(secondaryServiceCIDR)
if err != nil {
t.Fatalf("bad cidr: %v", err)
}

3
test/integration/etcd/server.go
View File

@@ -49,6 +49,7 @@ import (
"k8s.io/kubernetes/cmd/kube-apiserver/app/options"
"k8s.io/kubernetes/test/integration"
"k8s.io/kubernetes/test/integration/framework"
netutils "k8s.io/utils/net"
// install all APIs
_ "k8s.io/kubernetes/pkg/controlplane"
@@ -68,7 +69,7 @@ func StartRealAPIServerOrDie(t *testing.T, configFuncs ...func(*options.ServerRu
t.Fatal(err)
}
_, defaultServiceClusterIPRange, err := net.ParseCIDR("10.0.0.0/24")
_, defaultServiceClusterIPRange, err := netutils.ParseCIDRSloppy("10.0.0.0/24")
if err != nil {
t.Fatal(err)
}

3
test/integration/examples/apiserver_test.go
View File

@@ -50,6 +50,7 @@ import (
wardlev1alpha1 "k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1"
wardlev1beta1 "k8s.io/sample-apiserver/pkg/apis/wardle/v1beta1"
sampleserver "k8s.io/sample-apiserver/pkg/cmd/server"
netutils "k8s.io/utils/net"
)
func TestAggregatedAPIServer(t *testing.T) {
@@ -80,7 +81,7 @@ func TestAggregatedAPIServer(t *testing.T) {
go func() {
o := sampleserver.NewWardleServerOptions(os.Stdout, os.Stderr)
o.RecommendedOptions.SecureServing.Listener = listener
o.RecommendedOptions.SecureServing.BindAddress = net.ParseIP("127.0.0.1")
o.RecommendedOptions.SecureServing.BindAddress = netutils.ParseIPSloppy("127.0.0.1")
wardleCmd := sampleserver.NewCommandStartWardleServer(o, stopCh)
wardleCmd.SetArgs([]string{
"--authentication-kubeconfig", wardleToKASKubeConfigFile,

5
test/integration/framework/controlplane_utils.go
View File

@@ -57,6 +57,7 @@ import (
"k8s.io/kubernetes/pkg/generated/openapi"
"k8s.io/kubernetes/pkg/kubeapiserver"
kubeletclient "k8s.io/kubernetes/pkg/kubelet/client"
netutils "k8s.io/utils/net"
)
// Config is a struct of configuration directives for NewControlPlaneComponents.
@@ -205,7 +206,7 @@ func startAPIServerOrDie(controlPlaneConfig *controlplane.Config, incomingServer
}
if controlPlaneConfig.ExtraConfig.ServiceIPRange.IP == nil {
controlPlaneConfig.ExtraConfig.ServiceIPRange = net.IPNet{IP: net.ParseIP("10.0.0.0"), Mask: net.CIDRMask(24, 32)}
controlPlaneConfig.ExtraConfig.ServiceIPRange = net.IPNet{IP: netutils.ParseIPSloppy("10.0.0.0"), Mask: net.CIDRMask(24, 32)}
}
m, err = controlPlaneConfig.Complete().New(genericapiserver.NewEmptyDelegate())
if err != nil {
@@ -263,7 +264,7 @@ func NewIntegrationTestControlPlaneConfig() *controlplane.Config {
// configured with the provided options.
func NewIntegrationTestControlPlaneConfigWithOptions(opts *ControlPlaneConfigOptions) *controlplane.Config {
controlPlaneConfig := NewControlPlaneConfigWithOptions(opts)
controlPlaneConfig.GenericConfig.PublicAddress = net.ParseIP("192.168.10.4")
controlPlaneConfig.GenericConfig.PublicAddress = netutils.ParseIPSloppy("192.168.10.4")
controlPlaneConfig.ExtraConfig.APIResourceConfigSource = controlplane.DefaultAPIResourceConfigSource()
// TODO: get rid of these tests or port them to secure serving

5
test/integration/framework/test_server.go
View File

@@ -40,6 +40,7 @@ import (
"k8s.io/kubernetes/cmd/kube-apiserver/app/options"
"k8s.io/kubernetes/pkg/controlplane"
"k8s.io/kubernetes/test/utils"
netutils "k8s.io/utils/net"
)
// This key is for testing purposes only and is not considered secure.
@@ -63,7 +64,7 @@ func StartTestServer(t *testing.T, stopCh <-chan struct{}, setup TestServerSetup
os.RemoveAll(certDir)
}()
_, defaultServiceClusterIPRange, _ := net.ParseCIDR("10.0.0.0/24")
_, defaultServiceClusterIPRange, _ := netutils.ParseCIDRSloppy("10.0.0.0/24")
proxySigningKey, err := utils.NewPrivateKey()
if err != nil {
t.Fatal(err)
@@ -105,7 +106,7 @@ func StartTestServer(t *testing.T, stopCh <-chan struct{}, setup TestServerSetup
kubeAPIServerOptions := options.NewServerRunOptions()
kubeAPIServerOptions.SecureServing.Listener = listener
kubeAPIServerOptions.SecureServing.BindAddress = net.ParseIP("127.0.0.1")
kubeAPIServerOptions.SecureServing.BindAddress = netutils.ParseIPSloppy("127.0.0.1")
kubeAPIServerOptions.SecureServing.ServerCert.CertDirectory = certDir
kubeAPIServerOptions.ServiceAccountSigningKeyFile = saSigningKeyFile.Name()
kubeAPIServerOptions.Etcd.StorageConfig.Prefix = path.Join("/", uuid.New().String(), "registry")

5
test/integration/ipamperf/ipam_test.go
View File

@@ -26,6 +26,7 @@ import (
"time"
"k8s.io/klog/v2"
netutils "k8s.io/utils/net"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/informers"
@@ -117,8 +118,8 @@ func TestPerformance(t *testing.T) {
apiURL, apiserverShutdown := util.StartApiserver()
defer apiserverShutdown()
_, clusterCIDR, _ := net.ParseCIDR("10.96.0.0/11") // allows up to 8K nodes
_, serviceCIDR, _ := net.ParseCIDR("10.94.0.0/24") // does not matter for test - pick upto 250 services
_, clusterCIDR, _ := netutils.ParseCIDRSloppy("10.96.0.0/11") // allows up to 8K nodes
_, serviceCIDR, _ := netutils.ParseCIDRSloppy("10.94.0.0/24") // does not matter for test - pick upto 250 services
subnetMaskSize := 24
var (