diff --git a/tools/portforward/portforward.go b/tools/portforward/portforward.go index ffc0bcac..1c3985f3 100644 --- a/tools/portforward/portforward.go +++ b/tools/portforward/portforward.go @@ -28,9 +28,10 @@ import ( "strings" "sync" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/httpstream" "k8s.io/apimachinery/pkg/util/runtime" + netutils "k8s.io/utils/net" ) // PortForwardProtocolV1Name is the subprotocol used for port forwarding. @@ -131,9 +132,9 @@ func parseAddresses(addressesToParse []string) ([]listenAddress, error) { ip := listenAddress{address: "::1", protocol: "tcp6", failureMode: "all"} parsed[ip.address] = ip } - } else if net.ParseIP(address).To4() != nil { + } else if netutils.ParseIPSloppy(address).To4() != nil { parsed[address] = listenAddress{address: address, protocol: "tcp4", failureMode: "any"} - } else if net.ParseIP(address) != nil { + } else if netutils.ParseIPSloppy(address) != nil { parsed[address] = listenAddress{address: address, protocol: "tcp6", failureMode: "any"} } else { return nil, fmt.Errorf("%s is not a valid IP", address) diff --git a/util/cert/cert.go b/util/cert/cert.go index bffb1526..75143ec0 100644 --- a/util/cert/cert.go +++ b/util/cert/cert.go @@ -33,6 +33,7 @@ import ( "time" "k8s.io/client-go/util/keyutil" + netutils "k8s.io/utils/net" ) const duration365d = time.Hour * 24 * 365 @@ -157,7 +158,7 @@ func GenerateSelfSignedCertKeyWithFixtures(host string, alternateIPs []net.IP, a BasicConstraintsValid: true, } - if ip := net.ParseIP(host); ip != nil { + if ip := netutils.ParseIPSloppy(host); ip != nil { template.IPAddresses = append(template.IPAddresses, ip) } else { template.DNSNames = append(template.DNSNames, host) diff --git a/util/cert/csr_test.go b/util/cert/csr_test.go index d546ec79..e81f25e9 100644 --- a/util/cert/csr_test.go +++ b/util/cert/csr_test.go @@ -25,6 +25,7 @@ import ( "testing" "k8s.io/client-go/util/keyutil" + netutils "k8s.io/utils/net" ) func TestMakeCSR(t *testing.T) { @@ -33,7 +34,7 @@ func TestMakeCSR(t *testing.T) { CommonName: "kube-worker", } dnsSANs := []string{"localhost"} - ipSANs := []net.IP{net.ParseIP("127.0.0.1")} + ipSANs := []net.IP{netutils.ParseIPSloppy("127.0.0.1")} keyData, err := ioutil.ReadFile(keyFile) if err != nil { diff --git a/util/certificate/certificate_manager_test.go b/util/certificate/certificate_manager_test.go index baced0ab..291c7245 100644 --- a/util/certificate/certificate_manager_test.go +++ b/util/certificate/certificate_manager_test.go @@ -38,6 +38,7 @@ import ( "k8s.io/client-go/kubernetes/fake" certificatesclient "k8s.io/client-go/kubernetes/typed/certificates/v1beta1" clienttesting "k8s.io/client-go/testing" + netutils "k8s.io/utils/net" ) var storeCertData = newCertificateData(`-----BEGIN CERTIFICATE----- @@ -394,11 +395,11 @@ func TestCertSatisfiesTemplate(t *testing.T) { name: "Missing IP addresses in certificate", cert: &x509.Certificate{ Subject: pkix.Name{}, - IPAddresses: []net.IP{net.ParseIP("192.168.1.1")}, + IPAddresses: []net.IP{netutils.ParseIPSloppy("192.168.1.1")}, }, template: &x509.CertificateRequest{ Subject: pkix.Name{}, - IPAddresses: []net.IP{net.ParseIP("192.168.1.1"), net.ParseIP("192.168.1.2")}, + IPAddresses: []net.IP{netutils.ParseIPSloppy("192.168.1.1"), netutils.ParseIPSloppy("192.168.1.2")}, }, shouldSatisfy: false, }, @@ -406,11 +407,11 @@ func TestCertSatisfiesTemplate(t *testing.T) { name: "Extra IP addresses in certificate", cert: &x509.Certificate{ Subject: pkix.Name{}, - IPAddresses: []net.IP{net.ParseIP("192.168.1.1"), net.ParseIP("192.168.1.2")}, + IPAddresses: []net.IP{netutils.ParseIPSloppy("192.168.1.1"), netutils.ParseIPSloppy("192.168.1.2")}, }, template: &x509.CertificateRequest{ Subject: pkix.Name{}, - IPAddresses: []net.IP{net.ParseIP("192.168.1.1")}, + IPAddresses: []net.IP{netutils.ParseIPSloppy("192.168.1.1")}, }, shouldSatisfy: true, }, @@ -422,7 +423,7 @@ func TestCertSatisfiesTemplate(t *testing.T) { Organization: []string{"system:nodes"}, }, DNSNames: []string{"foo.example.com"}, - IPAddresses: []net.IP{net.ParseIP("192.168.1.1")}, + IPAddresses: []net.IP{netutils.ParseIPSloppy("192.168.1.1")}, }, template: &x509.CertificateRequest{ Subject: pkix.Name{ @@ -430,7 +431,7 @@ func TestCertSatisfiesTemplate(t *testing.T) { Organization: []string{"system:nodes"}, }, DNSNames: []string{"foo.example.com"}, - IPAddresses: []net.IP{net.ParseIP("192.168.1.1")}, + IPAddresses: []net.IP{netutils.ParseIPSloppy("192.168.1.1")}, }, shouldSatisfy: true, },