From afc991ad3f44c25e1720a7a38daf60e93d812d3b Mon Sep 17 00:00:00 2001 From: Matt Rickard Date: Mon, 23 Oct 2017 10:49:06 -0700 Subject: [PATCH] fix tests --- pkg/localkube/localkube_test.go | 7 ++++--- pkg/localkube/ready_test.go | 11 ++++++++++- pkg/minikube/bootstrapper/certs_test.go | 2 ++ pkg/minikube/bootstrapper/kubeadm/kubeadm_test.go | 10 +++++----- test/integration/cluster_dns_test.go | 4 ++-- 5 files changed, 23 insertions(+), 11 deletions(-) diff --git a/pkg/localkube/localkube_test.go b/pkg/localkube/localkube_test.go index be83d59b19..b25e51ae78 100644 --- a/pkg/localkube/localkube_test.go +++ b/pkg/localkube/localkube_test.go @@ -24,6 +24,7 @@ import ( "testing" "k8s.io/minikube/pkg/minikube/tests" + "k8s.io/minikube/pkg/util" ) var testIPs = []net.IP{net.ParseIP("1.2.3.4")} @@ -33,7 +34,7 @@ func TestGenerateCerts(t *testing.T) { defer os.RemoveAll(tempDir) os.Mkdir(filepath.Join(tempDir, "certs"), 0777) - _, ipRange, _ := net.ParseCIDR("10.0.0.0/24") + _, ipRange, _ := net.ParseCIDR(util.DefaultServiceCIDR) lk := LocalkubeServer{ LocalkubeDirectory: tempDir, ServiceClusterIPRange: *ipRange, @@ -92,7 +93,7 @@ func TestShouldGenerateCertsMismatchedIP(t *testing.T) { defer os.RemoveAll(tempDir) os.Mkdir(filepath.Join(tempDir, "certs"), 0777) - _, ipRange, _ := net.ParseCIDR("10.0.0.0/24") + _, ipRange, _ := net.ParseCIDR(util.DefaultServiceCIDR) lk := LocalkubeServer{ LocalkubeDirectory: tempDir, ServiceClusterIPRange: *ipRange, @@ -110,7 +111,7 @@ func TestShouldNotGenerateCerts(t *testing.T) { defer os.RemoveAll(tempDir) os.Mkdir(filepath.Join(tempDir, "certs"), 0777) - _, ipRange, _ := net.ParseCIDR("10.0.0.0/24") + _, ipRange, _ := net.ParseCIDR(util.DefaultServiceCIDR) lk := LocalkubeServer{ LocalkubeDirectory: tempDir, ServiceClusterIPRange: *ipRange, diff --git a/pkg/localkube/ready_test.go b/pkg/localkube/ready_test.go index 7426fc9854..e9e429f707 100644 --- a/pkg/localkube/ready_test.go +++ b/pkg/localkube/ready_test.go @@ -21,12 +21,14 @@ import ( "crypto/x509" "io" "io/ioutil" + "net" "net/http" "net/http/httptest" "os" "testing" "k8s.io/minikube/pkg/minikube/tests" + "k8s.io/minikube/pkg/util" ) func TestBasicHealthCheck(t *testing.T) { @@ -42,7 +44,14 @@ func TestBasicHealthCheck(t *testing.T) { tempDir := tests.MakeTempDir() defer os.RemoveAll(tempDir) - lk := LocalkubeServer{LocalkubeDirectory: tempDir} + _, ipnet, err := net.ParseCIDR(util.DefaultServiceCIDR) + if err != nil { + t.Fatalf("Error parsing default service cidr range: %s", err) + } + lk := LocalkubeServer{ + LocalkubeDirectory: tempDir, + ServiceClusterIPRange: *ipnet, + } lk.GenerateCerts() cert, err := tls.LoadX509KeyPair(lk.GetPublicKeyCertPath(), lk.GetPrivateKeyCertPath()) diff --git a/pkg/minikube/bootstrapper/certs_test.go b/pkg/minikube/bootstrapper/certs_test.go index 7c5f2b417f..94e5254d70 100644 --- a/pkg/minikube/bootstrapper/certs_test.go +++ b/pkg/minikube/bootstrapper/certs_test.go @@ -23,6 +23,7 @@ import ( "k8s.io/minikube/pkg/minikube/constants" "k8s.io/minikube/pkg/minikube/tests" + "k8s.io/minikube/pkg/util" ) func TestSetupCerts(t *testing.T) { @@ -33,6 +34,7 @@ func TestSetupCerts(t *testing.T) { k8s := KubernetesConfig{ APIServerName: constants.APIServerName, DNSDomain: constants.ClusterDNSDomain, + ServiceCIDR: util.DefaultServiceCIDR, } var filesToBeTransferred []string diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm_test.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm_test.go index 5d598ba02a..d0063dbcef 100644 --- a/pkg/minikube/bootstrapper/kubeadm/kubeadm_test.go +++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm_test.go @@ -45,7 +45,7 @@ api: kubernetesVersion: v1.8.0 certificatesDir: /var/lib/localkube/certs/ networking: - serviceSubnet: 10.0.0.0/24 + serviceSubnet: 10.96.0.0/12 etcd: dataDir: /data nodeName: minikube @@ -83,7 +83,7 @@ api: kubernetesVersion: v1.8.0-alpha.0 certificatesDir: /var/lib/localkube/certs/ networking: - serviceSubnet: 10.0.0.0/24 + serviceSubnet: 10.96.0.0/12 etcd: dataDir: /data nodeName: extra-args-minikube @@ -122,7 +122,7 @@ api: kubernetesVersion: v1.8.0-alpha.0 certificatesDir: /var/lib/localkube/certs/ networking: - serviceSubnet: 10.0.0.0/24 + serviceSubnet: 10.96.0.0/12 etcd: dataDir: /data nodeName: extra-args-minikube @@ -147,7 +147,7 @@ api: kubernetesVersion: v1.8.0-alpha.0 certificatesDir: /var/lib/localkube/certs/ networking: - serviceSubnet: 10.0.0.0/24 + serviceSubnet: 10.96.0.0/12 etcd: dataDir: /data nodeName: extra-args-minikube @@ -182,7 +182,7 @@ api: kubernetesVersion: v1.8.0-alpha.0 certificatesDir: /var/lib/localkube/certs/ networking: - serviceSubnet: 10.0.0.0/24 + serviceSubnet: 10.96.0.0/12 etcd: dataDir: /data nodeName: extra-args-minikube diff --git a/test/integration/cluster_dns_test.go b/test/integration/cluster_dns_test.go index f43766d8a9..ddc874a2f6 100644 --- a/test/integration/cluster_dns_test.go +++ b/test/integration/cluster_dns_test.go @@ -65,7 +65,7 @@ func testClusterDNS(t *testing.T) { t.Fatalf("running nslookup in pod:%s", err) } dnsOutput := string(dnsByteArr) - if !strings.Contains(dnsOutput, "10.96.0.1") || !strings.Contains(dnsOutput, "10.0.0.10") { - t.Errorf("DNS lookup failed, could not find both 10.06.0.1 and 10.96.0.10. Output: %s", dnsOutput) + if !strings.Contains(dnsOutput, "10.96.0.1") || !strings.Contains(dnsOutput, "10.96.0.10") { + t.Errorf("DNS lookup failed, could not find both 10.96.0.1 and 10.96.0.10. Output: %s", dnsOutput) } }