Merge pull request #9370 from justinsb/fix_9318

Actually pass down ServiceNodePortRange so it is used
This commit is contained in:
krousey 2015-06-09 10:39:45 -07:00
commit fa94d88599
2 changed files with 2 additions and 1 deletions

View File

@ -391,6 +391,7 @@ func (s *APIServer) Run(_ []string) error {
SSHUser: s.SSHUser,
SSHKeyfile: s.SSHKeyfile,
InstallSSHKey: installSSH,
ServiceNodePortRange: s.ServiceNodePortRange,
}
m := master.New(config)

View File

@ -247,7 +247,7 @@ func setDefaults(c *Config) {
// We should probably allow this for clouds that don't require NodePort to do load-balancing (GCE)
// but then that breaks the strict nestedness of ServiceType.
// Review post-v1
defaultServiceNodePortRange := util.PortRange{Base: 30000, Size: 2767}
defaultServiceNodePortRange := util.PortRange{Base: 30000, Size: 2768}
c.ServiceNodePortRange = defaultServiceNodePortRange
glog.Infof("Node port range unspecified. Defaulting to %v.", c.ServiceNodePortRange)
}