Merge pull request #10016 from nareshku/issue-6356

enable kubelet --housekeeping-interval flag

Author: k8s-ci-robot

docs/cluster_spec.md

@@ -499,6 +499,17 @@ spec:
     protectKernelDefaults: true
 ```
 
+### Housekeeping Interval
+{{ kops_feature_table(kops_added_default='1.19', k8s_min='1.2') }}
+
+The interval between container housekeepings defaults to `10s`. This can be too small or too high for some use cases and can be modified with the following addition to the kubelet spec.
+
+```yaml
+spec:
+  kubelet:
+    housekeepingInterval: 30s
+```
+
 ## kubeScheduler
 
 This block contains configurations for `kube-scheduler`.  See https://kubernetes.io/docs/admin/kube-scheduler/

k8s/crds/kops.k8s.io_clusters.yaml

@@ -1646,6 +1646,9 @@ spec:
                   hostnameOverride:
                     description: HostnameOverride is the hostname used to identify the kubelet instead of the actual hostname.
                     type: string
+                  housekeepingInterval:
+                    description: HousekeepingInterval allows to specify interval between container housekeepings.
+                    type: string
                   imageGCHighThresholdPercent:
                     description: ImageGCHighThresholdPercent is the percent of disk usage after which image garbage collection is always run.
                     format: int32
@@ -1924,6 +1927,9 @@ spec:
                   hostnameOverride:
                     description: HostnameOverride is the hostname used to identify the kubelet instead of the actual hostname.
                     type: string
+                  housekeepingInterval:
+                    description: HousekeepingInterval allows to specify interval between container housekeepings.
+                    type: string
                   imageGCHighThresholdPercent:
                     description: ImageGCHighThresholdPercent is the percent of disk usage after which image garbage collection is always run.
                     format: int32

k8s/crds/kops.k8s.io_instancegroups.yaml

@@ -305,6 +305,9 @@ spec:
                   hostnameOverride:
                     description: HostnameOverride is the hostname used to identify the kubelet instead of the actual hostname.
                     type: string
+                  housekeepingInterval:
+                    description: HousekeepingInterval allows to specify interval between container housekeepings.
+                    type: string
                   imageGCHighThresholdPercent:
                     description: ImageGCHighThresholdPercent is the percent of disk usage after which image garbage collection is always run.
                     format: int32

pkg/apis/kops/componentconfig.go

@@ -205,6 +205,8 @@ type KubeletConfigSpec struct {
 	ProtectKernelDefaults *bool `json:"protectKernelDefaults,omitempty" flag:"protect-kernel-defaults"`
 	// CgroupDriver allows the explicit setting of the kubelet cgroup driver. If omitted, defaults to cgroupfs.
 	CgroupDriver string `json:"cgroupDriver,omitempty" flag:"cgroup-driver"`
+	// HousekeepingInterval allows to specify interval between container housekeepings.
+	HousekeepingInterval *metav1.Duration `json:"housekeepingInterval,omitempty" flag:"housekeeping-interval"`
 }
 
 // KubeProxyConfig defines the configuration for a proxy

pkg/apis/kops/v1alpha2/componentconfig.go

@@ -205,6 +205,8 @@ type KubeletConfigSpec struct {
 	ProtectKernelDefaults *bool `json:"protectKernelDefaults,omitempty" flag:"protect-kernel-defaults"`
 	// CgroupDriver allows the explicit setting of the kubelet cgroup driver. If omitted, defaults to cgroupfs.
 	CgroupDriver string `json:"cgroupDriver,omitempty" flag:"cgroup-driver"`
+	// HousekeepingInterval allows to specify interval between container housekeepings.
+	HousekeepingInterval *metav1.Duration `json:"housekeepingInterval,omitempty" flag:"housekeeping-interval"`
 }
 
 // KubeProxyConfig defines the configuration for a proxy