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

Commit 593a457

Browse files
dominicgunndominicgunn
committed
Switch back to Davids kubelet start script
1 parent 66da17d commit 593a457

File tree

4 files changed

+60
-56
lines changed

4 files changed

+60
-56
lines changed

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go:
44
- 1.13.x
55

66
script:
7-
- travis_wait 40 make test-with-cover
7+
- travis_wait 50 make test-with-cover
88

99
after_success:
1010
- bash <(curl -s https://codecov.io/bash)

‎builtin/files/userdata/cloud-config-controller

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -333,30 +333,6 @@ coreos:
333333
EnvironmentFile=/etc/environment
334334
EnvironmentFile=-/etc/etcd-environment
335335
EnvironmentFile=-/etc/default/kubelet
336-
Environment=KUBELET_IMAGE_TAG={{.K8sVer}}
337-
Environment=KUBELET_IMAGE_URL={{ .HyperkubeImage.RktRepoWithoutTag }}
338-
Environment="RKT_RUN_ARGS={{.HyperkubeImage.Options}}\
339-
--volume dns,kind=host,source=/etc/resolv.conf \
340-
--mount volume=dns,target=/etc/resolv.conf \
341-
--volume var-lib-cni,kind=host,source=/var/lib/cni \
342-
--mount volume=var-lib-cni,target=/var/lib/cni \
343-
--volume var-run-calico,kind=host,source=/var/run/calico \
344-
--mount volume=var-run-calico,target=/var/run/calico \
345-
--volume var-lib-calico,kind=host,source=/var/lib/calico \
346-
--mount volume=var-lib-calico,target=/var/lib/calico \
347-
--volume var-log,kind=host,source=/var/log \
348-
{{ if gt (len .Kubelet.Mounts) 0 -}}
349-
{{ range $i, $m := .Kubelet.Mounts -}}
350-
{{ range $j, $a := $m.ToRktRunArgs -}}
351-
{{ $a }} \
352-
{{ end -}}
353-
{{ end -}}
354-
{{ end -}}
355-
--mount volume=var-log,target=/var/log \
356-
--volume cni-bin,kind=host,source=/opt/cni/bin \
357-
--mount volume=cni-bin,target=/opt/cni/bin \
358-
--volume etc-kubernetes,kind=host,source=/etc/kubernetes \
359-
--mount volume=etc-kubernetes,target=/etc/kubernetes"
360336
ExecStartPre=/usr/bin/systemctl is-active cfn-etcd-environment.service
361337
ExecStartPre=/usr/bin/mkdir -p /var/lib/cni
362338
ExecStartPre=/usr/bin/mkdir -p /var/log/containers
@@ -365,10 +341,33 @@ coreos:
365341
ExecStartPre=/usr/bin/mkdir -p /etc/kubernetes/cni/net.d
366342
ExecStartPre=/usr/bin/mkdir -p /var/run/calico
367343
ExecStartPre=/usr/bin/mkdir -p /var/lib/calico
344+
ExecStartPre=/usr/bin/mkdir -p /var/lib/kubelet
345+
ExecStartPre=/usr/bin/mkdir -p /var/lib/docker
346+
ExecStartPre=/bin/bash -c "if ! grep -q "/var/lib/kubelet" /proc/mounts; then mount --bind /var/lib/kubelet /var/lib/kubelet && mount --make-shared /var/lib/kubelet; fi"
368347
ExecStartPre=/bin/sed -e "s/COREOS_PRIVATE_IPV4/${COREOS_PRIVATE_IPV4}/g" -i /etc/kubernetes/config/kubelet.yaml
369348
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-
ExecStart=/bin/sh -c "exec /usr/lib/coreos/kubelet-wrapper \
371-
{{ if checkVersion ">= 1.14" .K8sVer -}}
349+
ExecStartPre=-/bin/docker rm -f kubelet
350+
ExecStart=/bin/sh -c "docker run --name kubelet --privileged --net=host --pid=host \
351+
-v /:/rootfs:ro \
352+
-v /sys:/sys:ro \
353+
-v /dev:/dev \
354+
-v /var/run/docker.sock:/var/run/docker.sock \
355+
-v /etc/resolv.conf:/etc/resolv.conf:ro \
356+
-v /var/lib/cni:/var/lib/cni:rw \
357+
-v /var/run/calico:/var/run/calico:rw \
358+
-v /var/lib/calico:/var/lib/calico:rw \
359+
-v /var/log:/var/log:rw \
360+
-v /opt/cni/bin:/opt/cni/bin:rw \
361+
-v /etc/kubernetes:/etc/kubernetes:rw \
362+
-v /var/lib/kubelet:/var/lib/kubelet:shared \
363+
-v /var/lib/docker:/var/lib/docker:rshared \
364+
{{- if gt (len .Kubelet.Mounts) 0 }}
365+
{{- range .Kubelet.Mounts }}
366+
{{ .MountDockerRW }} \
367+
{{- end }}
368+
{{- end }}
369+
{{ .HyperkubeImage.RepoWithTag }} /kubelet \
370+
{{- if checkVersion ">= 1.14" .K8sVer }}
372371
--bootstrap-kubeconfig=/etc/kubernetes/kubeconfig/worker-bootstrap.yaml \
373372
{{- end }}
374373
{{ if .Kubelet.Kubeconfig -}}
@@ -399,8 +398,8 @@ coreos:
399398
{{- range $f := .Kubelet.Flags}}
400399
--{{$f.Name}}={{$f.Value}} \
401400
{{- end }}
402-
$KUBELET_OPTS \
403-
"
401+
$KUBELET_OPTS"
402+
ExecStop=/usr/bin/docker rm -f kubelet
404403
Restart=always
405404
RestartSec=10
406405

‎builtin/files/userdata/cloud-config-worker

Lines changed: 31 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -315,40 +315,45 @@ coreos:
315315
[Service]
316316
EnvironmentFile=/etc/environment
317317
EnvironmentFile=-/etc/default/kubelet
318-
Environment=KUBELET_IMAGE_TAG={{.K8sVer}}
319-
Environment=KUBELET_IMAGE_URL={{ .HyperkubeImage.RktRepoWithoutTag }}
320-
Environment="RKT_RUN_ARGS={{.HyperkubeImage.Options}}\
321-
--volume dns,kind=host,source=/etc/resolv.conf \
322-
--mount volume=dns,target=/etc/resolv.conf \
323-
{{ if eq .ContainerRuntime "rkt" -}}
324-
--volume rkt,kind=host,source=/opt/bin/host-rkt \
325-
--mount volume=rkt,target=/usr/bin/rkt \
326-
--volume var-lib-rkt,kind=host,source=/var/lib/rkt \
327-
--mount volume=var-lib-rkt,target=/var/lib/rkt \
328-
--volume stage,kind=host,source=/tmp \
329-
--mount volume=stage,target=/tmp \
330-
{{ end -}}
331-
--volume var-lib-cni,kind=host,source=/var/lib/cni \
332-
--mount volume=var-lib-cni,target=/var/lib/cni \
333-
--volume var-run-calico,kind=host,source=/var/run/calico \
334-
--mount volume=var-run-calico,target=/var/run/calico \
335-
--volume var-lib-calico,kind=host,source=/var/lib/calico \
336-
--mount volume=var-lib-calico,target=/var/lib/calico \
337-
--volume var-log,kind=host,source=/var/log \
338-
--mount volume=var-log,target=/var/log \
339-
--volume cni-bin,kind=host,source=/opt/cni/bin \
340-
--mount volume=cni-bin,target=/opt/cni/bin"
341318
ExecStartPre=/usr/bin/mkdir -p /var/lib/cni
342319
ExecStartPre=/usr/bin/mkdir -p /var/log/containers
343320
ExecStartPre=/usr/bin/mkdir -p /opt/cni/bin
344321
ExecStartPre=/usr/bin/mkdir -p /etc/kubernetes/manifests
345322
ExecStartPre=/usr/bin/mkdir -p /etc/kubernetes/cni/net.d
346323
ExecStartPre=/usr/bin/mkdir -p /var/run/calico
347324
ExecStartPre=/usr/bin/mkdir -p /var/lib/calico
325+
ExecStartPre=/usr/bin/mkdir -p /var/lib/kubelet
326+
ExecStartPre=/usr/bin/mkdir -p /var/lib/docker
327+
ExecStartPre=/bin/bash -c "if ! grep -q "/var/lib/kubelet" /proc/mounts; then mount --bind /var/lib/kubelet /var/lib/kubelet && mount --make-shared /var/lib/kubelet; fi"
348328
ExecStartPre=/bin/sed -e "s/COREOS_PRIVATE_IPV4/${COREOS_PRIVATE_IPV4}/g" -i /etc/kubernetes/config/kubelet.yaml
349-
ExecStart=/bin/sh -c "exec /usr/lib/coreos/kubelet-wrapper \
329+
ExecStartPre=-/bin/docker rm -f kubelet
330+
ExecStart=/bin/sh -c "docker run --name kubelet --privileged --net=host --pid=host \
331+
-v /:/rootfs:ro \
332+
-v /sys:/sys:ro \
333+
-v /dev:/dev \
334+
-v /var/run/docker.sock:/var/run/docker.sock \
335+
-v /etc/resolv.conf:/etc/resolv.conf:ro \
336+
-v /var/lib/cni:/var/lib/cni:rw \
337+
-v /var/run/calico:/var/run/calico:rw \
338+
-v /var/lib/calico:/var/lib/calico:rw \
339+
-v /var/log:/var/log:rw \
340+
-v /opt/cni/bin:/opt/cni/bin:rw \
341+
-v /etc/kubernetes:/etc/kubernetes:rw \
342+
-v /var/lib/kubelet:/var/lib/kubelet:rshared \
343+
-v /var/lib/docker:/var/lib/docker:rshared \
344+
{{ if eq .ContainerRuntime "rkt" -}}
345+
-v /opt/bin/host-rkt:/opt/bin/host-rkt:rw \
346+
-v /usr/bin/rkt:/usr/bin/rkt:ro \
347+
-v /var/lib/rkt:/usr/lib/rkt:rw \
348+
-v /tmp:/tmp:rw \
349+
{{- end }}
350+
{{- if gt (len .Kubelet.Mounts) 0 }}
351+
{{- range .Kubelet.Mounts }}
352+
{{ .MountDockerRW }} \
353+
{{- end }}
354+
{{- end }}
355+
{{ .HyperkubeImage.RepoWithTag }} /kubelet \
350356
--cni-conf-dir=/etc/kubernetes/cni/net.d \
351-
{{/* Work-around until https://github.com/kubernetes/kubernetes/issues/43967 is fixed via https://github.com/kubernetes/kubernetes/pull/43995 */ -}}
352357
--cni-bin-dir=/opt/cni/bin \
353358
--network-plugin={{.K8sNetworkPlugin}} \
354359
--container-runtime={{.ContainerRuntime}} \
@@ -382,7 +387,7 @@ coreos:
382387
{{- end }}
383388
$KUBELET_OPTS"
384389
Restart=always
385-
RestartSec=10
390+
RestartSec=10
386391

387392
[Install]
388393
WantedBy=multi-user.target

‎make/test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ default() {
1919
with-cover() {
2020
test -z "$(find . -path ./vendor -prune -type f -o -name '*.go' -exec gofmt -d {} + | tee /dev/stderr)"
2121
for d in $(go list ./... | grep -v '/vendor/' | grep -v '/hack'); do
22-
go test -timeout 35m -json -v --race -coverprofile=profile.out -covermode=atomic $d | tparse
22+
go test -timeout 45m -json -v --race -coverprofile=profile.out -covermode=atomic $d | tparse
2323
if [ -f profile.out ]; then
2424
cat profile.out >> coverage.txt
2525
rm profile.out

0 commit comments

Comments
 (0)