Merge pull request #10411 from prezha/fix-docker-StartLimitIntervalSec

move StartLimitIntervalSec param from [Service] to [Unit] section
kubernetes · Feb 9, 2021 · 0f3b4b2 · 0f3b4b2
2 parents b414901 + 6d40ab3
commit 0f3b4b2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/pkg/minikube/bootstrapper/bsutil/ktmpl/kubelet.go b/pkg/minikube/bootstrapper/bsutil/ktmpl/kubelet.go
@@ -33,11 +33,11 @@ ExecStart={{.KubeletPath}}{{if .ExtraOptions}} {{.ExtraOptions}}{{end}}
 var KubeletServiceTemplate = template.Must(template.New("kubeletServiceTemplate").Parse(`[Unit]
 Description=kubelet: The Kubernetes Node Agent
 Documentation=http://kubernetes.io/docs/
+StartLimitIntervalSec=0
 
 [Service]
 ExecStart={{.KubeletPath}}
 Restart=always
-StartLimitInterval=0
 # Tuned for local dev: faster than upstream default (10s), but slower than systemd default (100ms)
 RestartSec=600ms
 

diff --git a/pkg/provision/buildroot.go b/pkg/provision/buildroot.go
@@ -76,12 +76,12 @@ Description=Docker Application Container Engine
 Documentation=https://docs.docker.com
 After=network.target  minikube-automount.service docker.socket
 Requires= minikube-automount.service docker.socket 
+StartLimitBurst=3
+StartLimitIntervalSec=60
 
 [Service]
 Type=notify
 Restart=on-failure
-StartLimitBurst=3
-StartLimitIntervalSec=60
 `
 	if noPivot {
 		klog.Warning("Using fundamentally insecure --no-pivot option")

diff --git a/pkg/provision/ubuntu.go b/pkg/provision/ubuntu.go
@@ -79,12 +79,12 @@ BindsTo=containerd.service
 After=network-online.target firewalld.service containerd.service
 Wants=network-online.target
 Requires=docker.socket
+StartLimitBurst=3
+StartLimitIntervalSec=60
 
 [Service]
 Type=notify
 Restart=on-failure
-StartLimitBurst=3
-StartLimitIntervalSec=60
 `
 	if noPivot {
 		klog.Warning("Using fundamentally insecure --no-pivot option")