Skip to content

Commit 64a35a3

Browse files
ijcijc
authored
Merge pull request #70 from ijc/kube-v1.10
Update to Kubernetes v1.10
2 parents 218bd59 + a060e62 commit 64a35a3

File tree

10 files changed

+32
-27
lines changed

10 files changed

+32
-27
lines changed

‎pkg/cri-containerd/Dockerfile

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,14 @@ RUN \
1313
&& true
1414
ENV GOPATH=/go PATH=$PATH:/go/bin
1515

16-
ENV CRI_CONTAINERD_URL https://github.com/kubernetes-incubator/cri-containerd.git
16+
ENV CRI_CONTAINERD_URL https://github.com/containerd/cri-containerd.git
1717
#ENV CRI_CONTAINERD_BRANCH pull/NNN/head
18-
ENV CRI_CONTAINERD_COMMIT v1.0.0-beta.1
19-
RUN mkdir -p $GOPATH/src/github.com/kubernetes-incubator && \
20-
cd $GOPATH/src/github.com/kubernetes-incubator && \
18+
# This is the `standalone-cri-containerd` branch, which is at the point right before standalone mode was deleted.
19+
ENV CRI_CONTAINERD_COMMIT 64b098a293831f742aeb3dd3e48a5405990c14c5
20+
RUN mkdir -p $GOPATH/src/github.com/containerd && \
21+
cd $GOPATH/src/github.com/containerd && \
2122
git clone $CRI_CONTAINERD_URL cri-containerd
22-
WORKDIR $GOPATH/src/github.com/kubernetes-incubator/cri-containerd
23+
WORKDIR $GOPATH/src/github.com/containerd/cri-containerd
2324
RUN set -e; \
2425
if [ -n "$CRI_CONTAINERD_BRANCH" ] ; then \
2526
git fetch origin "$CRI_CONTAINERD_BRANCH"; \
@@ -31,7 +32,7 @@ RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
3132
# util-linux because a full ns-enter is required.
3233
# example commands: /usr/bin/nsenter --net= -F -- <ip commandline>
3334
# /usr/bin/nsenter --net=/var/run/netns/cni-5e8acebe-810d-c1b9-ced0-47be2f312fa8 -F -- <ip commandline>
34-
# NB the first ("--net=") is actually not valid -- see https://github.com/kubernetes-incubator/cri-containerd/issues/245
35+
# NB the first ("--net=") is actually not valid -- see https://github.com/containerd/cri/issues/245
3536
RUN apk add --no-cache --initdb -p /out \
3637
alpine-baselayout \
3738
busybox \
@@ -47,5 +48,7 @@ RUN make DESTDIR=/out install
4748

4849
FROM scratch
4950
WORKDIR /
50-
ENTRYPOINT ["cri-containerd", "-v", "2", "--alsologtostderr", "--network-bin-dir", "/opt/cni/bin", "--network-conf-dir", "/etc/cni/net.d"]
51+
# `rootfsPropagation: shared` (used in `build.yml`) appears to be broken at the moment, workaround that issue here.
52+
#ENTRYPOINT ["cri-containerd", "--log-level", "info", "--network-bin-dir", "/opt/cni/bin", "--network-conf-dir", "/etc/cni/net.d"]
53+
ENTRYPOINT ["/bin/sh", "-c", "set -ex; mount --make-shared / && exec cri-containerd --log-level info --network-bin-dir /opt/cni/bin --network-conf-dir /etc/cni/net.d"]
5154
COPY --from=build /out /

‎pkg/kube-e2e-test/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 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/kubelet/Dockerfile
6-
ENV kubernetes_version v1.9.6
6+
ENV kubernetes_version v1.10.0
77

88
RUN apk add -U --no-cache \
99
bash \

