From 06943bb00518db0ae807ea7d5a3d1bee4cc1b028 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 1 Nov 2017 10:20:12 +0000 Subject: [PATCH 1/3] kubernetes: Add socat to cri-containerd package. Signed-off-by: Ian Campbell --- projects/kubernetes/cri-containerd/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/kubernetes/cri-containerd/Dockerfile b/projects/kubernetes/cri-containerd/Dockerfile index 52b671d53..8c5b68fdd 100644 --- a/projects/kubernetes/cri-containerd/Dockerfile +++ b/projects/kubernetes/cri-containerd/Dockerfile @@ -10,6 +10,7 @@ RUN \ libseccomp-dev \ linux-headers \ make \ + socat \ && true ENV GOPATH=/go PATH=$PATH:/go/bin From 56ff03da2dd8059505ed326dbb95fe6d648fac48 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 1 Nov 2017 10:21:24 +0000 Subject: [PATCH 2/3] kubernetes: bump to cri-containerd v1.0.0-alpha.1 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 8c5b68fdd..12d02b7e0 100644 --- a/projects/kubernetes/cri-containerd/Dockerfile +++ b/projects/kubernetes/cri-containerd/Dockerfile @@ -16,7 +16,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 v1.0.0-alpha.0 +ENV CRI_CONTAINERD_COMMIT v1.0.0-alpha.1 RUN mkdir -p $GOPATH/src/github.com/kubernetes-incubator && \ cd $GOPATH/src/github.com/kubernetes-incubator && \ git clone $CRI_CONTAINERD_URL cri-containerd From 8511e626fd1ae1e3f5f3c96932ccf4744b74545f Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 1 Nov 2017 10:24:29 +0000 Subject: [PATCH 3/3] kubernetes: bump cri-containerd yml to hash containing v1.0.0-alpha.1 Signed-off-by: Ian Campbell --- projects/kubernetes/cri-containerd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/kubernetes/cri-containerd.yml b/projects/kubernetes/cri-containerd.yml index 3255b7c2e..448dc763c 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:afb7c111a40788b1e085856fbddacf8a878385e7 + image: linuxkitprojects/cri-containerd:7059f247c4135c75722047a2ce2fe6119a0e1681 files: - path: /etc/kubelet.sh.conf contents: |