github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-08 12:41:58 +00:00
Code Issues Projects Releases Wiki Activity

Fix missing portalNets in tests once and for all by adding a default.

Browse Source
This commit is contained in:
Daniel Smith
2014-10-29 12:27:35 -07:00
parent 858b557bbb
commit 070c6c0440
3 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/integration/integration.go
View File

@@ -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",