Skip to content

Commit b99021b

Browse files
committed
upgrade kubernetes to 1.9.6
Signed-off-by: pgayvallet <pierre.gayvallet@gmail.com>
1 parent 9f20b3b commit b99021b

File tree

8 files changed

+12
-12
lines changed

8 files changed

+12
-12
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:8ad3a04b70f1e93e6159143e3792e379a9b0519d 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.4
6+
ENV kubernetes_version v1.9.6
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:8ad3a04b70f1e93e6159143e3792e379a9b0519d 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.4
6+
ENV kubernetes_version v1.9.6
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: 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.9.4@sha256:424a9dfc295f26f9d1e8070836d6fa08c83f22d86e592dfccddc847a85b1ef20
3+
gcr.io/google_containers/kube-proxy-amd64:v1.9.6@sha256:dd647b619b75882f217a21a6e2c473deb77cba1cfb20461da0084ed78d951af1
44
gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.7@sha256:f80f5f9328107dc516d67f7b70054354b9367d31d4946a3bffd3383d83d7efe8
55
gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.7@sha256:f5bddc71efe905f4e4b96f3ca346414be6d733610c1525b98fff808f93966680
66
gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.7@sha256:6cfb9f9c2756979013dbd3074e852c2d8ac99652570c5d17d152e0c0eb3321d6
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.4@sha256:ed117d618b49663e48c0579e447c529c9aaec4bef31c86a3c6f033211f89131b
4-
gcr.io/google_containers/kube-controller-manager-amd64:v1.9.4@sha256:320d64ebfd516bb1548868a1e2440eb8cf9f5573dcb6f1915cc5f64d39412eb1
5-
gcr.io/google_containers/kube-scheduler-amd64:v1.9.4@sha256:9b2a75b415aa34261a3c9041d82693f3285acfc380695b5fef7668bde1d88532
6-
gcr.io/google_containers/etcd-amd64:3.1.10@sha256:28cf78933de29fd26d7a879e51ebd39784cd98109568fd3da61b141257fb85a6
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

scripts/mk-image-cache-lst

Lines changed: 2 additions & 2 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.4
6+
kubernetes_version=v1.9.6
77
kube_dns_version=1.14.7
88
pause_version=3.0
9-
etcd_version=3.1.10
9+
etcd_version=3.1.11
1010

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

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:14734b322d88a8c9495e74a8d414eb9984a28fcb
3+
image: linuxkit/kubernetes-docker-image-cache-control-plane:be74a54ac117d66f7462cecf6ae8edfa13ec34aa
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:3908afb90636922c6b4bcb1e68afe93e57f07881
29+
image: linuxkit/kubernetes-docker-image-cache-common:b58944f17b48e1372b16e4443ddb999c729c84b2
3030
cgroupsPath: podruntime/common-cache
3131
files:
3232
- 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:4f403fe5ae53dc3e45c8f6972dced9dddf900ae6
4141
cgroupsPath: systemreserved/sshd
4242
- name: kubelet
43-
image: linuxkit/kubelet:c8408d29a2b75f8da5631e737fe6897a7a9dc015
43+
image: linuxkit/kubelet:6fe8c9a5182667c6dcb3b43279ce001a156730ea
4444
cgroupsPath: podruntime/kubelet
4545
files:
4646
- path: etc/linuxkit.yml

0 commit comments

Comments
 (0)