add support for max-mutating-requests-inflight parameter

kubernetes · Oct 4, 2018 · beb8aeb · beb8aeb
1 parent c55b032
commit beb8aeb
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 0 deletions.
diff --git a/docs/cluster_spec.md b/docs/cluster_spec.md
@@ -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.

diff --git a/nodeup/pkg/model/kube_apiserver_test.go b/nodeup/pkg/model/kube_apiserver_test.go
@@ -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,

diff --git a/pkg/apis/kops/componentconfig.go b/pkg/apis/kops/componentconfig.go
@@ -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"`

diff --git a/pkg/apis/kops/v1alpha1/componentconfig.go b/pkg/apis/kops/v1alpha1/componentconfig.go
@@ -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"`

diff --git a/pkg/apis/kops/v1alpha1/zz_generated.conversion.go b/pkg/apis/kops/v1alpha1/zz_generated.conversion.go
diff --git a/pkg/apis/kops/v1alpha2/componentconfig.go b/pkg/apis/kops/v1alpha2/componentconfig.go
@@ -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"`

diff --git a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go