github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 07:20:13 +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
Show Stats 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 // 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://")) host, port, err := net.SplitHostPort(strings.TrimLeft(apiServer.URL, "http://"))
if err != nil { if err != nil {
glog.Fatalf("Unable to parse URL '%v': %v", apiServer.URL, err) glog.Fatalf("Unable to parse URL '%v': %v", apiServer.URL, err)
@ -150,7 +144,6 @@ func startComponents(manifestURL string) (apiServerURL string) {
EtcdHelper: helper, EtcdHelper: helper,
Minions: machineList, Minions: machineList,
KubeletClient: fakeKubeletClient{}, KubeletClient: fakeKubeletClient{},
PortalNet: portalNet,
Mux: mux, Mux: mux,
EnableLogsSupport: false, EnableLogsSupport: false,
APIPrefix: "/api", APIPrefix: "/api",

9
pkg/master/master.go
View File

@ -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. // setDefaults fills in any fields not set that are required to have valid data.
func setDefaults(c *Config) { 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 { if c.MasterCount == 0 {
// Clearly, there will be at least one master. // Clearly, there will be at least one master.
c.MasterCount = 1 c.MasterCount = 1

8
test/integration/client_test.go
View File

@ -19,7 +19,6 @@ limitations under the License.
package integration package integration
import ( import (
"net"
"net/http" "net/http"
"net/http/httptest" "net/http/httptest"
"reflect" "reflect"
@ -30,8 +29,6 @@ import (
"github.com/GoogleCloudPlatform/kubernetes/pkg/labels" "github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
"github.com/GoogleCloudPlatform/kubernetes/pkg/master" "github.com/GoogleCloudPlatform/kubernetes/pkg/master"
"github.com/GoogleCloudPlatform/kubernetes/pkg/version" "github.com/GoogleCloudPlatform/kubernetes/pkg/version"
"github.com/golang/glog"
) )
func init() { func init() {
@ -45,13 +42,8 @@ func TestClient(t *testing.T) {
} }
mux := http.NewServeMux() 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{ master.New(&master.Config{
EtcdHelper: helper, EtcdHelper: helper,
PortalNet: portalNet,
Mux: mux, Mux: mux,
EnableLogsSupport: false, EnableLogsSupport: false,
EnableUISupport: false, EnableUISupport: false,