Skip to content

Commit e3eee66

Browse files
Merge pull request #82 from ijc/kube-1.10.3
Update to Kube v1.10.3
2 parents c272e1c + dba4460 commit e3eee66

File tree

8 files changed

+10
-10
lines changed

8 files changed

+10
-10
lines changed

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.10.0
6+
ENV kubernetes_version v1.10.3
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.10.0
6+
ENV kubernetes_version v1.10.3
77
ENV cni_version v0.7.1
88
ENV critools_version v1.0.0-alpha.0
99

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# autogenerated by:
22
# ./scripts/mk-image-cache-lst common
3-
gcr.io/google_containers/kube-proxy-amd64:v1.10.0@sha256:fc944b06c14cb442916045a630d5e374dfb9c453dfc56d3cb59ac21ea4268875
3+
gcr.io/google_containers/kube-proxy-amd64:v1.10.3@sha256:568df575bb2e630abfd4a4754a23a8af7b13c3f4a526796af01021eda3ff7a30
44
gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.8@sha256:23df717980b4aa08d2da6c4cfa327f1b730d92ec9cf740959d2d5911830d82fb
55
gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.8@sha256:6d8e0da4fb46e9ea2034a3f4cab0e095618a2ead78720c12e791342738e5f85d
66
gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.8@sha256:93c827f018cf3322f1ff2aa80324a0306048b0a69bc274e423071fb0d2d29d8b
Lines changed: 3 additions & 3 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.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
3+
gcr.io/google_containers/kube-apiserver-amd64:v1.10.3@sha256:a6c4b6b2429d0a15d30a546226e01b1164118e022ad40f3ece2f95126f1580f5
4+
gcr.io/google_containers/kube-controller-manager-amd64:v1.10.3@sha256:98a3a7dc4c6c60dbeb0273302d697edaa89bd10fceed87ad5144c0b0acc5cced
5+
gcr.io/google_containers/kube-scheduler-amd64:v1.10.3@sha256:4770e1f1eef2229138e45a2b813c927e971da9c40256a7e2321ccf825af56916
66
gcr.io/google_containers/etcd-amd64:3.1.12@sha256:68235934469f3bc58917bcf7018bf0d3b72129e6303b0bef28186d96b2259317

scripts/mk-image-cache-lst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ 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.10.0
6+
kubernetes_version=v1.10.3
77
kube_dns_version=1.14.8
88
pause_version=3.1
99
etcd_version=3.1.12

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:e41541ca040a0001e02dd5c8ac40e0ae38110a7a
3+
image: linuxkit/kubernetes-docker-image-cache-control-plane:68e9977b724c06a3007baf510246bb0a05cee44d
44
cgroupsPath: podruntime/control-cache

yml/docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ services:
2828
mkdir: ["/var/lib/kubeadm", "/var/lib/cni/conf", "/var/lib/cni/bin", "/var/lib/kubelet-plugins"]
2929
cgroupsPath: podruntime/docker
3030
- name: kubernetes-docker-image-cache-common
31-
image: linuxkit/kubernetes-docker-image-cache-common:a4eb1313407e72fda5789b9ca604997650126539
31+
image: linuxkit/kubernetes-docker-image-cache-common:667cc12b3b636959cfaf59ab769e1b0fa6987814
3232
cgroupsPath: podruntime/common-cache
3333
files:
3434
- 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:ddd2e094e44aae9bab3eb3b8d378d2383d6cda01
43+
image: linuxkit/kubelet:38bea97a5600bd442dc49ab453a71b3b8018b6d5
4444
cgroupsPath: podruntime/kubelet
4545
files:
4646
- path: etc/linuxkit.yml

0 commit comments

Comments
 (0)