From d5bcb62419f8a9f633cdd9e258f6038fcc00a021 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Tue, 25 Jul 2017 14:09:00 +0100 Subject: [PATCH] kubernetes: Bump to 1.6.7 and other updates Bumps kubernetes and associated tools and images to v1.6.7 (from v1.6.1). Updates weave from v1.9.4 to v2.0.1 Updates cni from a snapshot to v0.5.2. Note that the download location has changed and the tarball no longer includes the `bin` subdirectory, so adjust build to compensate. Signed-off-by: Ian Campbell --- projects/kubernetes/image-cache/Makefile | 14 +++++++------- projects/kubernetes/kubernetes/Dockerfile | 15 ++++++++------- projects/kubernetes/kubernetes/kubeadm-init.sh | 2 +- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/projects/kubernetes/image-cache/Makefile b/projects/kubernetes/image-cache/Makefile index 3f2c459af..ae1985f2a 100644 --- a/projects/kubernetes/image-cache/Makefile +++ b/projects/kubernetes/image-cache/Makefile @@ -1,16 +1,16 @@ default: push COMMON_IMAGES := \ - kube-proxy-amd64\:v1.6.1@sha256\:243f2120171330a26c2418a4367fb0f3cc3e92683b00d16e3cf8c7f92e25bf14 \ - k8s-dns-sidecar-amd64\:1.14.1@sha256\:d33a91a5d65c223f410891001cd379ac734d036429e033865d700a4176e944b0 \ - k8s-dns-kube-dns-amd64\:1.14.1@sha256\:33914315e600dfb756e550828307dfa2b21fb6db24fe3fe495e33d1022f9245d \ - k8s-dns-dnsmasq-nanny-amd64\:1.14.1@sha256\:89c9a1d3cfbf370a9c1a949f39f92c1dc2dbe8c3e6cc1802b7f2b48e4dfe9a9e \ + kube-proxy-amd64\:v1.6.7@sha256\:652ca0ef7cdf05341fafb590ced1b737126641829c70f5d23f9b714bc61c8607 \ + k8s-dns-sidecar-amd64\:1.14.4@sha256\:d33a91a5d65c223f410891001cd379ac734d036429e033865d700a4176e944b0 \ + k8s-dns-kube-dns-amd64\:1.14.4@sha256\:33914315e600dfb756e550828307dfa2b21fb6db24fe3fe495e33d1022f9245d \ + k8s-dns-dnsmasq-nanny-amd64\:1.14.4@sha256\:89c9a1d3cfbf370a9c1a949f39f92c1dc2dbe8c3e6cc1802b7f2b48e4dfe9a9e \ pause-amd64\:3.0@sha256\:163ac025575b775d1c0f9bf0bdd0f086883171eb475b5068e7defa4ca9e76516 CONTROL_PLANE_IMAGES := \ - kube-apiserver-amd64\:v1.6.1@sha256\:d4387dff51b1f9c94cd1cfac3a4694347970b90e911159ac6fe2d090c96a6184 \ - kube-controller-manager-amd64\:v1.6.1@sha256\:4bb17ede2e012898169d988facd08d5039d2dcb31532661d4dcdeb161d097d69 \ - kube-scheduler-amd64\:v1.6.1@sha256\:d3e661bf7bcfb10753e32e1a41615e60fbcddff63232f914e9326a2d1665ce33 \ + kube-apiserver-amd64\:v1.6.7@sha256\:57e482529b95d32730d1bcd2e374199f27eab4abcf1ff49c5db2a7a7e2231cc8 \ + kube-controller-manager-amd64\:v1.6.7@sha256\:884f609895fa715d66806681a6bf6f9851a911202ad3484b768fead8b7c78b39 \ + kube-scheduler-amd64\:v1.6.7@sha256\:a1a498a0ca5ab23c228724d93c3f3d9457b31a046d9025471d98e1096422452c \ etcd-amd64\:3.0.17@sha256\:d83d3545e06fb035db8512e33bd44afb55dea007a3abd7b17742d3ac6d235940 dl/%.tar: diff --git a/projects/kubernetes/kubernetes/Dockerfile b/projects/kubernetes/kubernetes/Dockerfile index 6a39d6910..911372f9b 100644 --- a/projects/kubernetes/kubernetes/Dockerfile +++ b/projects/kubernetes/kubernetes/Dockerfile @@ -2,9 +2,9 @@ # XXX needs ebtables ethtool iproute2 libc6-compat socat FROM alpine:3.6 AS build -ENV kubernetes_version v1.6.1 -ENV weave_version v1.9.4 -ENV cni_version 0799f5732f2a11b329d9e3d51b9c8f2e3759f2ff +ENV kubernetes_version v1.6.7 +ENV weave_version v2.0.1 +ENV cni_version v0.5.2 ENV kube_release_artefacts "https://dl.k8s.io/${kubernetes_version}/bin/linux/amd64" @@ -30,16 +30,17 @@ RUN apk add --no-cache --initdb -p /out \ # Remove apk residuals. We have a read-only rootfs, so apk is of no use. RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache -RUN curl -fSL -o /tmp/cni.tgz https://dl.k8s.io/network-plugins/cni-amd64-${cni_version}.tar.gz && \ - mkdir -p /out/opt/cni /out/etc/cni/net.d && \ - tar -xzf /tmp/cni.tgz -C /out/opt/cni +RUN curl -fSL -o /tmp/cni.tgz https://github.com/containernetworking/cni/releases/download/v0.5.2/cni-amd64-${cni_version}.tgz && \ + mkdir -p /out/opt/cni/bin /out/etc/cni/net.d && \ + tar -xzf /tmp/cni.tgz -C /out/opt/cni/bin RUN curl -fSL -o /out/etc/weave.yaml https://cloud.weave.works/k8s/v1.6/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 RUN curl -fSL -o /out/usr/bin/kubectl https://dl.k8s.io/${kubernetes_version}/bin/linux/amd64/kubectl && chmod 0755 /out/usr/bin/kubectl ADD kubelet.sh /out/usr/bin/kubelet.sh -ADD kubeadm-init.sh /out/usr/bin/kubeadm-init.sh +ADD kubeadm-init.sh /kubeadm-init.sh +RUN sed -e "s/@KUBERNETES_VERSION@/${kubernetes_version}/g" /out/usr/bin/kubeadm-init.sh && chmod +x /out/usr/bin/kubeadm-init.sh FROM scratch WORKDIR / diff --git a/projects/kubernetes/kubernetes/kubeadm-init.sh b/projects/kubernetes/kubernetes/kubeadm-init.sh index 5e953229d..1229dae64 100755 --- a/projects/kubernetes/kubernetes/kubeadm-init.sh +++ b/projects/kubernetes/kubernetes/kubeadm-init.sh @@ -1,4 +1,4 @@ #!/bin/sh set -e -kubeadm init --skip-preflight-checks --kubernetes-version v1.6.1 +kubeadm init --skip-preflight-checks --kubernetes-version @KUBERNETES_VERSION@ kubectl create -n kube-system -f /etc/weave.yaml