Update k8s and Docker version

Signed-off-by: Bastiaan Schaap <bastiaan.schaap@siteminds.nl>
linuxkit · Jul 25, 2019 · f6ef3ed · f6ef3ed
1 parent 875bed6
commit f6ef3ed
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 37 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -13,7 +13,7 @@ linuxkit_pkg_build: &linuxkit_pkg_build
         at: /workspace
     - checkout
     - setup_remote_docker:
-        version: 17.06.1-ce
+        version: 18.06.0-ce
     - run:
         name: Docker version
         command: |
@@ -47,7 +47,7 @@ image_build: &image_build
         at: /workspace
     - checkout
     - setup_remote_docker:
-        version: 17.06.1-ce
+        version: 18.06.0-ce
     - run:
         name: Importing packages from workspace
         command: |
@@ -102,24 +102,24 @@ jobs:
       - run:
           name: Fetch binaries
           command: |
-            curl -fsSL -o /tmp/docker.tgz https://download.docker.com/linux/static/stable/x86_64/docker-18.03.0-ce.tgz
+            curl -fsSL -o /tmp/docker.tgz https://download.docker.com/linux/static/stable/x86_64/docker-18.06.0-ce.tgz
             tar xfO /tmp/docker.tgz docker/docker > /workspace/bin/docker
             # To update find the most recent successful build at https://circleci.com/gh/linuxkit/linuxkit/tree/master
             # and find the link + SHA256 in the `Artifacts` tab
