Merge pull request #47 from ijc/linuxkit-bump

Bump to latest linuxkit hashes, cri beta.1 & Docker 17.12.

Author: ijc

pkg/cri-containerd/Dockerfile

@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:07f7d136e427dc68154cd5edbb2b9576f9ac5213 AS build
+FROM linuxkit/alpine:4584958639b2378246371fe219f33b270667e22e AS build
 
 RUN \
   apk add \
@@ -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 v1.0.0-beta.0
+ENV CRI_CONTAINERD_COMMIT v1.0.0-beta.1
 RUN mkdir -p $GOPATH/src/github.com/kubernetes-incubator && \
     cd $GOPATH/src/github.com/kubernetes-incubator && \
     git clone $CRI_CONTAINERD_URL cri-containerd

pkg/kube-e2e-test/Dockerfile

@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:07f7d136e427dc68154cd5edbb2b9576f9ac5213 AS build
+FROM linuxkit/alpine:4584958639b2378246371fe219f33b270667e22e AS build
 
 # When changing kubernetes_version remember to also update:
 # - scripts/mk-image-cache-lst and run `make refresh-image-caches` from top-level
@@ -40,6 +40,7 @@ RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
 RUN apk add --no-cache --initdb -p /out \
     alpine-baselayout \
     bash \
+    busybox \
     ca-certificates \
     curl \
     musl \
@@ -54,8 +55,6 @@ RUN cp _output/bin/e2e.test /out/usr/bin/e2e.test
 # Remove apk residuals. We have a read-only rootfs, so apk is of no use.
 RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache
 
-RUN rmdir /out/var/run && ln -nfs /run /out/var/run
-
 ADD in-cluster-config.yaml /out/etc/in-cluster-config.yaml
 ADD e2e.sh /out/usr/bin/e2e.sh
 

pkg/kubelet/Dockerfile

@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:07f7d136e427dc68154cd5edbb2b9576f9ac5213 AS build
+FROM linuxkit/alpine:4584958639b2378246371fe219f33b270667e22e AS build
 
 # When changing kubernetes_version remember to also update:
 # - scripts/mk-image-cache-lst and run `make refresh-image-caches` from top-level
@@ -106,8 +106,6 @@ RUN cp $GOPATH/bin/critest /out/usr/bin/critest
 # Remove apk residuals. We have a read-only rootfs, so apk is of no use.
 RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache
 
-RUN rmdir /out/var/run && ln -nfs /run /out/var/run
-
 ADD kubelet.sh /out/usr/bin/kubelet.sh
 ADD kubeadm-init.sh /kubeadm-init.sh
 RUN sed -e "s/@KUBERNETES_VERSION@/${kubernetes_version}/g" </kubeadm-init.sh >/out/usr/bin/kubeadm-init.sh && chmod +x /out/usr/bin/kubeadm-init.sh

pkg/kubernetes-docker-image-cache-common/Dockerfile

@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:07f7d136e427dc68154cd5edbb2b9576f9ac5213 AS build
+FROM linuxkit/alpine:4584958639b2378246371fe219f33b270667e22e AS build
 
 RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
 RUN apk add --no-cache --initdb -p /out \
@@ -8,8 +8,6 @@ RUN apk add --no-cache --initdb -p /out \
 # Remove apk residuals. We have a read-only rootfs, so apk is of no use.
 RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache
 
-RUN rmdir /out/var/run && ln -nfs /run /out/var/run
-
 FROM scratch
 WORKDIR /
 COPY --from=build /out /

pkg/kubernetes-docker-image-cache-control-plane/Dockerfile

@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:07f7d136e427dc68154cd5edbb2b9576f9ac5213 AS build
+FROM linuxkit/alpine:4584958639b2378246371fe219f33b270667e22e AS build
 
 RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
 RUN apk add --no-cache --initdb -p /out \
@@ -8,8 +8,6 @@ RUN apk add --no-cache --initdb -p /out \
 # Remove apk residuals. We have a read-only rootfs, so apk is of no use.
 RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache
 
-RUN rmdir /out/var/run && ln -nfs /run /out/var/run
-
 FROM scratch
 WORKDIR /
 COPY --from=build /out /

scripts/update-linuxkit-hashes.sh

@@ -10,6 +10,28 @@ git clone $lkurl $tdir/lk
 
 lkrev=$(git -C $tdir/lk show --oneline -s HEAD)
 
