diff --git a/pkg/generated/openapi/zz_generated.openapi.go b/pkg/generated/openapi/zz_generated.openapi.go index 72623475c66..825d6a81cc5 100644 --- a/pkg/generated/openapi/zz_generated.openapi.go +++ b/pkg/generated/openapi/zz_generated.openapi.go @@ -57435,14 +57435,14 @@ func schema_k8sio_kubelet_config_v1beta1_KubeletConfiguration(ref common.Referen }, "eventRecordQPS": { SchemaProps: spec.SchemaProps{ - Description: "eventRecordQPS is the maximum event creations per second. If 0, there is no limit enforced. The value cannot be a negative number. Default: 5", + Description: "eventRecordQPS is the maximum event creations per second. If 0, there is no limit enforced. The value cannot be a negative number. Default: 50", Type: []string{"integer"}, Format: "int32", }, }, "eventBurst": { SchemaProps: spec.SchemaProps{ - Description: "eventBurst is the maximum size of a burst of event creations, temporarily allows event creations to burst to this number, while still not exceeding eventRecordQPS. This field canot be a negative number and it is only used when eventRecordQPS > 0. Default: 10", + Description: "eventBurst is the maximum size of a burst of event creations, temporarily allows event creations to burst to this number, while still not exceeding eventRecordQPS. This field canot be a negative number and it is only used when eventRecordQPS > 0. Default: 100", Type: []string{"integer"}, Format: "int32", }, @@ -57756,14 +57756,14 @@ func schema_k8sio_kubelet_config_v1beta1_KubeletConfiguration(ref common.Referen }, "kubeAPIQPS": { SchemaProps: spec.SchemaProps{ - Description: "kubeAPIQPS is the QPS to use while talking with kubernetes apiserver. Default: 5", + Description: "kubeAPIQPS is the QPS to use while talking with kubernetes apiserver. Default: 50", Type: []string{"integer"}, Format: "int32", }, }, "kubeAPIBurst": { SchemaProps: spec.SchemaProps{ - Description: "kubeAPIBurst is the burst to allow while talking with kubernetes API server. This field cannot be a negative number. Default: 10", + Description: "kubeAPIBurst is the burst to allow while talking with kubernetes API server. This field cannot be a negative number. Default: 100", Type: []string{"integer"}, Format: "int32", }, diff --git a/pkg/kubelet/apis/config/scheme/testdata/KubeletConfiguration/after/v1beta1.yaml b/pkg/kubelet/apis/config/scheme/testdata/KubeletConfiguration/after/v1beta1.yaml index 401cc7b8eb4..c7b59e6404b 100644 --- a/pkg/kubelet/apis/config/scheme/testdata/KubeletConfiguration/after/v1beta1.yaml +++ b/pkg/kubelet/apis/config/scheme/testdata/KubeletConfiguration/after/v1beta1.yaml @@ -31,8 +31,8 @@ enableServer: true enableSystemLogHandler: true enforceNodeAllocatable: - pods -eventBurst: 10 -eventRecordQPS: 5 +eventBurst: 100 +eventRecordQPS: 50 evictionPressureTransitionPeriod: 5m0s failSwapOn: true fileCheckFrequency: 20s @@ -46,8 +46,8 @@ imageMinimumGCAge: 2m0s iptablesDropBit: 15 iptablesMasqueradeBit: 14 kind: KubeletConfiguration -kubeAPIBurst: 10 -kubeAPIQPS: 5 +kubeAPIBurst: 100 +kubeAPIQPS: 50 localStorageCapacityIsolation: true logging: flushFrequency: 5000000000 diff --git a/pkg/kubelet/apis/config/v1beta1/defaults.go b/pkg/kubelet/apis/config/v1beta1/defaults.go index 37f714b2227..5d4e8c117fb 100644 --- a/pkg/kubelet/apis/config/v1beta1/defaults.go +++ b/pkg/kubelet/apis/config/v1beta1/defaults.go @@ -96,10 +96,10 @@ func SetDefaults_KubeletConfiguration(obj *kubeletconfigv1beta1.KubeletConfigura obj.RegistryBurst = 10 } if obj.EventRecordQPS == nil { - obj.EventRecordQPS = utilpointer.Int32(5) + obj.EventRecordQPS = utilpointer.Int32(50) } if obj.EventBurst == 0 { - obj.EventBurst = 10 + obj.EventBurst = 100 } if obj.EnableDebuggingHandlers == nil { obj.EnableDebuggingHandlers = utilpointer.Bool(true) @@ -200,10 +200,10 @@ func SetDefaults_KubeletConfiguration(obj *kubeletconfigv1beta1.KubeletConfigura obj.ContentType = "application/vnd.kubernetes.protobuf" } if obj.KubeAPIQPS == nil { - obj.KubeAPIQPS = utilpointer.Int32(5) + obj.KubeAPIQPS = utilpointer.Int32(50) } if obj.KubeAPIBurst == 0 { - obj.KubeAPIBurst = 10 + obj.KubeAPIBurst = 100 } if obj.SerializeImagePulls == nil { // SerializeImagePulls is default to true when MaxParallelImagePulls diff --git a/pkg/kubelet/apis/config/v1beta1/defaults_test.go b/pkg/kubelet/apis/config/v1beta1/defaults_test.go index 7cbc31bb36f..9bd3b7a97a6 100644 --- a/pkg/kubelet/apis/config/v1beta1/defaults_test.go +++ b/pkg/kubelet/apis/config/v1beta1/defaults_test.go @@ -65,8 +65,8 @@ func TestSetDefaultsKubeletConfiguration(t *testing.T) { }, RegistryPullQPS: utilpointer.Int32(5), RegistryBurst: 10, - EventRecordQPS: utilpointer.Int32(5), - EventBurst: 10, + EventRecordQPS: utilpointer.Int32(50), + EventBurst: 100, EnableDebuggingHandlers: utilpointer.Bool(true), HealthzPort: utilpointer.Int32(10248), HealthzBindAddress: "127.0.0.1", @@ -97,8 +97,8 @@ func TestSetDefaultsKubeletConfiguration(t *testing.T) { NodeStatusMaxImages: utilpointer.Int32(50), MaxOpenFiles: 1000000, ContentType: "application/vnd.kubernetes.protobuf", - KubeAPIQPS: utilpointer.Int32(5), - KubeAPIBurst: 10, + KubeAPIQPS: utilpointer.Int32(50), + KubeAPIBurst: 100, SerializeImagePulls: utilpointer.Bool(true), MaxParallelImagePulls: nil, EvictionHard: nil, @@ -279,7 +279,7 @@ func TestSetDefaultsKubeletConfiguration(t *testing.T) { RegistryPullQPS: utilpointer.Int32(0), RegistryBurst: 10, EventRecordQPS: utilpointer.Int32(0), - EventBurst: 10, + EventBurst: 100, EnableDebuggingHandlers: utilpointer.Bool(false), HealthzPort: utilpointer.Int32(0), HealthzBindAddress: "127.0.0.1", @@ -314,7 +314,7 @@ func TestSetDefaultsKubeletConfiguration(t *testing.T) { MaxOpenFiles: 1000000, ContentType: "application/vnd.kubernetes.protobuf", KubeAPIQPS: utilpointer.Int32(0), - KubeAPIBurst: 10, + KubeAPIBurst: 100, SerializeImagePulls: utilpointer.Bool(false), MaxParallelImagePulls: nil, EvictionHard: map[string]string{}, @@ -674,8 +674,8 @@ func TestSetDefaultsKubeletConfiguration(t *testing.T) { }, RegistryPullQPS: utilpointer.Int32(5), RegistryBurst: 10, - EventRecordQPS: utilpointer.Int32(5), - EventBurst: 10, + EventRecordQPS: utilpointer.Int32(50), + EventBurst: 100, EnableDebuggingHandlers: utilpointer.Bool(true), HealthzPort: utilpointer.Int32(10248), HealthzBindAddress: "127.0.0.1", @@ -706,8 +706,8 @@ func TestSetDefaultsKubeletConfiguration(t *testing.T) { NodeStatusMaxImages: utilpointer.Int32(50), MaxOpenFiles: 1000000, ContentType: "application/vnd.kubernetes.protobuf", - KubeAPIQPS: utilpointer.Int32(5), - KubeAPIBurst: 10, + KubeAPIQPS: utilpointer.Int32(50), + KubeAPIBurst: 100, SerializeImagePulls: utilpointer.Bool(true), MaxParallelImagePulls: nil, EvictionHard: nil, @@ -763,8 +763,8 @@ func TestSetDefaultsKubeletConfiguration(t *testing.T) { }, RegistryPullQPS: utilpointer.Int32Ptr(5), RegistryBurst: 10, - EventRecordQPS: utilpointer.Int32Ptr(5), - EventBurst: 10, + EventRecordQPS: utilpointer.Int32Ptr(50), + EventBurst: 100, EnableDebuggingHandlers: utilpointer.Bool(true), HealthzPort: utilpointer.Int32Ptr(10248), HealthzBindAddress: "127.0.0.1", @@ -795,8 +795,8 @@ func TestSetDefaultsKubeletConfiguration(t *testing.T) { NodeStatusMaxImages: utilpointer.Int32Ptr(50), MaxOpenFiles: 1000000, ContentType: "application/vnd.kubernetes.protobuf", - KubeAPIQPS: utilpointer.Int32Ptr(5), - KubeAPIBurst: 10, + KubeAPIQPS: utilpointer.Int32Ptr(50), + KubeAPIBurst: 100, SerializeImagePulls: utilpointer.Bool(false), MaxParallelImagePulls: utilpointer.Int32(5), EvictionHard: nil, @@ -852,8 +852,8 @@ func TestSetDefaultsKubeletConfiguration(t *testing.T) { }, RegistryPullQPS: utilpointer.Int32Ptr(5), RegistryBurst: 10, - EventRecordQPS: utilpointer.Int32Ptr(5), - EventBurst: 10, + EventRecordQPS: utilpointer.Int32Ptr(50), + EventBurst: 100, EnableDebuggingHandlers: utilpointer.Bool(true), HealthzPort: utilpointer.Int32Ptr(10248), HealthzBindAddress: "127.0.0.1", @@ -884,8 +884,8 @@ func TestSetDefaultsKubeletConfiguration(t *testing.T) { NodeStatusMaxImages: utilpointer.Int32Ptr(50), MaxOpenFiles: 1000000, ContentType: "application/vnd.kubernetes.protobuf", - KubeAPIQPS: utilpointer.Int32Ptr(5), - KubeAPIBurst: 10, + KubeAPIQPS: utilpointer.Int32Ptr(50), + KubeAPIBurst: 100, SerializeImagePulls: utilpointer.Bool(true), MaxParallelImagePulls: utilpointer.Int32(1), EvictionHard: nil, diff --git a/staging/src/k8s.io/kubelet/config/v1beta1/types.go b/staging/src/k8s.io/kubelet/config/v1beta1/types.go index 0e80321791e..629f9f35bca 100644 --- a/staging/src/k8s.io/kubelet/config/v1beta1/types.go +++ b/staging/src/k8s.io/kubelet/config/v1beta1/types.go @@ -205,14 +205,14 @@ type KubeletConfiguration struct { RegistryBurst int32 `json:"registryBurst,omitempty"` // eventRecordQPS is the maximum event creations per second. If 0, there // is no limit enforced. The value cannot be a negative number. - // Default: 5 + // Default: 50 // +optional EventRecordQPS *int32 `json:"eventRecordQPS,omitempty"` // eventBurst is the maximum size of a burst of event creations, temporarily // allows event creations to burst to this number, while still not exceeding // eventRecordQPS. This field canot be a negative number and it is only used // when eventRecordQPS > 0. - // Default: 10 + // Default: 100 // +optional EventBurst int32 `json:"eventBurst,omitempty"` // enableDebuggingHandlers enables server endpoints for log access @@ -467,12 +467,12 @@ type KubeletConfiguration struct { // +optional ContentType string `json:"contentType,omitempty"` // kubeAPIQPS is the QPS to use while talking with kubernetes apiserver. - // Default: 5 + // Default: 50 // +optional KubeAPIQPS *int32 `json:"kubeAPIQPS,omitempty"` // kubeAPIBurst is the burst to allow while talking with kubernetes API server. // This field cannot be a negative number. - // Default: 10 + // Default: 100 // +optional KubeAPIBurst int32 `json:"kubeAPIBurst,omitempty"` // serializeImagePulls when enabled, tells the Kubelet to pull images one