Merge pull request #66 from ijc/version-bumps

ijc · web-flow · commit 9f20b3bdc610 · 2018-03-13T11:33:08.000Z
Version bumps
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 KUBE_RUNTIME ?= docker
 KUBE_NETWORK ?= weave
 
-KUBE_NETWORK_WEAVE ?= v2.1.3
+KUBE_NETWORK_WEAVE ?= v2.2.1
 
 ifeq ($(shell uname -s),Darwin)
 KUBE_FORMATS ?= iso-efi
diff --git a/pkg/cri-containerd/Dockerfile b/pkg/cri-containerd/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS build
+FROM linuxkit/alpine:8ad3a04b70f1e93e6159143e3792e379a9b0519d AS build
 
 RUN \
   apk add \
diff --git a/pkg/kube-e2e-test/Dockerfile b/pkg/kube-e2e-test/Dockerfile
@@ -1,9 +1,9 @@
-FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS build
+FROM linuxkit/alpine:8ad3a04b70f1e93e6159143e3792e379a9b0519d AS build
 
 # When changing kubernetes_version remember to also update:
 # - scripts/mk-image-cache-lst and run `make refresh-image-caches` from top-level
 # - pkg/kubelet/Dockerfile
-ENV kubernetes_version v1.9.2
+ENV kubernetes_version v1.9.4
 
 RUN apk add -U --no-cache \
   bash \
diff --git a/pkg/kubelet/Dockerfile b/pkg/kubelet/Dockerfile
@@ -1,9 +1,9 @@
-FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS build
+FROM linuxkit/alpine:8ad3a04b70f1e93e6159143e3792e379a9b0519d AS build
 
 # When changing kubernetes_version remember to also update:
 # - scripts/mk-image-cache-lst and run `make refresh-image-caches` from top-level
 # - pkg/e2e-test/Dockerfile
-ENV kubernetes_version v1.9.2
+ENV kubernetes_version v1.9.4
 ENV cni_version        v0.7.0
 ENV critools_version   v1.0.0-alpha.0
 
diff --git a/pkg/kubernetes-docker-image-cache-common/Dockerfile b/pkg/kubernetes-docker-image-cache-common/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS build
+FROM linuxkit/alpine:8ad3a04b70f1e93e6159143e3792e379a9b0519d AS build
 
 RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
 RUN apk add --no-cache --initdb -p /out \
diff --git a/pkg/kubernetes-docker-image-cache-common/images.lst b/pkg/kubernetes-docker-image-cache-common/images.lst
@@ -1,6 +1,6 @@
 # autogenerated by:
 #    ./scripts/mk-image-cache-lst common
-gcr.io/google_containers/kube-proxy-amd64:v1.9.2@sha256:fe00a6c576afba09255438f5ff01eff6d63ee302294c5450cb19b38404ef62ac
+gcr.io/google_containers/kube-proxy-amd64:v1.9.4@sha256:424a9dfc295f26f9d1e8070836d6fa08c83f22d86e592dfccddc847a85b1ef20
 gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.7@sha256:f80f5f9328107dc516d67f7b70054354b9367d31d4946a3bffd3383d83d7efe8
 gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.7@sha256:f5bddc71efe905f4e4b96f3ca346414be6d733610c1525b98fff808f93966680
 gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.7@sha256:6cfb9f9c2756979013dbd3074e852c2d8ac99652570c5d17d152e0c0eb3321d6
diff --git a/pkg/kubernetes-docker-image-cache-control-plane/Dockerfile b/pkg/kubernetes-docker-image-cache-control-plane/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS build
+FROM linuxkit/alpine:8ad3a04b70f1e93e6159143e3792e379a9b0519d AS build
 
 RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
 RUN apk add --no-cache --initdb -p /out \
diff --git a/pkg/kubernetes-docker-image-cache-control-plane/images.lst b/pkg/kubernetes-docker-image-cache-control-plane/images.lst
@@ -1,6 +1,6 @@
 # autogenerated by:
 #    ./scripts/mk-image-cache-lst control-plane
