github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-11 22:20:18 +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

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.
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