diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet.go b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet.go index 3dca5477054..599639a26c7 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet.go +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet.go @@ -120,7 +120,7 @@ const ( ContainerLogsDir = "/var/log/containers" // MaxContainerBackOff is the max backoff period, exported for the e2e test - MaxContainerBackOff = 300 * time.Second + MaxContainerBackOff = 30 * time.Second // Period for performing global cleanup tasks. housekeepingPeriod = time.Second * 2 @@ -155,7 +155,7 @@ const ( // backOffPeriod is the period to back off when pod syncing results in an // error. It is also used as the base period for the exponential backoff // container restarts and image pulls. - backOffPeriod = time.Second * 10 + backOffPeriod = time.Second * 5 // ContainerGCPeriod is the period for performing container garbage collection. ContainerGCPeriod = time.Minute @@ -396,7 +396,7 @@ func NewMainKubelet(kubeCfg *kubeletconfiginternal.KubeletConfiguration, resyncInterval: kubeCfg.SyncFrequency.Duration, sourcesReady: config.NewSourcesReady(kubeDeps.PodConfig.SeenAllSources), registerNode: registerNode, - nodeType: nodeType, + nodeType: nodeType, registerWithTaints: registerWithTaints, registerSchedulable: registerSchedulable, dnsConfigurer: dns.NewConfigurer(kubeDeps.Recorder, nodeRef, nodeIPs, clusterDNS, kubeCfg.ClusterDomain, kubeCfg.ResolverConfig), @@ -815,7 +815,7 @@ type Kubelet struct { // a list of node labels to register nodeLabels map[string]string // edge node type, keruntime specific field - nodeType string + nodeType string // Last timestamp when runtime responded on ping. // Mutex is used to protect this value. runtimeState *runtimeState