From 070c6c044090229068db43b61257f7ada5d15043 Mon Sep 17 00:00:00 2001
From: Daniel Smith <dbsmith@google.com>
Date: Wed, 29 Oct 2014 12:27:35 -0700
Subject: [PATCH] Fix missing portalNets in tests once and for all by adding a
 default.

---
 cmd/integration/integration.go  | 7 -------
 pkg/master/master.go            | 9 +++++++++
 test/integration/client_test.go | 8 --------
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/cmd/integration/integration.go b/cmd/integration/integration.go
index dcb787a7b0..6aec0b8e6d 100644
--- a/cmd/integration/integration.go
+++ b/cmd/integration/integration.go
@@ -129,12 +129,6 @@ func startComponents(manifestURL string) (apiServerURL string) {
 	}
 
 	// Master
-	_, portalNet, err := net.ParseCIDR("10.0.0.0/24")
-	if err != nil {
-		glog.Fatalf("Unable to parse CIDR: %v", err)
-	}
-	glog.Infof("Using portalNet '%v'", portalNet)
-
 	host, port, err := net.SplitHostPort(strings.TrimLeft(apiServer.URL, "http://"))
 	if err != nil {
 		glog.Fatalf("Unable to parse URL '%v': %v", apiServer.URL, err)
@@ -150,7 +144,6 @@ func startComponents(manifestURL string) (apiServerURL string) {
 		EtcdHelper:        helper,
 		Minions:           machineList,
 		KubeletClient:     fakeKubeletClient{},
-		PortalNet:         portalNet,
 		Mux:               mux,
 		EnableLogsSupport: false,
 		APIPrefix:         "/api",
diff --git a/pkg/master/master.go b/pkg/master/master.go
index a014d41eaf..ea62613a87 100644
--- a/pkg/master/master.go
+++ b/pkg/master/master.go
@@ -131,6 +131,15 @@ func NewEtcdHelper(client tools.EtcdGetSet, version string) (helper tools.EtcdHe
 
 // setDefaults fills in any fields not set that are required to have valid data.
 func setDefaults(c *Config) {
+	if c.PortalNet == nil {
+		defaultNet := "10.0.0.0/24"
+		glog.Warningf("Portal net unspecified. Defaulting to %v.", defaultNet)
+		_, portalNet, err := net.ParseCIDR(defaultNet)
+		if err != nil {
+			glog.Fatalf("Unable to parse CIDR: %v", err)
+		}
+		c.PortalNet = portalNet
+	}
 	if c.MasterCount == 0 {
 		// Clearly, there will be at least one master.
 		c.MasterCount = 1
diff --git a/test/integration/client_test.go b/test/integration/client_test.go
index 9cac0f3d5a..821564f850 100644
--- a/test/integration/client_test.go
+++ b/test/integration/client_test.go
@@ -19,7 +19,6 @@ limitations under the License.
 package integration
 
 import (
-	"net"
 	"net/http"
 	"net/http/httptest"
 	"reflect"
@@ -30,8 +29,6 @@ import (
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/master"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/version"
-
-	"github.com/golang/glog"
 )
 
 func init() {
@@ -45,13 +42,8 @@ func TestClient(t *testing.T) {
 	}
 	mux := http.NewServeMux()
 
-	_, portalNet, err := net.ParseCIDR("10.0.0.0/24")
-	if err != nil {
-		glog.Fatalf("Unable to parse CIDR: %v", err)
-	}
 	master.New(&master.Config{
 		EtcdHelper:        helper,
-		PortalNet:         portalNet,
 		Mux:               mux,
 		EnableLogsSupport: false,
 		EnableUISupport:   false,