Additional Kubelet Options

In related to issue #3265
kubernetes · Aug 28, 2017 · 30b88ab · 30b88ab
1 parent 7daf916
commit 30b88ab
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 0 deletions.
diff --git a/pkg/apis/kops/componentconfig.go b/pkg/apis/kops/componentconfig.go
@@ -142,6 +142,10 @@ type KubeletConfigSpec struct {
 	SystemReservedCgroup string `json:"systemReservedCgroup,omitempty" flag:"system-reserved-cgroup"`
 	// Enforce Allocatable across pods whenever the overall usage across all pods exceeds Allocatable.
 	EnforceNodeAllocatable string `json:"enforceNodeAllocatable,omitempty" flag:"enforce-node-allocatable"`
+	// RuntimeRequesTimeout is timeout for runtime requests on - pull, logs, exec and attach
+	RuntimeRequesTimeout *metav1.Duration `json:"RuntimeRequestTimeout,omitempty" flag:"runtime-request-timeout"`
+	// VolumeStatsAggPeriod is the interval for kubelet to calculate and cache the volume disk usage for all pods and volumes
+	VolumeStatsAggPeriod *metav1.Duration `json:"volumeStatsAggPeriod,omitempty" flag:"volume-stats-agg-period"`
 }
 
 // KubeProxyConfig defined the configuration for a proxy

diff --git a/pkg/apis/kops/v1alpha1/componentconfig.go b/pkg/apis/kops/v1alpha1/componentconfig.go
@@ -142,6 +142,10 @@ type KubeletConfigSpec struct {
 	SystemReservedCgroup string `json:"systemReservedCgroup,omitempty" flag:"system-reserved-cgroup"`
 	// Enforce Allocatable across pods whenever the overall usage across all pods exceeds Allocatable.
 	EnforceNodeAllocatable string `json:"enforceNodeAllocatable,omitempty" flag:"enforce-node-allocatable"`
+	// RuntimeRequesTimeout is timeout for runtime requests on - pull, logs, exec and attach
+	RuntimeRequesTimeout *metav1.Duration `json:"RuntimeRequestTimeout,omitempty" flag:"runtime-request-timeout"`
+	// VolumeStatsAggPeriod is the interval for kubelet to calculate and cache the volume disk usage for all pods and volumes
+	VolumeStatsAggPeriod *metav1.Duration `json:"volumeStatsAggPeriod,omitempty" flag:"volume-stats-agg-period"`
 }
 
 // KubeProxyConfig defined the configuration for a proxy

diff --git a/pkg/apis/kops/v1alpha1/zz_generated.conversion.go b/pkg/apis/kops/v1alpha1/zz_generated.conversion.go
@@ -1944,6 +1944,8 @@ func autoConvert_v1alpha1_KubeletConfigSpec_To_kops_KubeletConfigSpec(in *Kubele
 	out.SystemReserved = in.SystemReserved
 	out.SystemReservedCgroup = in.SystemReservedCgroup
 	out.EnforceNodeAllocatable = in.EnforceNodeAllocatable
+	out.RuntimeRequesTimeout = in.RuntimeRequesTimeout
+	out.VolumeStatsAggPeriod = in.VolumeStatsAggPeriod
 	return nil
 }
 
@@ -2004,6 +2006,8 @@ func autoConvert_kops_KubeletConfigSpec_To_v1alpha1_KubeletConfigSpec(in *kops.K
 	out.SystemReserved = in.SystemReserved
 	out.SystemReservedCgroup = in.SystemReservedCgroup
 	out.EnforceNodeAllocatable = in.EnforceNodeAllocatable
+	out.RuntimeRequesTimeout = in.RuntimeRequesTimeout
+	out.VolumeStatsAggPeriod = in.VolumeStatsAggPeriod
 	return nil
 }
 

diff --git a/pkg/apis/kops/v1alpha2/componentconfig.go b/pkg/apis/kops/v1alpha2/componentconfig.go
@@ -142,6 +142,10 @@ type KubeletConfigSpec struct {
 	SystemReservedCgroup string `json:"systemReservedCgroup,omitempty" flag:"system-reserved-cgroup"`
 	// Enforce Allocatable across pods whenever the overall usage across all pods exceeds Allocatable.
 	EnforceNodeAllocatable string `json:"enforceNodeAllocatable,omitempty" flag:"enforce-node-allocatable"`
+	// RuntimeRequesTimeout is timeout for runtime requests on - pull, logs, exec and attach
+	RuntimeRequesTimeout *metav1.Duration `json:"RuntimeRequestTimeout,omitempty" flag:"runtime-request-timeout"`
+	// VolumeStatsAggPeriod is the interval for kubelet to calculate and cache the volume disk usage for all pods and volumes
+	VolumeStatsAggPeriod *metav1.Duration `json:"volumeStatsAggPeriod,omitempty" flag:"volume-stats-agg-period"`
 }
 
 // KubeProxyConfig defined the configuration for a proxy

diff --git a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go
@@ -2052,6 +2052,8 @@ func autoConvert_v1alpha2_KubeletConfigSpec_To_kops_KubeletConfigSpec(in *Kubele
 	out.SystemReserved = in.SystemReserved
 	out.SystemReservedCgroup = in.SystemReservedCgroup
 	out.EnforceNodeAllocatable = in.EnforceNodeAllocatable
+	out.RuntimeRequesTimeout = in.RuntimeRequesTimeout
+	out.VolumeStatsAggPeriod = in.VolumeStatsAggPeriod
 	return nil
 }
 
@@ -2112,6 +2114,8 @@ func autoConvert_kops_KubeletConfigSpec_To_v1alpha2_KubeletConfigSpec(in *kops.K
 	out.SystemReserved = in.SystemReserved
 	out.SystemReservedCgroup = in.SystemReservedCgroup
 	out.EnforceNodeAllocatable = in.EnforceNodeAllocatable
+	out.RuntimeRequesTimeout = in.RuntimeRequesTimeout
+	out.VolumeStatsAggPeriod = in.VolumeStatsAggPeriod
 	return nil
 }