From eba0d125b937af7ae25578a0284f4ba8f92a3f67 Mon Sep 17 00:00:00 2001 From: PingWang Date: Tue, 26 Jul 2016 18:29:58 +0800 Subject: [PATCH] add DefaultServiceNodePortRange const Signed-off-by: PingWang update DefaultServiceNodePortRange define Signed-off-by: PingWang --- pkg/genericapiserver/genericapiserver.go | 3 +-- pkg/genericapiserver/options/server_run_options.go | 4 +++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkg/genericapiserver/genericapiserver.go b/pkg/genericapiserver/genericapiserver.go index 9b0cc5baf23..fccc84ff318 100644 --- a/pkg/genericapiserver/genericapiserver.go +++ b/pkg/genericapiserver/genericapiserver.go @@ -283,8 +283,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 := utilnet.PortRange{Base: 30000, Size: 2768} - c.ServiceNodePortRange = defaultServiceNodePortRange + c.ServiceNodePortRange = options.DefaultServiceNodePortRange glog.Infof("Node port range unspecified. Defaulting to %v.", c.ServiceNodePortRange) } if c.MasterCount == 0 { diff --git a/pkg/genericapiserver/options/server_run_options.go b/pkg/genericapiserver/options/server_run_options.go index ea42f53489d..c03b7b98b18 100644 --- a/pkg/genericapiserver/options/server_run_options.go +++ b/pkg/genericapiserver/options/server_run_options.go @@ -46,6 +46,8 @@ const ( defaultLongRunningRequestRE = "(/|^)((watch|proxy)(/|$)|(logs?|portforward|exec|attach)/?$)" ) +var DefaultServiceNodePortRange = utilnet.PortRange{Base: 30000, Size: 2768} + // ServerRunOptions contains the options while running a generic api server. type ServerRunOptions struct { APIGroupPrefix string @@ -133,7 +135,7 @@ func NewServerRunOptions() *ServerRunOptions { MinRequestTimeout: 1800, RuntimeConfig: make(config.ConfigurationMap), SecurePort: 6443, - ServiceNodePortRange: utilnet.PortRange{Base: 30000, Size: 2768}, + ServiceNodePortRange: DefaultServiceNodePortRange, StorageVersions: registered.AllPreferredGroupVersions(), } }