From 50ddffb1a5e7461367216421ec7ea60329ec1ec0 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Tue, 19 Sep 2017 10:57:57 +0100 Subject: [PATCH] kubernetes: Autogenerate file with image cache digests Signed-off-by: Ian Campbell --- projects/kubernetes/image-cache/Makefile | 4 ++ projects/kubernetes/image-cache/mkversions | 45 +++++++++++++++++++++ projects/kubernetes/image-cache/versions.mk | 1 + 3 files changed, 50 insertions(+) create mode 100755 projects/kubernetes/image-cache/mkversions diff --git a/projects/kubernetes/image-cache/Makefile b/projects/kubernetes/image-cache/Makefile index f698aa9ca..10ace6084 100644 --- a/projects/kubernetes/image-cache/Makefile +++ b/projects/kubernetes/image-cache/Makefile @@ -33,3 +33,7 @@ dl: $(patsubst %,dl/%.tar,$(COMMON_IMAGES) $(CONTROL_PLANE_IMAGES)) .PHONY: clean clean: rm -rf dl + +.PHONY: refresh +refresh: + ./mkversions > versions.mk diff --git a/projects/kubernetes/image-cache/mkversions b/projects/kubernetes/image-cache/mkversions new file mode 100755 index 000000000..ab53dc8d5 --- /dev/null +++ b/projects/kubernetes/image-cache/mkversions @@ -0,0 +1,45 @@ +#!/bin/sh +repo=gcr.io/google_containers +kube_version=v1.7.4 +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 "$repo/$i" | jq -r '.[].RepoDigests[0]') + 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 "" diff --git a/projects/kubernetes/image-cache/versions.mk b/projects/kubernetes/image-cache/versions.mk index 9774c7226..1c3a6e0e9 100644 --- a/projects/kubernetes/image-cache/versions.mk +++ b/projects/kubernetes/image-cache/versions.mk @@ -1,3 +1,4 @@ +# autogenerated by mkversions COMMON_IMAGES := \ kube-proxy-amd64\:v1.7.4@sha256\:5373a1c294c9ffb2e842d74d3df8fcc5bed68c02af3fb3611c2fd71a411a68fe \ k8s-dns-sidecar-amd64\:1.14.4@sha256\:97074c951046e37d3cbb98b82ae85ed15704a290cce66a8314e7f846404edde9 \