-            curl -fsSL -o /workspace/bin/linuxkit /~https://github.com/linuxkit/linuxkit/releases/download/v0.4/linuxkit-linux-amd64
-            curl -fsSL -o /workspace/bin/manifest-tool /~https://github.com/estesp/manifest-tool/releases/download/v0.7.0/manifest-tool-linux-amd64
-            curl -fsSL -o /workspace/bin/notary /~https://github.com/theupdateframework/notary/releases/download/v0.6.0/notary-Linux-amd64
+            curl -fsSL -o /workspace/bin/linuxkit /~https://github.com/linuxkit/linuxkit/releases/download/v0.7/linuxkit-linux-amd64
+            curl -fsSL -o /workspace/bin/manifest-tool /~https://github.com/estesp/manifest-tool/releases/download/v0.9.0/manifest-tool-linux-amd64
+            curl -fsSL -o /workspace/bin/notary /~https://github.com/theupdateframework/notary/releases/download/v0.6.1/notary-Linux-amd64
 
             echo "Downloaded:"
             sha256sum /workspace/bin/*
             echo
 
             echo "Checking checksums"
             sha256sum -c <<EOF
-            f5ea546a4ccd64fbb71825f964171256388f1181b000f3c56747075e383c81c6  /workspace/bin/docker
-            57074fda28aefdefaec96866b178d1d0b8d3e251725c506d4e22851032733649  /workspace/bin/linuxkit
-            e4ca2ef0015a4be8597d31d9e3e70d88da33924ae72b0999e9f3b79304d4710d  /workspace/bin/manifest-tool
-            f4e421b3bb3c32c39372f7f02fbe80c67580cccd381f9722b1c702b3ab63a1c7  /workspace/bin/notary
+            7ceb584cedba158b335fa2df11556cd70c6c528c7c93ceb3bf9aa13903e824cd  /workspace/bin/docker
+            c747033343315774b6e51f618eb143d5714e398a32b59b9b6acab23b599dd970  /workspace/bin/linuxkit
+            80906341c3306e3838437eeb08fff5da2c38bd89149019aa301c7745e07ea8f9  /workspace/bin/manifest-tool
+            73353b2b4b85604c738a6800465133cb3a828dff0aa26f3c0926dd9a73e19879  /workspace/bin/notary
             EOF
       - run:
           name: Versions
@@ -146,7 +146,7 @@ jobs:
       - attach_workspace:
           at: /workspace
       - setup_remote_docker:
-          version: 17.06.1-ce
+          version: 18.06.0-ce
       - run:
           name: Docker version
           command: |
@@ -247,7 +247,7 @@ jobs:
           at: /workspace
       - checkout
       - setup_remote_docker:
-          version: 17.06.1-ce
+          version: 18.06.0-ce
       - run:
           name: Docker version
           command: |

diff --git a/Makefile b/Makefile
@@ -1,15 +1,14 @@
 KUBE_RUNTIME ?= docker
 KUBE_NETWORK ?= weave
-KUBE_VERSION ?= 1.14
+KUBE_VERSION ?= 1.15
 KUBE_NETWORK_WEAVE ?= v2.5.2
 KUBE_NETWORK_CALICO ?= v3.8
 
-# ifeq ($(shell uname -s),Darwin)
-# KUBE_FORMATS ?= iso-efi
-# else
-#KUBE_FORMATS ?= iso-bios
-# endif
-KUBE_FORMATS ?= tar-kernel-initrd
+ifeq ($(shell uname -s),Darwin)
+KUBE_FORMATS ?= iso-efi
+else
+KUBE_FORMATS ?= iso-bios
+endif
 
 KUBE_FORMAT_ARGS := $(patsubst %,-format %,$(KUBE_FORMATS))
 

diff --git a/pkg/kubelet/Dockerfile b/pkg/kubelet/Dockerfile
@@ -3,7 +3,7 @@ FROM linuxkit/alpine:08c8d8aa3638d035e18499a74faf50eedb8d6cf6-amd64 AS build
 # When changing kubernetes_version remember to also update:
 # - scripts/mk-image-cache-lst and run `make refresh-image-caches` from top-level
 # - pkg/e2e-test/Dockerfile
-ENV kubernetes_version v1.14.4
+ENV kubernetes_version v1.15.1
 ENV cni_version        v0.8.1
 ENV critools_version   v1.15.0
 
@@ -123,5 +123,5 @@ FROM scratch
 WORKDIR /
 ENTRYPOINT ["/usr/bin/kubelet.sh"]
 COPY --from=build /out /
-COPY --from=docker:18.03.0-ce /usr/local/bin/docker /usr/local/bin/docker
+COPY --from=docker:18.06.3-ce /usr/local/bin/docker /usr/local/bin/docker
 ENV KUBECONFIG "/etc/kubernetes/admin.conf"
diff --git a/pkg/kubernetes-docker-image-cache-common/Dockerfile b/pkg/kubernetes-docker-image-cache-common/Dockerfile
@@ -11,7 +11,7 @@ RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache
 FROM scratch
 WORKDIR /
 COPY --from=build /out /
-COPY --from=docker:18.03.0-ce /usr/local/bin/docker /usr/local/bin/docker
+COPY --from=docker:18.06.3-ce /usr/local/bin/docker /usr/local/bin/docker
 COPY dl/*.tar /images/
 ENTRYPOINT [ "/bin/sh", "-c" ]
 CMD [ "sleep 10; for image in /images/*.tar ; do docker image load -i $image && rm -f $image ; done" ]
diff --git a/pkg/kubernetes-docker-image-cache-common/images.lst b/pkg/kubernetes-docker-image-cache-common/images.lst
@@ -1,5 +1,5 @@
 # autogenerated by:
 #    ./scripts/mk-image-cache-lst common
-gcr.io/google_containers/kube-proxy:v1.14.4@sha256:a8d90a206f775e09927af8567b076d7a14caa1a451be16b1cf1933a972e8aad4
+gcr.io/google_containers/kube-proxy:v1.15.1@sha256:08186f4897488e96cb098dd8d1d931af9a6ea718bb8737bf44bb76e42075f0ce
 gcr.io/google_containers/coredns:1.3.1@sha256:02382353821b12c21b062c59184e227e001079bb13ebd01f9d3270ba0fcbf1e4
 gcr.io/google_containers/pause:3.1@sha256:59eec8837a4d942cc19a52b8c09ea75121acc38114a2c68b98983ce9356b8610
diff --git a/pkg/kubernetes-docker-image-cache-control-plane/Dockerfile b/pkg/kubernetes-docker-image-cache-control-plane/Dockerfile
@@ -11,7 +11,7 @@ RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache
 FROM scratch
 WORKDIR /
 COPY --from=build /out /
-COPY --from=docker:18.03.0-ce /usr/local/bin/docker /usr/local/bin/docker
+COPY --from=docker:18.06.3-ce /usr/local/bin/docker /usr/local/bin/docker
 COPY dl/*.tar /images/
 ENTRYPOINT [ "/bin/sh", "-c" ]
 CMD [ "sleep 10; for image in /images/*.tar ; do docker image load -i $image && rm -f $image ; done" ]
diff --git a/pkg/kubernetes-docker-image-cache-control-plane/images.lst b/pkg/kubernetes-docker-image-cache-control-plane/images.lst
@@ -1,7 +1,6 @@
 # autogenerated by:
 #    ./scripts/mk-image-cache-lst control-plane
-gcr.io/google_containers/kube-apiserver:v1.14.4@sha256:be78c5871964d5f7a6716670a3e40fc0815e8a7391b31a60d261b8d40e663e34
-gcr.io/google_containers/kube-proxy:v1.14.4@sha256:a8d90a206f775e09927af8567b076d7a14caa1a451be16b1cf1933a972e8aad4
-gcr.io/google_containers/kube-controller-manager:v1.14.4@sha256:8c990c920d141979a35d3da73dac38415ba5946ecff48bdf1a4455271090ffaf
-gcr.io/google_containers/kube-scheduler:v1.14.4@sha256:5463ae2574811dc07f8c8bf70b8ebce8c021e630d5f176ad0d0bfeebea504d8b
-gcr.io/google_containers/etcd:3.3.10-1@sha256:02cd751eef4f7dcea7986e58d51903dab39baf4606f636b50891f30190abce2c
+gcr.io/google_containers/kube-apiserver:v1.15.1@sha256:304a1c38707834062ee87df62ef329d52a8b9a3e70459565d0a396479073f54c
+gcr.io/google_containers/kube-controller-manager:v1.15.1@sha256:9abae95e428e228fe8f6d1630d55e79e018037460f3731312805c0f37471e4bf
+gcr.io/google_containers/kube-scheduler:v1.15.1@sha256:d0ee18a9593013fbc44b1920e4930f29b664b59a3958749763cb33b57e0e8956
+gcr.io/google_containers/etcd:3.3.10@sha256:17da501f5d2a675be46040422a27b7cc21b8a43895ac998b171db1c346f361f7
diff --git a/scripts/mk-image-cache-lst b/scripts/mk-image-cache-lst
@@ -3,10 +3,10 @@ repo=gcr.io/google_containers
 # When changing kubernetes_version remember to also update:
 # - pkg/kubelet/Dockerfile
 # - pkg/e2e-test/Dockerfile
-kubernetes_version=v1.14.4
+kubernetes_version=v1.15.1
 coredns_version=1.3.1
 pause_version=3.1
-etcd_version=3.3.10-1
+etcd_version=3.3.10
 
 common="
 	kube-proxy:$kubernetes_version

diff --git a/yml/cri-containerd.yml b/yml/cri-containerd.yml
@@ -1,6 +1,6 @@
 services:
   - name: cri-containerd
-    image: linuxkit/cri-containerd:74cb328b786d5cada9ddfca0097675b51c7e7d93
+    image: linuxkit/cri-containerd:f216f883c63b26b48f08af83696d211e7413cca5
     cgroupsPath: podruntime/cri-containerd
 files:
   - path: /etc/kubelet.sh.conf

diff --git a/yml/docker-master.yml b/yml/docker-master.yml
@@ -1,4 +1,4 @@
 services:
   - name: kubernetes-docker-image-cache-control-plane
-    image: linuxkit/kubernetes-docker-image-cache-control-plane:698faae3de953d7fc0f009360bcfce98497afe76-dirty
+    image: linuxkit/kubernetes-docker-image-cache-control-plane:139f1a654743704a4878e3406390538008560be6-dirty
     cgroupsPath: podruntime/control-cache
diff --git a/yml/docker.yml b/yml/docker.yml
@@ -1,6 +1,6 @@
 services:
   - name: docker
-    image: docker:18.03.0-ce-dind
+    image: docker:18.06.3-ce-dind
     capabilities:
      - all
     pid: host
@@ -26,7 +26,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:2da947148638cbbef869215cdb0e572c0402833c-dirty
+    image: linuxkit/kubernetes-docker-image-cache-common:2284c229745de46e754ee3d64e9646af51f1cf73-dirty
     cgroupsPath: podruntime/common-cache
 files:
   - path: /etc/kubelet.sh.conf

diff --git a/yml/kube.yml b/yml/kube.yml
@@ -32,7 +32,7 @@ services:
     image: linuxkit/rngd:v0.7
     cgroupsPath: systemreserved/rngd
   - name: eudev
-    image: linuxkit/eudev:83ba66c5e59fa5077c21d42a7ff4f620a8456b1d-dirty
+    image: linuxkit/eudev:1ca7f912b8d037a5a0bccb2c54c77eaa7fd36f8a
     cgroupsPath: systemreserved/eudev
   - name: ntpd
     image: linuxkit/openntpd:v0.7
@@ -41,12 +41,13 @@ services:
     image: linuxkit/sshd:v0.7
     cgroupsPath: systemreserved/sshd
   - name: kubelet
-    image: linuxkit/kubelet:0bc50f1bacc8a95e9d0b5e8c089cf295ca7e5bef-dirty
+    image: linuxkit/kubelet:4c3974d5ffa7de9769e5142056d453dc562481b7-dirty
     cgroupsPath: podruntime/kubelet
   - name: getty
     image: linuxkit/getty:v0.7
     env:
      - INSECURE=true
+    cgroupsPath: systemreserved/getty
 files:
   - path: etc/linuxkit.yml
     metadata: yaml