‎pkg/kubelet/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 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.9.6
6+
ENV kubernetes_version v1.10.0
77
ENV cni_version v0.7.0
88
ENV critools_version v1.0.0-alpha.0
99

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# autogenerated by:
22
# ./scripts/mk-image-cache-lst common
3-
gcr.io/google_containers/kube-proxy-amd64:v1.9.6@sha256:dd647b619b75882f217a21a6e2c473deb77cba1cfb20461da0084ed78d951af1
4-
gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.7@sha256:f80f5f9328107dc516d67f7b70054354b9367d31d4946a3bffd3383d83d7efe8
5-
gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.7@sha256:f5bddc71efe905f4e4b96f3ca346414be6d733610c1525b98fff808f93966680
6-
gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.7@sha256:6cfb9f9c2756979013dbd3074e852c2d8ac99652570c5d17d152e0c0eb3321d6
7-
gcr.io/google_containers/pause-amd64:3.0@sha256:163ac025575b775d1c0f9bf0bdd0f086883171eb475b5068e7defa4ca9e76516
3+
gcr.io/google_containers/kube-proxy-amd64:v1.10.0@sha256:fc944b06c14cb442916045a630d5e374dfb9c453dfc56d3cb59ac21ea4268875
4+
gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.8@sha256:23df717980b4aa08d2da6c4cfa327f1b730d92ec9cf740959d2d5911830d82fb
5+
gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.8@sha256:6d8e0da4fb46e9ea2034a3f4cab0e095618a2ead78720c12e791342738e5f85d
6+
gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.8@sha256:93c827f018cf3322f1ff2aa80324a0306048b0a69bc274e423071fb0d2d29d8b
7+
gcr.io/google_containers/pause-amd64:3.1@sha256:59eec8837a4d942cc19a52b8c09ea75121acc38114a2c68b98983ce9356b8610

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# autogenerated by:
22
# ./scripts/mk-image-cache-lst control-plane
3-
gcr.io/google_containers/kube-apiserver-amd64:v1.9.6@sha256:1bb16ddef9edd8142125ac2443e36986c051b0df808db907648ac9d68e0d5f23
4-
gcr.io/google_containers/kube-controller-manager-amd64:v1.9.6@sha256:c90d1f38999b96405a997e52392b4db2ac68b6d4ea376e2e99ab528c51b88d22
5-
gcr.io/google_containers/kube-scheduler-amd64:v1.9.6@sha256:0bc20f6ee28be19c4c45f2a5d0282e7ae3e89d61789e7a89182f818b37b67e28
6-
gcr.io/google_containers/etcd-amd64:3.1.11@sha256:54889c08665d241e321ca5ce976b2df0f766794b698d53faf6b7dacb95316680
3+
gcr.io/google_containers/kube-apiserver-amd64:v1.10.0@sha256:8b7a675c6fdda0469e971e5b1f3e902bb71c36396faf506f1511052705a5b0ee
4+
gcr.io/google_containers/kube-controller-manager-amd64:v1.10.0@sha256:ab637b1f4700e0cc83d3ae3c5368919eb8f6199485adcc126fd306481df56fec
5+
gcr.io/google_containers/kube-scheduler-amd64:v1.10.0@sha256:4670717a1c092680dc0ac018dc36f991e06ffbee6b6bafba9a2968d7bebe7800
6+
gcr.io/google_containers/etcd-amd64:3.1.12@sha256:68235934469f3bc58917bcf7018bf0d3b72129e6303b0bef28186d96b2259317

‎scripts/mk-image-cache-lst

Lines changed: 4 additions & 4 deletions
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.9.6
7-
kube_dns_version=1.14.7
8-
pause_version=3.0
9-
etcd_version=3.1.11
6+
kubernetes_version=v1.10.0
7+
kube_dns_version=1.14.8
8+
pause_version=3.1
9+
etcd_version=3.1.12
1010

1111
common="
1212
kube-proxy-amd64:$kubernetes_version

‎yml/cri-containerd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
- name: cri-containerd
3-
image: linuxkit/cri-containerd:c7dfc51dfb34aa4df01beb23069e1cadb0bb1bb7
3+
image: linuxkit/cri-containerd:474d704f6dcb173b10768ab1d1bd61674468c7f9
44
cgroupsPath: podruntime/cri-containerd
55
files:
66
- path: /etc/kubelet.sh.conf

‎yml/docker-master.yml

Lines changed: 1 addition & 1 deletion
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:b1bddee9fd3cfb73fad12408d5ca08136fd77889
3+
image: linuxkit/kubernetes-docker-image-cache-control-plane:e41541ca040a0001e02dd5c8ac40e0ae38110a7a
44
cgroupsPath: podruntime/control-cache

‎yml/docker.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,14 @@ services:
2121
- /var/lib/cni/bin:/opt/cni/bin:rshared,rbind
2222
- /var/lib/kubelet-plugins:/usr/libexec/kubernetes/kubelet-plugins:rshared,rbind
2323
rootfsPropagation: shared
24-
command: ["/usr/local/bin/docker-init", "/usr/local/bin/dockerd"]
24+
# `rootfsPropagation: shared` appears to be broken, workaround that issue here.
25+
#command: ["/usr/local/bin/docker-init", "/usr/local/bin/dockerd"]
26+
command: ["/bin/sh", "-c", "set -ex; mount --make-shared / && exec /usr/local/bin/docker-init /usr/local/bin/dockerd"]
2527
runtime:
2628
mkdir: ["/var/lib/kubeadm", "/var/lib/cni/conf", "/var/lib/cni/bin", "/var/lib/kubelet-plugins"]
2729
cgroupsPath: podruntime/docker
2830
- name: kubernetes-docker-image-cache-common
29-
image: linuxkit/kubernetes-docker-image-cache-common:11e096a191cf68ec047ec74985951d225af18197
31+
image: linuxkit/kubernetes-docker-image-cache-common:a4eb1313407e72fda5789b9ca604997650126539
3032
cgroupsPath: podruntime/common-cache
3133
files:
3234
- path: /etc/kubelet.sh.conf

‎yml/kube.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ services:
4040
image: linuxkit/sshd:39d6bdc9a7489ceffa761ad5cb96c87b50d6732d
4141
cgroupsPath: systemreserved/sshd
4242
- name: kubelet
43-
image: linuxkit/kubelet:7e09d17481ac9dd43617d84d6b1b3af964ded505
43+
image: linuxkit/kubelet:7663c7ad197bf3d401d93d5bc4c0eabfa2e70f77
4444
cgroupsPath: podruntime/kubelet
4545
files:
4646
- path: etc/linuxkit.yml

0 commit comments

Comments
 (0)