Merge pull request #2522 from ijc/kubernetes

Bump kuberrnetes versions

projects/kubernetes/cri-containerd.yml

@@ -1,6 +1,6 @@
 services:
   - name: cri-containerd
-    image: linuxkitprojects/cri-containerd:b8b6a48426c2165055534b06fb0119f07e24506a
+    image: linuxkitprojects/cri-containerd:4d159d37996954dfdc78a6d07a324fd872a019d5
 files:
   - path: /etc/kubelet.conf
     contents: |

projects/kubernetes/cri-containerd/Dockerfile

@@ -13,7 +13,7 @@ ENV GOPATH=/go PATH=$PATH:/go/bin
 
 ENV CRI_CONTAINERD_URL https://github.com/kubernetes-incubator/cri-containerd.git
 #ENV CRI_CONTAINERD_BRANCH pull/NNN/head
-ENV CRI_CONTAINERD_COMMIT a8d49402859167a232b094d971e70c2f4b71b8ea
+ENV CRI_CONTAINERD_COMMIT 437131299b805de9d1431300d8054af61fa54a26
 RUN mkdir -p $GOPATH/src/github.com/kubernetes-incubator && \
     cd $GOPATH/src/github.com/kubernetes-incubator && \
     git clone $CRI_CONTAINERD_URL cri-containerd

projects/kubernetes/docker-master.yml

@@ -1,3 +1,3 @@
 services:
   - name: kubernetes-image-cache-control-plane
-    image: linuxkitprojects/kubernetes-image-cache-control-plane:0d818c5b1a7a0a0aa52c2a52e23de784d7fd5e25
+    image: linuxkitprojects/kubernetes-image-cache-control-plane:465c8781efd6664c9a744eb78bf5b90d6ce5db3e

projects/kubernetes/docker.yml

@@ -21,7 +21,7 @@ services:
     runtime:
       mkdir: ["/var/lib/kubeadm", "/var/lib/cni/etc", "/var/lib/cni/opt"]
   - name: kubernetes-image-cache-common
-    image: linuxkitprojects/kubernetes-image-cache-common:0d818c5b1a7a0a0aa52c2a52e23de784d7fd5e25
+    image: linuxkitprojects/kubernetes-image-cache-common:465c8781efd6664c9a744eb78bf5b90d6ce5db3e
 files:
   - path: /etc/kubelet.conf
     contents: ""

projects/kubernetes/image-cache/Makefile

@@ -1,17 +1,6 @@
 default: push
 
-COMMON_IMAGES := \
-  kube-proxy-amd64\:v1.7.4@sha256\:5373a1c294c9ffb2e842d74d3df8fcc5bed68c02af3fb3611c2fd71a411a68fe \
-  k8s-dns-sidecar-amd64\:1.14.4@sha256\:97074c951046e37d3cbb98b82ae85ed15704a290cce66a8314e7f846404edde9 \
-  k8s-dns-kube-dns-amd64\:1.14.4@sha256\:40790881bbe9ef4ae4ff7fe8b892498eecb7fe6dcc22661402f271e03f7de344 \
-  k8s-dns-dnsmasq-nanny-amd64\:1.14.4@sha256\:aeeb994acbc505eabc7415187cd9edb38cbb5364dc1c2fc748154576464b3dc2 \
-  pause-amd64\:3.0@sha256\:163ac025575b775d1c0f9bf0bdd0f086883171eb475b5068e7defa4ca9e76516
-
-CONTROL_PLANE_IMAGES := \
-  kube-apiserver-amd64\:v1.7.4@sha256\:f880371b4cee1a810d7caf4c8a2c0b8fa169879545b06a537e4ea6bcdfbbe1f6 \
-  kube-controller-manager-amd64\:v1.7.4@sha256\:7e31b7f71a8c1904c8b38c1681666ef551d0598fbbb4142522b05074ae0c9fd1 \
-  kube-scheduler-amd64\:v1.7.4@sha256\:3712116f370e21938e6a55e0f73dc02a4a6f4830a33304127105ed89451ee527 \
-  etcd-amd64\:3.0.17@sha256\:d83d3545e06fb035db8512e33bd44afb55dea007a3abd7b17742d3ac6d235940
+include versions.mk
 
 dl/%.tar:
 	mkdir -p $(dir $@)
