Skip to content

K
k3s
Commit c1c4489a authored by Dr. Stefan Schimanski's avatar Dr. Stefan Schimanski
Browse files
Options

Remove genericapiserver.Options.MasterServiceNamespace

parent da81f243
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
pkg/genericapiserver/options/server_run_options.go
View file @ c1c4489a
...@@ -62,7 +62,6 @@ type ServerRunOptions struct { ...@@ -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 { ...@@ -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) { ...@@ -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, ""+
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment