Skip to content

K
k3s
Commit 224893c5 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #38186 from sttts/sttts-remove-MasterServiceNamespace

Automatic merge from submit-queue (batch tested with PRs 37032, 38119, 38186, 38200, 38139) Remove genericapiserver.Options.MasterServiceNamespace Deprecated and not used anymore.
parents cbf497b7 c1c4489a
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
pkg/genericapiserver/options/server_run_options.go
View file @ 224893c5
...@@ -56,7 +56,6 @@ type ServerRunOptions struct { ...@@ -56,7 +56,6 @@ type ServerRunOptions struct {
ExternalHost string ExternalHost string
KubernetesServiceNodePort int KubernetesServiceNodePort int
MasterCount int MasterCount int
MasterServiceNamespace string
MaxRequestsInFlight int MaxRequestsInFlight int
MaxMutatingRequestsInFlight int MaxMutatingRequestsInFlight int
MinRequestTimeout int MinRequestTimeout int
...@@ -83,7 +82,6 @@ func NewServerRunOptions() *ServerRunOptions { ...@@ -83,7 +82,6 @@ func NewServerRunOptions() *ServerRunOptions {
EnableContentionProfiling: false, EnableContentionProfiling: false,
EnableWatchCache: true, EnableWatchCache: true,
MasterCount: 1, MasterCount: 1,
MasterServiceNamespace: api.NamespaceDefault,
MaxRequestsInFlight: 400, MaxRequestsInFlight: 400,
MaxMutatingRequestsInFlight: 200, MaxMutatingRequestsInFlight: 200,
MinRequestTimeout: 1800, MinRequestTimeout: 1800,
...@@ -245,7 +243,8 @@ func (s *ServerRunOptions) AddUniversalFlags(fs *pflag.FlagSet) { ...@@ -245,7 +243,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