From 5804f9db3c66db394037381b6c300513c20aabbe Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Thu, 28 Sep 2017 14:52:23 +0100 Subject: [PATCH 1/3] kubernetes: rename /etc/kubelet.conf to /etc/kubelet.sh.conf To help reduce confusion from this file (which configures our `kubelet.sh` wrapper) vs `/var/lib/kubeadm/kubelet.conf` (which is created by `kubeadm` and configures `kubelet` itself). Signed-off-by: Ian Campbell --- projects/kubernetes/cri-containerd.yml | 2 +- projects/kubernetes/docker.yml | 2 +- projects/kubernetes/kubernetes/Dockerfile | 2 +- projects/kubernetes/kubernetes/kubelet.sh | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/projects/kubernetes/cri-containerd.yml b/projects/kubernetes/cri-containerd.yml index b74ba814a..b14e26641 100644 --- a/projects/kubernetes/cri-containerd.yml +++ b/projects/kubernetes/cri-containerd.yml @@ -2,6 +2,6 @@ services: - name: cri-containerd image: linuxkitprojects/cri-containerd:da520622a5cecb07044ef76b0b84102807527fb5 files: - - path: /etc/kubelet.conf + - path: /etc/kubelet.sh.conf contents: | KUBELET_ARGS="--container-runtime=remote --container-runtime-endpoint=unix:///var/run/cri-containerd.sock" diff --git a/projects/kubernetes/docker.yml b/projects/kubernetes/docker.yml index 0b5dbdd3e..a34477eac 100644 --- a/projects/kubernetes/docker.yml +++ b/projects/kubernetes/docker.yml @@ -23,5 +23,5 @@ services: - name: kubernetes-image-cache-common image: linuxkitprojects/kubernetes-image-cache-common:465c8781efd6664c9a744eb78bf5b90d6ce5db3e files: - - path: /etc/kubelet.conf + - path: /etc/kubelet.sh.conf contents: "" diff --git a/projects/kubernetes/kubernetes/Dockerfile b/projects/kubernetes/kubernetes/Dockerfile index 6f2d69175..af4da42b9 100644 --- a/projects/kubernetes/kubernetes/Dockerfile +++ b/projects/kubernetes/kubernetes/Dockerfile @@ -75,4 +75,4 @@ WORKDIR / ENTRYPOINT ["/usr/bin/kubelet.sh"] COPY --from=build /out / ENV KUBECONFIG "/etc/kubernetes/admin.conf" -LABEL org.mobyproject.config='{"binds": ["/dev:/dev", "/etc/resolv.conf:/etc/resolv.conf", "/run:/run:rshared,rbind", "/var:/var:rshared,rbind", "/var/lib/kubeadm:/etc/kubernetes", "/etc/kubelet.conf:/etc/kubelet.conf", "/etc/kubeadm:/etc/kubeadm"], "mounts": [{"type": "cgroup", "options": ["rw","nosuid","noexec","nodev","relatime"]}], "capabilities": ["all"], "rootfsPropagation": "shared", "pid": "host", "runtime": {"mkdir": ["/var/lib/kubeadm", "/var/lib/cni/etc", "/var/lib/cni/opt"], "mounts": [{"type": "bind", "source": "/var/lib/cni/opt", "destination": "/opt/cni", "options": ["rw", "bind"]}, {"type": "bind", "source": "/var/lib/cni/etc", "destination": "/etc/cni", "options": ["rw", "bind"]}]}}' +LABEL org.mobyproject.config='{"binds": ["/dev:/dev", "/etc/resolv.conf:/etc/resolv.conf", "/run:/run:rshared,rbind", "/var:/var:rshared,rbind", "/var/lib/kubeadm:/etc/kubernetes", "/etc/kubelet.sh.conf:/etc/kubelet.sh.conf", "/etc/kubeadm:/etc/kubeadm"], "mounts": [{"type": "cgroup", "options": ["rw","nosuid","noexec","nodev","relatime"]}], "capabilities": ["all"], "rootfsPropagation": "shared", "pid": "host", "runtime": {"mkdir": ["/var/lib/kubeadm", "/var/lib/cni/etc", "/var/lib/cni/opt"], "mounts": [{"type": "bind", "source": "/var/lib/cni/opt", "destination": "/opt/cni", "options": ["rw", "bind"]}, {"type": "bind", "source": "/var/lib/cni/etc", "destination": "/etc/cni", "options": ["rw", "bind"]}]}}' diff --git a/projects/kubernetes/kubernetes/kubelet.sh b/projects/kubernetes/kubernetes/kubelet.sh index 2d3b2f6b4..a717b4659 100755 --- a/projects/kubernetes/kubernetes/kubelet.sh +++ b/projects/kubernetes/kubernetes/kubelet.sh @@ -7,8 +7,8 @@ if [ ! -e /var/lib/cni/.opt.defaults-extracted ] ; then tar -xzf /root/cni.tgz -C /var/lib/cni/opt/bin touch /var/lib/cni/.opt.defaults-extracted fi -if [ -e /etc/kubelet.conf ] ; then - . /etc/kubelet.conf +if [ -e /etc/kubelet.sh.conf ] ; then + . /etc/kubelet.sh.conf fi if [ -e /var/config/kubeadm/init ] ; then echo "kubelet.sh: init cluster with metadata \"$(cat /var/config/kubeadm/init)\"" From f02c79e733525f882867838ab76b49d8d6a37dbd Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Fri, 29 Sep 2017 09:45:20 +0100 Subject: [PATCH 2/3] kubernetes: cri-containerd v1.0.0-alpha.0 Signed-off-by: Ian Campbell --- projects/kubernetes/cri-containerd/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/kubernetes/cri-containerd/Dockerfile b/projects/kubernetes/cri-containerd/Dockerfile index c4df46a6e..f524dcdae 100644 --- a/projects/kubernetes/cri-containerd/Dockerfile +++ b/projects/kubernetes/cri-containerd/Dockerfile @@ -15,7 +15,7 @@ ENV GOPATH=/go PATH=$PATH:/go/bin ENV CRI_CONTAINERD_URL https://github.com/kubernetes-incubator/cri-containerd.git #ENV CRI_CONTAINERD_BRANCH pull/NNN/head -ENV CRI_CONTAINERD_COMMIT 0e6e59348122e86842bcd93c75c1d4a264ca1288 +ENV CRI_CONTAINERD_COMMIT v1.0.0-alpha.0 RUN mkdir -p $GOPATH/src/github.com/kubernetes-incubator && \ cd $GOPATH/src/github.com/kubernetes-incubator && \ git clone $CRI_CONTAINERD_URL cri-containerd From 6ae72e8f50bfb7d9998c7e4186e782700f7d86cb Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Fri, 29 Sep 2017 10:07:11 +0100 Subject: [PATCH 3/3] kubernetes: update yml Signed-off-by: Ian Campbell --- projects/kubernetes/cri-containerd.yml | 2 +- projects/kubernetes/kube.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/kubernetes/cri-containerd.yml b/projects/kubernetes/cri-containerd.yml index b14e26641..ca4f05efe 100644 --- a/projects/kubernetes/cri-containerd.yml +++ b/projects/kubernetes/cri-containerd.yml @@ -1,6 +1,6 @@ services: - name: cri-containerd - image: linuxkitprojects/cri-containerd:da520622a5cecb07044ef76b0b84102807527fb5 + image: linuxkitprojects/cri-containerd:3ccc80f3257647a02c4a78fb0f0557805601c958 files: - path: /etc/kubelet.sh.conf contents: | diff --git a/projects/kubernetes/kube.yml b/projects/kubernetes/kube.yml index 5ab917f21..a488084a7 100644 --- a/projects/kubernetes/kube.yml +++ b/projects/kubernetes/kube.yml @@ -36,7 +36,7 @@ services: - name: sshd image: linuxkit/sshd:d313eea3d9d7fbcbc927d06a6700325725db2a82 - name: kubelet - image: linuxkitprojects/kubernetes:f3be02879f599ed59be5e307b866249e1a2f2eff + image: linuxkitprojects/kubernetes:710738dd5a75bb06a1a5a88c74df136ea05bc8a5 files: - path: etc/linuxkit.yml metadata: yaml