fix tests

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,

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

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

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

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") {
+	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.06.0.1 and 10.96.0.10.  Output: %s", dnsOutput)
+		t.Errorf("DNS lookup failed, could not find both 10.96.0.1 and 10.96.0.10.  Output: %s", dnsOutput)
 	}
 }