Skip to content

Commit f6ef3ed

Browse files
bjwschaapbjwschaap
committed
Update k8s and Docker version
Signed-off-by: Bastiaan Schaap <[email protected]>
1 parent 875bed6 commit f6ef3ed

File tree

12 files changed

+36
-37
lines changed

12 files changed

+36
-37
lines changed

‎.circleci/config.yml

+12-12
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ linuxkit_pkg_build: &linuxkit_pkg_build
1313
at: /workspace
1414
- checkout
1515
- setup_remote_docker:
16-
version: 17.06.1-ce
16+
version: 18.06.0-ce
1717
- run:
1818
name: Docker version
1919
command: |
@@ -47,7 +47,7 @@ image_build: &image_build
4747
at: /workspace
4848
- checkout
4949
- setup_remote_docker:
50-
version: 17.06.1-ce
50+
version: 18.06.0-ce
5151
- run:
5252
name: Importing packages from workspace
5353
command: |
@@ -102,24 +102,24 @@ jobs:
102102
- run:
103103
name: Fetch binaries
104104
command: |
105-
curl -fsSL -o /tmp/docker.tgz https://download.docker.com/linux/static/stable/x86_64/docker-18.03.0-ce.tgz
105+
curl -fsSL -o /tmp/docker.tgz https://download.docker.com/linux/static/stable/x86_64/docker-18.06.0-ce.tgz
106106
tar xfO /tmp/docker.tgz docker/docker > /workspace/bin/docker
107107
# To update find the most recent successful build at https://circleci.com/gh/linuxkit/linuxkit/tree/master
108108
# and find the link + SHA256 in the `Artifacts` tab
109-
curl -fsSL -o /workspace/bin/linuxkit https://github.com/linuxkit/linuxkit/releases/download/v0.4/linuxkit-linux-amd64
110-
curl -fsSL -o /workspace/bin/manifest-tool https://github.com/estesp/manifest-tool/releases/download/v0.7.0/manifest-tool-linux-amd64
111-
curl -fsSL -o /workspace/bin/notary https://github.com/theupdateframework/notary/releases/download/v0.6.0/notary-Linux-amd64
109+
curl -fsSL -o /workspace/bin/linuxkit https://github.com/linuxkit/linuxkit/releases/download/v0.7/linuxkit-linux-amd64
110+
curl -fsSL -o /workspace/bin/manifest-tool https://github.com/estesp/manifest-tool/releases/download/v0.9.0/manifest-tool-linux-amd64
111+
curl -fsSL -o /workspace/bin/notary https://github.com/theupdateframework/notary/releases/download/v0.6.1/notary-Linux-amd64
112112
113113
echo "Downloaded:"
114114
sha256sum /workspace/bin/*
115115
echo
116116
117117
echo "Checking checksums"
118118
sha256sum -c <<EOF
119-
f5ea546a4ccd64fbb71825f964171256388f1181b000f3c56747075e383c81c6 /workspace/bin/docker
120-
57074fda28aefdefaec96866b178d1d0b8d3e251725c506d4e22851032733649 /workspace/bin/linuxkit
121-
e4ca2ef0015a4be8597d31d9e3e70d88da33924ae72b0999e9f3b79304d4710d /workspace/bin/manifest-tool
122-
f4e421b3bb3c32c39372f7f02fbe80c67580cccd381f9722b1c702b3ab63a1c7 /workspace/bin/notary
119+
7ceb584cedba158b335fa2df11556cd70c6c528c7c93ceb3bf9aa13903e824cd /workspace/bin/docker
120+
c747033343315774b6e51f618eb143d5714e398a32b59b9b6acab23b599dd970 /workspace/bin/linuxkit
121+
80906341c3306e3838437eeb08fff5da2c38bd89149019aa301c7745e07ea8f9 /workspace/bin/manifest-tool
122+
73353b2b4b85604c738a6800465133cb3a828dff0aa26f3c0926dd9a73e19879 /workspace/bin/notary
123123
EOF
124124
- run:
125125
name: Versions
@@ -146,7 +146,7 @@ jobs:
146146
- attach_workspace:
147147
at: /workspace
148148
- setup_remote_docker:
149-
version: 17.06.1-ce
149+
version: 18.06.0-ce
150150
- run:
151151
name: Docker version
152152
command: |
@@ -247,7 +247,7 @@ jobs:
247247
at: /workspace
248248
- checkout
249249
- setup_remote_docker:
250-
version: 17.06.1-ce
250+
version: 18.06.0-ce
251251
- run:
252252
name: Docker version
253253
command: |

‎Makefile

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
KUBE_RUNTIME ?= docker
22
KUBE_NETWORK ?= weave
3-
KUBE_VERSION ?= 1.14
3+
KUBE_VERSION ?= 1.15
44
KUBE_NETWORK_WEAVE ?= v2.5.2
55
KUBE_NETWORK_CALICO ?= v3.8
66

7-
# ifeq ($(shell uname -s),Darwin)
8-
# KUBE_FORMATS ?= iso-efi
9-
# else
10-
#KUBE_FORMATS ?= iso-bios
11-
# endif
12-
KUBE_FORMATS ?= tar-kernel-initrd
7+
ifeq ($(shell uname -s),Darwin)
8+
KUBE_FORMATS ?= iso-efi
9+
else
10+
KUBE_FORMATS ?= iso-bios
11+
endif
1312

1413
KUBE_FORMAT_ARGS := $(patsubst %,-format %,$(KUBE_FORMATS))
1514

‎pkg/kubelet/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM linuxkit/alpine:08c8d8aa3638d035e18499a74faf50eedb8d6cf6-amd64 AS build
33
# When changing kubernetes_version remember to also update:
44
# - scripts/mk-image-cache-lst and run `make refresh-image-caches` from top-level
55
# - pkg/e2e-test/Dockerfile
6-
ENV kubernetes_version v1.14.4
6+
ENV kubernetes_version v1.15.1
77
ENV cni_version v0.8.1
88
ENV critools_version v1.15.0
99

@@ -123,5 +123,5 @@ FROM scratch
123123
WORKDIR /
124124
ENTRYPOINT ["/usr/bin/kubelet.sh"]
125125
COPY --from=build /out /
126-
COPY --from=docker:18.03.0-ce /usr/local/bin/docker /usr/local/bin/docker
126+
COPY --from=docker:18.06.3-ce /usr/local/bin/docker /usr/local/bin/docker
127127
ENV KUBECONFIG "/etc/kubernetes/admin.conf"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache
1111
FROM scratch
1212
WORKDIR /
1313
COPY --from=build /out /
14-
COPY --from=docker:18.03.0-ce /usr/local/bin/docker /usr/local/bin/docker
14+
COPY --from=docker:18.06.3-ce /usr/local/bin/docker /usr/local/bin/docker
1515
COPY dl/*.tar /images/
1616
ENTRYPOINT [ "/bin/sh", "-c" ]
1717
CMD [ "sleep 10; for image in /images/*.tar ; do docker image load -i $image && rm -f $image ; done" ]

‎pkg/kubernetes-docker-image-cache-common/images.lst

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# autogenerated by:
22
# ./scripts/mk-image-cache-lst common
3-
gcr.io/google_containers/kube-proxy:v1.14.4@sha256:a8d90a206f775e09927af8567b076d7a14caa1a451be16b1cf1933a972e8aad4
3+
gcr.io/google_containers/kube-proxy:v1.15.1@sha256:08186f4897488e96cb098dd8d1d931af9a6ea718bb8737bf44bb76e42075f0ce
44
gcr.io/google_containers/coredns:1.3.1@sha256:02382353821b12c21b062c59184e227e001079bb13ebd01f9d3270ba0fcbf1e4
55
gcr.io/google_containers/pause:3.1@sha256:59eec8837a4d942cc19a52b8c09ea75121acc38114a2c68b98983ce9356b8610

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache
1111
FROM scratch
1212
WORKDIR /
1313
COPY --from=build /out /
14-
COPY --from=docker:18.03.0-ce /usr/local/bin/docker /usr/local/bin/docker
14+
COPY --from=docker:18.06.3-ce /usr/local/bin/docker /usr/local/bin/docker
1515
COPY dl/*.tar /images/
1616
ENTRYPOINT [ "/bin/sh", "-c" ]
1717
CMD [ "sleep 10; for image in /images/*.tar ; do docker image load -i $image && rm -f $image ; done" ]

‎pkg/kubernetes-docker-image-cache-control-plane/images.lst

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# autogenerated by:
22
# ./scripts/mk-image-cache-lst control-plane
3-
gcr.io/google_containers/kube-apiserver:v1.14.4@sha256:be78c5871964d5f7a6716670a3e40fc0815e8a7391b31a60d261b8d40e663e34
4-
gcr.io/google_containers/kube-proxy:v1.14.4@sha256:a8d90a206f775e09927af8567b076d7a14caa1a451be16b1cf1933a972e8aad4
5-
gcr.io/google_containers/kube-controller-manager:v1.14.4@sha256:8c990c920d141979a35d3da73dac38415ba5946ecff48bdf1a4455271090ffaf
6-
gcr.io/google_containers/kube-scheduler:v1.14.4@sha256:5463ae2574811dc07f8c8bf70b8ebce8c021e630d5f176ad0d0bfeebea504d8b
7-
gcr.io/google_containers/etcd:3.3.10-1@sha256:02cd751eef4f7dcea7986e58d51903dab39baf4606f636b50891f30190abce2c
3+
gcr.io/google_containers/kube-apiserver:v1.15.1@sha256:304a1c38707834062ee87df62ef329d52a8b9a3e70459565d0a396479073f54c
4+
gcr.io/google_containers/kube-controller-manager:v1.15.1@sha256:9abae95e428e228fe8f6d1630d55e79e018037460f3731312805c0f37471e4bf
5+
gcr.io/google_containers/kube-scheduler:v1.15.1@sha256:d0ee18a9593013fbc44b1920e4930f29b664b59a3958749763cb33b57e0e8956
6+
gcr.io/google_containers/etcd:3.3.10@sha256:17da501f5d2a675be46040422a27b7cc21b8a43895ac998b171db1c346f361f7

‎scripts/mk-image-cache-lst

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ repo=gcr.io/google_containers
33
# When changing kubernetes_version remember to also update:
44
# - pkg/kubelet/Dockerfile
55
# - pkg/e2e-test/Dockerfile
6-
kubernetes_version=v1.14.4
6+
kubernetes_version=v1.15.1
77
coredns_version=1.3.1
88
pause_version=3.1
9-
etcd_version=3.3.10-1
9+
etcd_version=3.3.10
1010

1111
common="
1212
kube-proxy:$kubernetes_version

‎yml/cri-containerd.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
- name: cri-containerd
3-
image: linuxkit/cri-containerd:74cb328b786d5cada9ddfca0097675b51c7e7d93
3+
image: linuxkit/cri-containerd:f216f883c63b26b48f08af83696d211e7413cca5
44
cgroupsPath: podruntime/cri-containerd
55
files:
66
- path: /etc/kubelet.sh.conf

‎yml/docker-master.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
services:
22
- name: kubernetes-docker-image-cache-control-plane
3-
image: linuxkit/kubernetes-docker-image-cache-control-plane:698faae3de953d7fc0f009360bcfce98497afe76-dirty
3+
image: linuxkit/kubernetes-docker-image-cache-control-plane:139f1a654743704a4878e3406390538008560be6-dirty
44
cgroupsPath: podruntime/control-cache

‎yml/docker.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
- name: docker
3-
image: docker:18.03.0-ce-dind
3+
image: docker:18.06.3-ce-dind
44
capabilities:
55
- all
66
pid: host
@@ -26,7 +26,7 @@ services:
2626
mkdir: ["/var/lib/kubeadm", "/var/lib/cni/conf", "/var/lib/cni/bin", "/var/lib/kubelet-plugins"]
2727
cgroupsPath: podruntime/docker
2828
- name: kubernetes-docker-image-cache-common
29-
image: linuxkit/kubernetes-docker-image-cache-common:2da947148638cbbef869215cdb0e572c0402833c-dirty
29+
image: linuxkit/kubernetes-docker-image-cache-common:2284c229745de46e754ee3d64e9646af51f1cf73-dirty
3030
cgroupsPath: podruntime/common-cache
3131
files:
3232
- path: /etc/kubelet.sh.conf

‎yml/kube.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ services:
3232
image: linuxkit/rngd:v0.7
3333
cgroupsPath: systemreserved/rngd
3434
- name: eudev
35-
image: linuxkit/eudev:83ba66c5e59fa5077c21d42a7ff4f620a8456b1d-dirty
35+
image: linuxkit/eudev:1ca7f912b8d037a5a0bccb2c54c77eaa7fd36f8a
3636
cgroupsPath: systemreserved/eudev
3737
- name: ntpd
3838
image: linuxkit/openntpd:v0.7
@@ -41,12 +41,13 @@ services:
4141
image: linuxkit/sshd:v0.7
4242
cgroupsPath: systemreserved/sshd
4343
- name: kubelet
44-
image: linuxkit/kubelet:0bc50f1bacc8a95e9d0b5e8c089cf295ca7e5bef-dirty
44+
image: linuxkit/kubelet:4c3974d5ffa7de9769e5142056d453dc562481b7-dirty
4545
cgroupsPath: podruntime/kubelet
4646
- name: getty
4747
image: linuxkit/getty:v0.7
4848
env:
4949
- INSECURE=true
50+
cgroupsPath: systemreserved/getty
5051
files:
5152
- path: etc/linuxkit.yml
5253
metadata: yaml

0 commit comments

Comments
 (0)