Skip to content
This repository was archived by the owner on Sep 30, 2020. It is now read-only.

Commit 06a2131

Browse files
Remove possible blank lines (#1811)
1 parent 7508322 commit 06a2131

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

builtin/files/userdata/cloud-config-controller

+9-9
Original file line numberDiff line numberDiff line change
@@ -345,13 +345,13 @@ coreos:
345345
--volume var-lib-calico,kind=host,source=/var/lib/calico \
346346
--mount volume=var-lib-calico,target=/var/lib/calico \
347347
--volume var-log,kind=host,source=/var/log \
348-
{{ if gt (len .Kubelet.Mounts) 0 -}}
348+
{{- if gt (len .Kubelet.Mounts) 0 }}
349349
{{ range $i, $m := .Kubelet.Mounts -}}
350350
{{ range $j, $a := $m.ToRktRunArgs -}}
351351
{{ $a }} \
352-
{{ end -}}
353-
{{ end -}}
354-
{{ end -}}
352+
{{- end }}
353+
{{- end }}
354+
{{- end }}
355355
--mount volume=var-log,target=/var/log \
356356
--volume cni-bin,kind=host,source=/opt/cni/bin \
357357
--mount volume=cni-bin,target=/opt/cni/bin \
@@ -368,17 +368,17 @@ coreos:
368368
ExecStartPre=/bin/sed -e "s/COREOS_PRIVATE_IPV4/${COREOS_PRIVATE_IPV4}/g" -i /etc/kubernetes/config/kubelet.yaml
369369
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}|'"
370370
ExecStart=/bin/sh -c "exec /usr/lib/coreos/kubelet-wrapper \
371-
{{ if checkVersion ">= 1.14" .K8sVer -}}
371+
{{- if checkVersion ">= 1.14" .K8sVer }}
372372
--bootstrap-kubeconfig=/etc/kubernetes/kubeconfig/worker-bootstrap.yaml \
373373
{{- end }}
374374
{{ if .Kubelet.Kubeconfig -}}
375375
--kubeconfig={{ .Kubelet.Kubeconfig }} \
376-
{{ else -}}
376+
{{- else }}
377377
--kubeconfig=/etc/kubernetes/kubeconfig/kubelet.yaml \
378-
{{ end -}}
379-
{{if checkVersion "<1.10" .K8sVer -}}
378+
{{- end }}
379+
{{- if checkVersion "<1.10" .K8sVer }}
380380
--require-kubeconfig \
381-
{{end -}}
381+
{{- end }}
382382
--cni-conf-dir=/etc/kubernetes/cni/net.d \
383383
{{/* Work-around until https://github.com/kubernetes/kubernetes/issues/43967 is fixed via https://github.com/kubernetes/kubernetes/pull/43995 */ -}}
384384
--cni-bin-dir=/opt/cni/bin \

0 commit comments

Comments
 (0)