github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 09:49:50 +00:00
Code Issues Projects Releases Wiki Activity

Remove genericapiserver.Options.MasterServiceNamespace

Browse Source
This commit is contained in:
Dr. Stefan Schimanski 2016-12-06 12:02:18 +01:00
parent da81f24323
commit c1c4489a5d
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/genericapiserver/options/server_run_options.go
View File

@ -62,7 +62,6 @@ type ServerRunOptions struct {
KubernetesServiceNodePort int KubernetesServiceNodePort int
LongRunningRequestRE string LongRunningRequestRE string
MasterCount int MasterCount int
MasterServiceNamespace string
MaxRequestsInFlight int MaxRequestsInFlight int
MaxMutatingRequestsInFlight int MaxMutatingRequestsInFlight int
MinRequestTimeout int MinRequestTimeout int
@ -90,7 +89,6 @@ func NewServerRunOptions() *ServerRunOptions {
EnableWatchCache: true, EnableWatchCache: true,
LongRunningRequestRE: DefaultLongRunningRequestRE, LongRunningRequestRE: DefaultLongRunningRequestRE,
MasterCount: 1, MasterCount: 1,
MasterServiceNamespace: api.NamespaceDefault,
MaxRequestsInFlight: 400, MaxRequestsInFlight: 400,
MaxMutatingRequestsInFlight: 200, MaxMutatingRequestsInFlight: 200,
MinRequestTimeout: 1800, MinRequestTimeout: 1800,
@ -250,7 +248,8 @@ func (s *ServerRunOptions) AddUniversalFlags(fs *pflag.FlagSet) {
fs.IntVar(&s.MasterCount, "apiserver-count", s.MasterCount, fs.IntVar(&s.MasterCount, "apiserver-count", s.MasterCount,
"The number of apiservers running in the cluster.") "The number of apiservers running in the cluster.")
fs.StringVar(&s.MasterServiceNamespace, "master-service-namespace", s.MasterServiceNamespace, ""+ deprecatedMasterServiceNamespace := api.NamespaceDefault
fs.StringVar(&deprecatedMasterServiceNamespace, "master-service-namespace", deprecatedMasterServiceNamespace, ""+
"DEPRECATED: the namespace from which the kubernetes master services should be injected into pods.") "DEPRECATED: the namespace from which the kubernetes master services should be injected into pods.")
fs.IntVar(&s.MaxRequestsInFlight, "max-requests-inflight", s.MaxRequestsInFlight, ""+ fs.IntVar(&s.MaxRequestsInFlight, "max-requests-inflight", s.MaxRequestsInFlight, ""+