@@ -345,13 +345,13 @@ coreos:
345
345
--volume var-lib-calico,kind=host,source=/var/lib/calico \
346
346
--mount volume=var-lib-calico,target=/var/lib/calico \
347
347
--volume var-log,kind=host,source=/var/log \
348
- {{ if gt (len .Kubelet.Mounts) 0 - }}
348
+ {{- if gt (len .Kubelet.Mounts) 0 }}
349
349
{{ range $i, $m := .Kubelet.Mounts -}}
350
350
{{ range $j, $a := $m.ToRktRunArgs -}}
351
351
{{ $a }} \
352
- {{ end - }}
353
- {{ end - }}
354
- {{ end - }}
352
+ {{- end }}
353
+ {{- end }}
354
+ {{- end }}
355
355
--mount volume=var-log,target=/var/log \
356
356
--volume cni-bin,kind=host,source=/opt/cni/bin \
357
357
--mount volume=cni-bin,target=/opt/cni/bin \
@@ -368,17 +368,17 @@ coreos:
368
368
ExecStartPre=/bin/sed -e "s/COREOS_PRIVATE_IPV4/${COREOS_PRIVATE_IPV4}/g" -i /etc/kubernetes/config/kubelet.yaml
369
369
ExecStartPre=/bin/sh -ec "find /etc/kubernetes/manifests /srv/kubernetes/manifests -maxdepth 1 -type f | xargs --no-run-if-empty sed -i 's|#ETCD_ENDPOINTS#|${ETCD_ENDPOINTS}|'"
370
370
ExecStart=/bin/sh -c "exec /usr/lib/coreos/kubelet-wrapper \
371
- {{ if checkVersion ">= 1.14" .K8sVer - }}
371
+ {{- if checkVersion ">= 1.14" .K8sVer }}
372
372
--bootstrap-kubeconfig=/etc/kubernetes/kubeconfig/worker-bootstrap.yaml \
373
373
{{- end }}
374
374
{{ if .Kubelet.Kubeconfig -}}
375
375
--kubeconfig={{ .Kubelet.Kubeconfig }} \
376
- {{ else - }}
376
+ {{- else }}
377
377
--kubeconfig=/etc/kubernetes/kubeconfig/kubelet.yaml \
378
- {{ end - }}
379
- {{if checkVersion "<1.10" .K8sVer - }}
378
+ {{- end }}
379
+ {{- if checkVersion "<1.10" .K8sVer }}
380
380
--require-kubeconfig \
381
- {{end - }}
381
+ {{- end }}
382
382
--cni-conf-dir=/etc/kubernetes/cni/net.d \
383
383
{{/* Work-around until https://github.com/kubernetes/kubernetes/issues/43967 is fixed via https://github.com/kubernetes/kubernetes/pull/43995 */ -}}
384
384
--cni-bin-dir=/opt/cni/bin \
0 commit comments