kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5832 from captainkerk/max-mutating-requests-inflight 

add support for max-mutating-requests-inflight parameter
This commit is contained in:
k8s-ci-robot 2018-10-08 18:01:12 -07:00 committed by GitHub
parent 0bf814f0a4 beb8aebe06
commit 2cfb62bd79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/cluster_spec.md
View File

@ -230,6 +230,14 @@ spec:
maxRequestsInflight: 1000
```
The maximum number of mutating requests in flight at a given time. When the server exceeds this, it rejects requests. Zero for no limit. (default 200)
```yaml
spec:
kubeAPIServer:
maxMutatingRequestsInflight: 450
```
#### runtimeConfig
Keys and values here are translated into `--runtime-config` values for `kube-apiserver`, separated by commas.

14
nodeup/pkg/model/kube_apiserver_test.go
View File

@ -45,6 +45,12 @@ func Test_KubeAPIServer_BuildFlags(t *testing.T) {
},
"--insecure-port=0 --max-requests-inflight=1000 --secure-port=0",
},
{
kops.KubeAPIServerConfig{
MaxMutatingRequestsInflight: 900,
},
"--insecure-port=0 --max-mutating-requests-inflight=900 --secure-port=0",
},
{
kops.KubeAPIServerConfig{
InsecurePort: 8080,
@ -60,6 +66,14 @@ func Test_KubeAPIServer_BuildFlags(t *testing.T) {
},
"--insecure-port=8080 --max-requests-inflight=1000 --secure-port=443",
},
{
kops.KubeAPIServerConfig{
InsecurePort: 8080,
SecurePort: 443,
MaxMutatingRequestsInflight: 900,
},
"--insecure-port=8080 --max-mutating-requests-inflight=900 --secure-port=443",
},
{
kops.KubeAPIServerConfig{
InsecurePort: 8080,

2
pkg/apis/kops/componentconfig.go
View File

@ -345,6 +345,8 @@ type KubeAPIServerConfig struct {
FeatureGates map[string]string `json:"featureGates,omitempty" flag:"feature-gates"`
// MaxRequestsInflight The maximum number of non-mutating requests in flight at a given time.
MaxRequestsInflight int32 `json:"maxRequestsInflight,omitempty" flag:"max-requests-inflight" flag-empty:"0"`
// MaxMutatingRequestsInflight The maximum number of mutating requests in flight at a given time. Defaults to 200
MaxMutatingRequestsInflight int32 `json:"maxMutatingRequestsInflight,omitempty" flag:"max-mutating-requests-inflight" flag-empty:"0"`
// EtcdQuorumRead configures the etcd-quorum-read flag, which forces consistent reads from etcd
EtcdQuorumRead *bool `json:"etcdQuorumRead,omitempty" flag:"etcd-quorum-read"`

2
pkg/apis/kops/v1alpha1/componentconfig.go
View File

@ -345,6 +345,8 @@ type KubeAPIServerConfig struct {
FeatureGates map[string]string `json:"featureGates,omitempty" flag:"feature-gates"`
// MaxRequestsInflight The maximum number of non-mutating requests in flight at a given time.
MaxRequestsInflight int32 `json:"maxRequestsInflight,omitempty" flag:"max-requests-inflight" flag-empty:"0"`
// MaxMutatingRequestsInflight The maximum number of mutating requests in flight at a given time. Defaults to 200
MaxMutatingRequestsInflight int32 `json:"maxMutatingRequestsInflight,omitempty" flag:"max-mutating-requests-inflight" flag-empty:"0"`
// EtcdQuorumRead configures the etcd-quorum-read flag, which forces consistent reads from etcd
EtcdQuorumRead *bool `json:"etcdQuorumRead,omitempty" flag:"etcd-quorum-read"`

2
pkg/apis/kops/v1alpha1/zz_generated.conversion.go
View File

@ -2218,6 +2218,7 @@ func autoConvert_v1alpha1_KubeAPIServerConfig_To_kops_KubeAPIServerConfig(in *Ku
out.RequestheaderAllowedNames = in.RequestheaderAllowedNames
out.FeatureGates = in.FeatureGates
out.MaxRequestsInflight = in.MaxRequestsInflight
out.MaxMutatingRequestsInflight = in.MaxMutatingRequestsInflight
out.EtcdQuorumRead = in.EtcdQuorumRead
out.MinRequestTimeout = in.MinRequestTimeout
return nil
@ -2289,6 +2290,7 @@ func autoConvert_kops_KubeAPIServerConfig_To_v1alpha1_KubeAPIServerConfig(in *ko
out.RequestheaderAllowedNames = in.RequestheaderAllowedNames
out.FeatureGates = in.FeatureGates
out.MaxRequestsInflight = in.MaxRequestsInflight
out.MaxMutatingRequestsInflight = in.MaxMutatingRequestsInflight
out.EtcdQuorumRead = in.EtcdQuorumRead
out.MinRequestTimeout = in.MinRequestTimeout
return nil

2
pkg/apis/kops/v1alpha2/componentconfig.go
View File

@ -345,6 +345,8 @@ type KubeAPIServerConfig struct {
FeatureGates map[string]string `json:"featureGates,omitempty" flag:"feature-gates"`
// MaxRequestsInflight The maximum number of non-mutating requests in flight at a given time.
MaxRequestsInflight int32 `json:"maxRequestsInflight,omitempty" flag:"max-requests-inflight" flag-empty:"0"`
// MaxMutatingRequestsInflight The maximum number of mutating requests in flight at a given time. Defaults to 200
MaxMutatingRequestsInflight int32 `json:"maxMutatingRequestsInflight,omitempty" flag:"max-mutating-requests-inflight" flag-empty:"0"`
// EtcdQuorumRead configures the etcd-quorum-read flag, which forces consistent reads from etcd
EtcdQuorumRead *bool `json:"etcdQuorumRead,omitempty" flag:"etcd-quorum-read"`

2
pkg/apis/kops/v1alpha2/zz_generated.conversion.go
View File

@ -2482,6 +2482,7 @@ func autoConvert_v1alpha2_KubeAPIServerConfig_To_kops_KubeAPIServerConfig(in *Ku
out.RequestheaderAllowedNames = in.RequestheaderAllowedNames
out.FeatureGates = in.FeatureGates
out.MaxRequestsInflight = in.MaxRequestsInflight
out.MaxMutatingRequestsInflight = in.MaxMutatingRequestsInflight
out.EtcdQuorumRead = in.EtcdQuorumRead
out.MinRequestTimeout = in.MinRequestTimeout
return nil
@ -2553,6 +2554,7 @@ func autoConvert_kops_KubeAPIServerConfig_To_v1alpha2_KubeAPIServerConfig(in *ko
out.RequestheaderAllowedNames = in.RequestheaderAllowedNames
out.FeatureGates = in.FeatureGates
out.MaxRequestsInflight = in.MaxRequestsInflight
out.MaxMutatingRequestsInflight = in.MaxMutatingRequestsInflight
out.EtcdQuorumRead = in.EtcdQuorumRead
out.MinRequestTimeout = in.MinRequestTimeout
return nil