Kubernetes: --image-pull-progress-deadline 30m by default (#3199)

docs/clusterdefinition.md

@@ -180,6 +180,7 @@ Below is a list of kubelet options that acs-engine will configure by default:
 |"--non-masquerade-cidr"|"10.0.0.0/8"|
 |"--azure-container-registry-config"|"/etc/kubernetes/azure.json"|
 |"--pod-max-pids"|"100" (need to activate the feature in --feature-gates=SupportPodPidsLimit=true)|
+|"--image-pull-progress-deadline"|"30m"|
 |"--feature-gates"|No default (can be a comma-separated list). On agent nodes `Accelerators=true` will be applied in the `--feature-gates` option for k8s versions before 1.11.0|
 
 Below is a list of kubelet options that are *not* currently user-configurable, either because a higher order configuration vector is available that enforces kubelet configuration, or because a static configuration is required to build a functional cluster:

pkg/acsengine/defaults-kubelet.go

@@ -48,6 +48,7 @@ func setKubeletConfig(cs *api.ContainerService) {
 		"--event-qps":                       DefaultKubeletEventQPS,
 		"--cadvisor-port":                   DefaultKubeletCadvisorPort,
 		"--pod-max-pids":                    strconv.Itoa(DefaultKubeletPodMaxPIDs),
+		"--image-pull-progress-deadline":    "30m",
 	}
 
 	// If no user-configurable kubelet config values exists, use the defaults

pkg/acsengine/defaults-kubelet_test.go

@@ -12,7 +12,10 @@ func TestKubeletConfigDefaults(t *testing.T) {
 	setKubeletConfig(cs)
 	k := cs.Properties.OrchestratorProfile.KubernetesConfig.KubeletConfig
 	// TODO test all default config values
-	for key, val := range map[string]string{"--azure-container-registry-config": "/etc/kubernetes/azure.json"} {
+	for key, val := range map[string]string{
+		"--azure-container-registry-config": "/etc/kubernetes/azure.json",
+		"--image-pull-progress-deadline":    "30m",
+	} {
 		if k[key] != val {
 			t.Fatalf("got unexpected kubelet config value for %s: %s, expected %s",
 				key, k[key], val)