@@ -25,17 +14,19 @@ dl/%.tar:
 	ln $(IMAGES) $${builddir} ; \
 	$(MAKE) -f Makefile.pkg BUILDDIR=$${builddir} CACHE=$(CACHE) $*
 
-.PHONY: tag-common push-common show-tag-common
-tag-common push-common show-tag-common: %-common: $(patsubst %,dl/%.tar,$(COMMON_IMAGES))
+.PHONY: tag-common forcetag-common push-common forcepush-common show-tag-common
+tag-common forcetag-common push-common forcepush-common show-tag-common: %-common: $(patsubst %,dl/%.tar,$(COMMON_IMAGES))
 	@$(MAKE) CACHE=common IMAGES="$^" $*-pkg
 
-.PHONY: tag-control-plane push-control-plane show-tag-control-plane
-tag-control-plane push-control-plane show-tag-control-plane: %-control-plane: $(patsubst %,dl/%.tar,$(CONTROL_PLANE_IMAGES))
+.PHONY: tag-control-plane forcetag-control-plane push-control-plane forcepush-control-plane show-tag-control-plane
+tag-control-plane forcetag-control-plane push-control-plane forcepush-control-plane show-tag-control-plane: %-control-plane: $(patsubst %,dl/%.tar,$(CONTROL_PLANE_IMAGES))
 	@$(MAKE) CACHE=control-plane IMAGES="$^" $*-pkg
 
 .PHONY: tag push show-tags
 tag: tag-common tag-control-plane
+forcetag: forcetag-common forcetag-control-plane
 push: push-common push-control-plane
+forcepush: forcepush-common forcepush-control-plane
 show-tags: show-tag-common show-tag-control-plane
 
 .PHONY: dl
@@ -44,3 +35,7 @@ dl: $(patsubst %,dl/%.tar,$(COMMON_IMAGES) $(CONTROL_PLANE_IMAGES))
 .PHONY: clean
 clean:
 	rm -rf dl
+
+.PHONY: refresh
+refresh:
+	./mkversions > versions.mk

projects/kubernetes/image-cache/mkversions

@@ -0,0 +1,45 @@
+#!/bin/sh
+repo=gcr.io/google_containers
+kube_version=v1.7.6
+kube_dns_version=1.14.4
+pause_version=3.0
+etcd_version=3.0.17
+
+common="
+	kube-proxy-amd64:$kube_version
+	k8s-dns-sidecar-amd64:$kube_dns_version
+	k8s-dns-kube-dns-amd64:$kube_dns_version
+	k8s-dns-dnsmasq-nanny-amd64:$kube_dns_version
+	pause-amd64:$pause_version"
+
+control="
+	kube-apiserver-amd64:$kube_version
+	kube-controller-manager-amd64:$kube_version
+	kube-scheduler-amd64:$kube_version
+	etcd-amd64:$etcd_version"
+
+for i in $common $control ; do
+	docker image pull "$repo/$i" 1>&2
+done
+
+oi() {
+	local i="$1"
+	digest=$(docker image inspect --format '{{index .RepoDigests 0}}' "$repo/$i")
+	i=$(echo "${i}@${digest#*@}" | sed -e 's/:/\\:/g')
+	echo " \\"
+	echo -n "  ${i}"
+}
+
+rm -f $t
+echo "# autogenerated by mkversions"
+echo -n "COMMON_IMAGES :="
+for i in $common ; do
+	oi "$i"
+done
+echo ""
+echo ""
+echo -n "CONTROL_PLANE_IMAGES :="
+for i in $control ; do
+	oi "$i"
+done
+echo ""

projects/kubernetes/image-cache/versions.mk

