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

Merge pull request #4046 from artsy/master 

Automatic merge from submit-queue.

add imagePullProgressDeadline to kubelet config

Support the kubelet runtime flag `--image-pull-progress-deadline` by mapping the config key `imagePullProgressDeadline`

This supports extending the deadline to pull new images, as detailed in [this issue](https://github.com/openshift/origin/issues/13122)
This commit is contained in:
Kubernetes Submit Queue 2017-12-17 13:32:43 -08:00 committed by GitHub
parent b4157ffba4 92abe3676f
commit 0d07cc9f4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -116,6 +116,9 @@ type KubeletConfigSpec struct {
// image garbage collection is never run. Lowest disk usage to garbage
// collect to.
ImageGCLowThresholdPercent *int32 `json:"imageGCLowThresholdPercent,omitempty" flag:"image-gc-low-threshold"`
// ImagePullProgressDeadline is the timeout for image pulls
// If no pulling progress is made before this deadline, the image pulling will be cancelled. (default 1m0s)
ImagePullProgressDeadline *metav1.Duration `json:"imagePullProgressDeadline,omitempty" flag:"image-pull-progress-deadline"`
// Comma-delimited list of hard eviction expressions. For example, 'memory.available<300Mi'.
EvictionHard *string `json:"evictionHard,omitempty" flag:"eviction-hard"`
// Comma-delimited list of soft eviction expressions. For example, 'memory.available<300Mi'.

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

@ -116,6 +116,9 @@ type KubeletConfigSpec struct {
// image garbage collection is never run. Lowest disk usage to garbage
// collect to.
ImageGCLowThresholdPercent *int32 `json:"imageGCLowThresholdPercent,omitempty" flag:"image-gc-low-threshold"`
// ImagePullProgressDeadline is the timeout for image pulls
// If no pulling progress is made before this deadline, the image pulling will be cancelled. (default 1m0s)
ImagePullProgressDeadline *metav1.Duration `json:"imagePullProgressDeadline,omitempty" flag:"image-pull-progress-deadline"`
// Comma-delimited list of hard eviction expressions. For example, 'memory.available<300Mi'.
EvictionHard *string `json:"evictionHard,omitempty" flag:"eviction-hard"`
// Comma-delimited list of soft eviction expressions. For example, 'memory.available<300Mi'.

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

@ -2137,6 +2137,7 @@ func autoConvert_v1alpha1_KubeletConfigSpec_To_kops_KubeletConfigSpec(in *Kubele
out.NetworkPluginMTU = in.NetworkPluginMTU
out.ImageGCHighThresholdPercent = in.ImageGCHighThresholdPercent
out.ImageGCLowThresholdPercent = in.ImageGCLowThresholdPercent
out.ImagePullProgressDeadline = in.ImagePullProgressDeadline
out.EvictionHard = in.EvictionHard
out.EvictionSoft = in.EvictionSoft
out.EvictionSoftGracePeriod = in.EvictionSoftGracePeriod
@ -2200,6 +2201,7 @@ func autoConvert_kops_KubeletConfigSpec_To_v1alpha1_KubeletConfigSpec(in *kops.K
out.NetworkPluginMTU = in.NetworkPluginMTU
out.ImageGCHighThresholdPercent = in.ImageGCHighThresholdPercent
out.ImageGCLowThresholdPercent = in.ImageGCLowThresholdPercent
out.ImagePullProgressDeadline = in.ImagePullProgressDeadline
out.EvictionHard = in.EvictionHard
out.EvictionSoft = in.EvictionSoft
out.EvictionSoftGracePeriod = in.EvictionSoftGracePeriod

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

@ -116,6 +116,9 @@ type KubeletConfigSpec struct {
// image garbage collection is never run. Lowest disk usage to garbage
// collect to.
ImageGCLowThresholdPercent *int32 `json:"imageGCLowThresholdPercent,omitempty" flag:"image-gc-low-threshold"`
// ImagePullProgressDeadline is the timeout for image pulls
// If no pulling progress is made before this deadline, the image pulling will be cancelled. (default 1m0s)
ImagePullProgressDeadline *metav1.Duration `json:"imagePullProgressDeadline,omitempty" flag:"image-pull-progress-deadline"`
// Comma-delimited list of hard eviction expressions. For example, 'memory.available<300Mi'.
EvictionHard *string `json:"evictionHard,omitempty" flag:"eviction-hard"`
// Comma-delimited list of soft eviction expressions. For example, 'memory.available<300Mi'.

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

@ -2399,6 +2399,7 @@ func autoConvert_v1alpha2_KubeletConfigSpec_To_kops_KubeletConfigSpec(in *Kubele
out.NetworkPluginMTU = in.NetworkPluginMTU
out.ImageGCHighThresholdPercent = in.ImageGCHighThresholdPercent
out.ImageGCLowThresholdPercent = in.ImageGCLowThresholdPercent
out.ImagePullProgressDeadline = in.ImagePullProgressDeadline
out.EvictionHard = in.EvictionHard
out.EvictionSoft = in.EvictionSoft
out.EvictionSoftGracePeriod = in.EvictionSoftGracePeriod
@ -2462,6 +2463,7 @@ func autoConvert_kops_KubeletConfigSpec_To_v1alpha2_KubeletConfigSpec(in *kops.K
out.NetworkPluginMTU = in.NetworkPluginMTU
out.ImageGCHighThresholdPercent = in.ImageGCHighThresholdPercent
out.ImageGCLowThresholdPercent = in.ImageGCLowThresholdPercent
out.ImagePullProgressDeadline = in.ImagePullProgressDeadline
out.EvictionHard = in.EvictionHard
out.EvictionSoft = in.EvictionSoft
out.EvictionSoftGracePeriod = in.EvictionSoftGracePeriod