github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 21:47:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9370 from justinsb/fix_9318

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/kube-apiserver/app/server.go
View File

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

2
pkg/master/master.go
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) // 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. // but then that breaks the strict nestedness of ServiceType.
// Review post-v1 // Review post-v1
defaultServiceNodePortRange := util.PortRange{Base: 30000, Size: 2767} defaultServiceNodePortRange := util.PortRange{Base: 30000, Size: 2768}
c.ServiceNodePortRange = defaultServiceNodePortRange c.ServiceNodePortRange = defaultServiceNodePortRange
glog.Infof("Node port range unspecified. Defaulting to %v.", c.ServiceNodePortRange) glog.Infof("Node port range unspecified. Defaulting to %v.", c.ServiceNodePortRange)
} }