@@ -0,0 +1,13 @@
+# autogenerated by mkversions
+COMMON_IMAGES := \
+  kube-proxy-amd64\:v1.7.6@sha256\:1509f2fc8a60501d604d21d983ed6f5d0ea40ccdd7cc6ba6c994389ef7db16d8 \
+  k8s-dns-sidecar-amd64\:1.14.4@sha256\:97074c951046e37d3cbb98b82ae85ed15704a290cce66a8314e7f846404edde9 \
+  k8s-dns-kube-dns-amd64\:1.14.4@sha256\:40790881bbe9ef4ae4ff7fe8b892498eecb7fe6dcc22661402f271e03f7de344 \
+  k8s-dns-dnsmasq-nanny-amd64\:1.14.4@sha256\:aeeb994acbc505eabc7415187cd9edb38cbb5364dc1c2fc748154576464b3dc2 \
+  pause-amd64\:3.0@sha256\:163ac025575b775d1c0f9bf0bdd0f086883171eb475b5068e7defa4ca9e76516
+
+CONTROL_PLANE_IMAGES := \
+  kube-apiserver-amd64\:v1.7.6@sha256\:f3a208d30314a89952cf613e5ee671f9d2ed7b197cd6c5d91bebfe02571d7e1b \
+  kube-controller-manager-amd64\:v1.7.6@sha256\:42a42e8d39fd68de7c1db6844f909bfa6bff89019ecef86e6c542354cf8ab9fb \
+  kube-scheduler-amd64\:v1.7.6@sha256\:334a38ac844be07599f74876f6c923271bbd0aab48a43e7ca1ad4942e9ebdabd \
+  etcd-amd64\:3.0.17@sha256\:d83d3545e06fb035db8512e33bd44afb55dea007a3abd7b17742d3ac6d235940

projects/kubernetes/kube.yml

@@ -36,7 +36,7 @@ services:
   - name: sshd
     image: linuxkit/sshd:505a985d7bd7a90f15eca9cb4dc6ec92789d51a0
   - name: kubelet
-    image: linuxkitprojects/kubernetes:b73aacdfaad2167f7b193d9b68f7e52186eb188a
+    image: linuxkitprojects/kubernetes:8f3f75005ce56b8588b669ce5d7b02c5d705bbd4
 files:
   - path: etc/linuxkit.yml
     metadata: yaml

projects/kubernetes/kubernetes/Dockerfile

@@ -1,8 +1,8 @@
 FROM linuxkit/alpine:a120ad6aead3fe583eaa20e9b75a05ac1b3487da AS build
 
-ENV kubernetes_version v1.7.4
-ENV weave_version      v2.0.1
-ENV cni_version        v0.5.2
+ENV kubernetes_version v1.7.6
+ENV weave_version      v2.0.4
+ENV cni_version        v0.6.0
 
 ENV kube_release_artefacts "https://dl.k8s.io/${kubernetes_version}/bin/linux/amd64"
 
@@ -30,7 +30,7 @@ RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache
 
 RUN rmdir /out/var/run && ln -nfs /run /out/var/run
 
-RUN curl -fSL -o /out/root/cni.tgz https://github.com/containernetworking/cni/releases/download/v0.5.2/cni-amd64-${cni_version}.tgz
+RUN curl -fSL -o /out/root/cni.tgz https://github.com/containernetworking/plugins/releases/download/${cni_version}/cni-plugins-amd64-${cni_version}.tgz
 RUN curl -fSL -o /out/etc/weave.yaml https://cloud.weave.works/k8s/v1.7/net?v=${weave_version} 
 RUN curl -fSL -o /out/usr/bin/kubelet https://dl.k8s.io/${kubernetes_version}/bin/linux/amd64/kubelet && chmod 0755 /out/usr/bin/kubelet
 RUN curl -fSL -o /out/usr/bin/kubeadm https://dl.k8s.io/${kubernetes_version}/bin/linux/amd64/kubeadm && chmod 0755 /out/usr/bin/kubeadm