-gcr.io/google_containers/kube-apiserver-amd64:v1.9.2@sha256:eec4329de0892f4a960b7f1202272f93880d3071a9b40d8407585125b37d527d
-gcr.io/google_containers/kube-controller-manager-amd64:v1.9.2@sha256:10daf65c6e8d0ff032323931f3869cd30af23feab90345265ea405b6104a41c7
-gcr.io/google_containers/kube-scheduler-amd64:v1.9.2@sha256:082520e24e697f3228046ca13cddf46e4e01ae2982685b4ccc7df8f8e9145abc
+gcr.io/google_containers/kube-apiserver-amd64:v1.9.4@sha256:ed117d618b49663e48c0579e447c529c9aaec4bef31c86a3c6f033211f89131b
+gcr.io/google_containers/kube-controller-manager-amd64:v1.9.4@sha256:320d64ebfd516bb1548868a1e2440eb8cf9f5573dcb6f1915cc5f64d39412eb1
+gcr.io/google_containers/kube-scheduler-amd64:v1.9.4@sha256:9b2a75b415aa34261a3c9041d82693f3285acfc380695b5fef7668bde1d88532
 gcr.io/google_containers/etcd-amd64:3.1.10@sha256:28cf78933de29fd26d7a879e51ebd39784cd98109568fd3da61b141257fb85a6
diff --git a/scripts/mk-image-cache-lst b/scripts/mk-image-cache-lst
@@ -3,7 +3,7 @@ repo=gcr.io/google_containers
 # When changing kubernetes_version remember to also update:
 # - pkg/kubelet/Dockerfile
 # - pkg/e2e-test/Dockerfile
-kubernetes_version=v1.9.2
+kubernetes_version=v1.9.4
 kube_dns_version=1.14.7
 pause_version=3.0
 etcd_version=3.1.10
diff --git a/yml/cri-containerd.yml b/yml/cri-containerd.yml
@@ -1,6 +1,6 @@
 services:
   - name: cri-containerd
-    image: linuxkit/cri-containerd:3916819944f841f77d73bc622ccdddf1c5ff99e9
+    image: linuxkit/cri-containerd:eb290524e5ed4d7b821615f7580db4a76ebc7918
     cgroupsPath: podruntime/cri-containerd
 files:
   - path: /etc/kubelet.sh.conf
diff --git a/yml/docker-master.yml b/yml/docker-master.yml
@@ -1,4 +1,4 @@
 services:
   - name: kubernetes-docker-image-cache-control-plane
-    image: linuxkit/kubernetes-docker-image-cache-control-plane:003bc342571352ecdf16f720f841cc923b2e32f0
+    image: linuxkit/kubernetes-docker-image-cache-control-plane:14734b322d88a8c9495e74a8d414eb9984a28fcb
     cgroupsPath: podruntime/control-cache
diff --git a/yml/docker.yml b/yml/docker.yml
@@ -26,7 +26,7 @@ services:
       mkdir: ["/var/lib/kubeadm", "/var/lib/cni/conf", "/var/lib/cni/bin", "/var/lib/kubelet-plugins"]
     cgroupsPath: podruntime/docker
   - name: kubernetes-docker-image-cache-common
-    image: linuxkit/kubernetes-docker-image-cache-common:32f09de29fa8c517e14d8d733f79e467ab5eaf7d
+    image: linuxkit/kubernetes-docker-image-cache-common:3908afb90636922c6b4bcb1e68afe93e57f07881
     cgroupsPath: podruntime/common-cache
 files:
   - path: /etc/kubelet.sh.conf
diff --git a/yml/kube.yml b/yml/kube.yml
@@ -1,10 +1,10 @@
 kernel:
-  image: linuxkit/kernel:4.9.78
+  image: linuxkit/kernel:4.14.26
   cmdline: "console=tty0 console=ttyS0"
 init:
-  - linuxkit/init:ce4cea7dd517063f84d9f3dc597995a5a9fa50c7
-  - linuxkit/runc:c3002ef23a6e1bfa911b3b3ff85e67143ec6eb16
-  - linuxkit/containerd:bcadd1231a1c4f337f14e8d11d5cba06f77e8453
+  - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a
+  - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731
+  - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0
   - linuxkit/ca-certificates:0a188e40108b6ece8c2aefdfaaad94acc84368ce
 onboot:
   - name: sysctl
@@ -40,7 +40,7 @@ services:
     image: linuxkit/sshd:4f403fe5ae53dc3e45c8f6972dced9dddf900ae6
     cgroupsPath: systemreserved/sshd
   - name: kubelet
-    image: linuxkit/kubelet:496c57f6b7d7fbea671823aa17e5d5c80ab23501
+    image: linuxkit/kubelet:c8408d29a2b75f8da5631e737fe6897a7a9dc015
     cgroupsPath: podruntime/kubelet
 files:
   - path: etc/linuxkit.yml

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS build`
	`1`	`+FROM linuxkit/alpine:8ad3a04b70f1e93e6159143e3792e379a9b0519d AS build`
`2`	`2`
`3`	`3`	`RUN \`
`4`	`4`	`apk add \`