+update_hash() {
+    local tag=$1; shift
+    echo "Updating to $tag"
+
+    image=${tag%:*}
+    sed -i -e "s,$image:[[:xdigit:]]\{40\}\(-dirty\)\?,$tag,g" $@
+}
+
+# First update alpine build bases
+
+# Alpine base image does not use linuxkit pkg, grab the tag from versions.x86_64 instead.
+if [ ! -f "$tdir/lk/tools/alpine/versions.x86_64" ] ; then
+    echo "tools/alpine lacks versions.x86_64 file" >&2
+    exit 1
+fi
+tag=$(sed -n -e '1s,^\# \(linuxkit/alpine:[[:xdigit:]]\{40\}\)-amd64$,\1,p' $tdir/lk/tools/alpine/versions.x86_64)
+if [ ! -n "$tag" ] ; then
+    echo "Failed to extract tools/alpine tag" >&2
+    exit 1
+fi
+update_hash $tag pkg/*/Dockerfile
+
 for i in $tdir/lk/pkg/* ; do
     if [ ! -d "$i" ] ; then
 	continue
@@ -21,12 +43,25 @@ for i in $tdir/lk/pkg/* ; do
     fi
 
     tag=$(linuxkit pkg show-tag "$i")
-    echo "Updating to $tag"
-
-    image=${tag%:*}
-    sed -i -e "s,$image:[[:xdigit:]]\{40\}\(-dirty\)\?,$tag,g" yml/*.yml
+    update_hash "$tag" yml/*.yml
 done
 
+# Kernel doesn't use `linuxkit pkg` and uses a different
+# tagging strategy, so we do it manually by extracting the
+# "recommended" one from the toplevel linuxkit.yml
+# example.
+# TODO: add a target to kernel/Makefile which will show
+# the recommended kernel.
+tag=$(sed -n -e 's,^\s*image: \(linuxkit/kernel:.\+\)\s*,\1,p' $tdir/lk/linuxkit.yml)
+if [ ! -n "$tag" ] ; then
+    echo "Failed to extract kernel tag" >&2
+    exit 1
+fi
+# Not update_hash since the tag is not a hash in this case
+
+echo "Updating to $tag"
+sed -i -e "s,linuxkit/kernel:.\+,$tag,g" yml/*.yml
+
 # We manually construct the S-o-b because -F strips the trailing blank
 # lines, meaning that with -s there is no blank between the "Commit:
 # ..." and the S-o-b.
@@ -41,4 +76,10 @@ Commit: $lkrev
 Signed-off-by: $uname <$email>
 EOF
 
-git commit --only -F $tdir/commit-msg yml/*.yml
+git commit --only -F $tdir/commit-msg yml/*.yml pkg/*/Dockerfile
+
+# Now update for the result of changes to pkg/*/Dockerfile, this is
+# defered until now so we get the new hash instead of the old hash
+# with a -dirty suffix.
+make update-hashes
+git commit --amend --only --no-edit yml/*.yml

ssh_into_kubelet.sh

@@ -16,4 +16,4 @@ case $(uname -s) in
 	    ijc25/alpine-ssh"
 	;;
 esac
-exec $ssh $sshopts -t root@"$1" ctr tasks exec --tty --exec-id ssh-$(hostname)-$$ kubelet ash -l
+exec $ssh $sshopts -t root@"$1" ctr --namespace services.linuxkit tasks exec --tty --exec-id ssh-$(hostname)-$$ kubelet ash -l

yml/cri-containerd.yml

@@ -1,6 +1,6 @@
 services:
   - name: cri-containerd
-    image: linuxkit/cri-containerd:35f4761216380fe80a120ba7fa2d52545847cc13
+    image: linuxkit/cri-containerd:6d7a253f3e69c506c76f0a0dfa32b7c307b0c9ee
     cgroupsPath: podruntime/cri-containerd
 files:
   - path: /etc/kubelet.sh.conf

yml/docker-master.yml

@@ -1,4 +1,4 @@
 services:
   - name: kubernetes-docker-image-cache-control-plane
-    image: linuxkit/kubernetes-docker-image-cache-control-plane:3606d4714909c0916f68f2ac96fc728c4d9de316
+    image: linuxkit/kubernetes-docker-image-cache-control-plane:d486ce15b5dedc742684849dd9d61b8d59d9624b
     cgroupsPath: podruntime/control-cache

yml/docker.yml

@@ -1,6 +1,6 @@
 services:
   - name: docker
-    image: docker:17.11.0-ce-dind
+    image: docker:17.12.0-ce-dind
     capabilities:
      - all
     pid: host
@@ -24,7 +24,7 @@ services:
       mkdir: ["/var/lib/kubeadm", "/var/lib/cni/conf", "/var/lib/cni/bin", "/var/lib/kubelet-plugins"]
     cgroupsPath: podruntime/docker
   - name: kubernetes-docker-image-cache-common
-    image: linuxkit/kubernetes-docker-image-cache-common:434f337a5338776f67ab34e2327489c1368f2559
+    image: linuxkit/kubernetes-docker-image-cache-common:9d0f7a513998ae3fdaf9089655aa9e9118e938f1
     cgroupsPath: podruntime/common-cache
 files:
   - path: /etc/kubelet.sh.conf