Skip to content

Commit 35d27cf

Browse files
author
Ian Campbell
committed
Commit: 692067d58 Merge pull request #2958 from rn/kern-up Signed-off-by: Ian Campbell <ijc@docker.com>
1 parent 03ee24f commit 35d27cf

File tree

9 files changed

+13
-13
lines changed

9 files changed

+13
-13
lines changed

pkg/cri-containerd/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS build
1+
FROM linuxkit/alpine:8ad3a04b70f1e93e6159143e3792e379a9b0519d AS build
22

33
RUN \
44
apk add \

pkg/kube-e2e-test/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS build
1+
FROM linuxkit/alpine:8ad3a04b70f1e93e6159143e3792e379a9b0519d AS build
22

33
# When changing kubernetes_version remember to also update:
44
# - scripts/mk-image-cache-lst and run `make refresh-image-caches` from top-level

pkg/kubelet/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS build
1+
FROM linuxkit/alpine:8ad3a04b70f1e93e6159143e3792e379a9b0519d AS build
22

33
# When changing kubernetes_version remember to also update:
44
# - scripts/mk-image-cache-lst and run `make refresh-image-caches` from top-level

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS build
1+
FROM linuxkit/alpine:8ad3a04b70f1e93e6159143e3792e379a9b0519d AS build
22

33
RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
44
RUN apk add --no-cache --initdb -p /out \

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS build
1+
FROM linuxkit/alpine:8ad3a04b70f1e93e6159143e3792e379a9b0519d AS build
22

33
RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
44
RUN apk add --no-cache --initdb -p /out \

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:3916819944f841f77d73bc622ccdddf1c5ff99e9
3+
image: linuxkit/cri-containerd:eb290524e5ed4d7b821615f7580db4a76ebc7918
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:003bc342571352ecdf16f720f841cc923b2e32f0
3+
image: linuxkit/kubernetes-docker-image-cache-control-plane:e9b73b212de44fceddd65c4099089efa7f159086
44
cgroupsPath: podruntime/control-cache

yml/docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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:32f09de29fa8c517e14d8d733f79e467ab5eaf7d
29+
image: linuxkit/kubernetes-docker-image-cache-common:d9f18cd86668c6ca249d328057f2e8a202554af4
3030
cgroupsPath: podruntime/common-cache
3131
files:
3232
- path: /etc/kubelet.sh.conf

yml/kube.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
kernel:
2-
image: linuxkit/kernel:4.9.78
2+
image: linuxkit/kernel:4.14.26
33
cmdline: "console=tty0 console=ttyS0"
44
init:
5-
- linuxkit/init:ce4cea7dd517063f84d9f3dc597995a5a9fa50c7
6-
- linuxkit/runc:c3002ef23a6e1bfa911b3b3ff85e67143ec6eb16
7-
- linuxkit/containerd:bcadd1231a1c4f337f14e8d11d5cba06f77e8453
5+
- linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a
6+
- linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731
7+
- linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0
88
- linuxkit/ca-certificates:0a188e40108b6ece8c2aefdfaaad94acc84368ce
99
onboot:
1010
- name: sysctl
@@ -40,7 +40,7 @@ services:
4040
image: linuxkit/sshd:4f403fe5ae53dc3e45c8f6972dced9dddf900ae6
4141
cgroupsPath: systemreserved/sshd
4242
- name: kubelet
43-
image: linuxkit/kubelet:496c57f6b7d7fbea671823aa17e5d5c80ab23501
43+
image: linuxkit/kubelet:97e8b1abb106d67f9944722cfaad807b9566b63e
4444
cgroupsPath: podruntime/kubelet
4545
files:
4646
- path: etc/linuxkit.yml

0 commit comments

Comments
 (0)