From 6f3879e3bbc4bb279c552f3f50c18d10085e048c Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Sat, 6 Jun 2015 14:40:13 -0400 Subject: [PATCH] Actually pass down ServiceNodePortRange so it is used Also fix default range to match what we've documented (off-by-one) Fix #9318 --- cmd/kube-apiserver/app/server.go | 1 + pkg/master/master.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cmd/kube-apiserver/app/server.go b/cmd/kube-apiserver/app/server.go index b8ecab263d0..09287d6074d 100644 --- a/cmd/kube-apiserver/app/server.go +++ b/cmd/kube-apiserver/app/server.go @@ -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) diff --git a/pkg/master/master.go b/pkg/master/master.go index 925b7129fc7..24fec4ed937 100644 --- a/pkg/master/master.go +++ b/pkg/master/master.go @@ -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) }