From f85208c74a8b6547b17cfaa3f21718b42b8dfd1a Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Mon, 2 Oct 2017 12:28:49 +0100 Subject: [PATCH] kubernetes: Bump to v1.8.0 Signed-off-by: Ian Campbell --- projects/kubernetes/Makefile | 2 +- projects/kubernetes/image-cache/mkversions | 2 +- projects/kubernetes/image-cache/versions.mk | 8 ++++---- projects/kubernetes/kubernetes/Dockerfile | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/projects/kubernetes/Makefile b/projects/kubernetes/Makefile index a17d706a2..70dff6d93 100644 --- a/projects/kubernetes/Makefile +++ b/projects/kubernetes/Makefile @@ -29,7 +29,7 @@ network.yaml: $(NETWORK).yaml ln -nf $< $@ weave-%.yaml: - curl -L -o $@ https://cloud.weave.works/k8s/v1.7/net?v=$* + curl -L -o $@ https://cloud.weave.works/k8s/v1.8/net?v=$* clean: rm -f -r \ diff --git a/projects/kubernetes/image-cache/mkversions b/projects/kubernetes/image-cache/mkversions index 62b2a47e5..5361dd3ec 100755 --- a/projects/kubernetes/image-cache/mkversions +++ b/projects/kubernetes/image-cache/mkversions @@ -1,6 +1,6 @@ #!/bin/sh repo=gcr.io/google_containers -kube_version=v1.7.6 +kube_version=v1.8.0 kube_dns_version=1.14.4 pause_version=3.0 etcd_version=3.0.17 diff --git a/projects/kubernetes/image-cache/versions.mk b/projects/kubernetes/image-cache/versions.mk index 02c6b0ea7..929d93b4d 100644 --- a/projects/kubernetes/image-cache/versions.mk +++ b/projects/kubernetes/image-cache/versions.mk @@ -1,13 +1,13 @@ # autogenerated by mkversions COMMON_IMAGES := \ - kube-proxy-amd64\:v1.7.6@sha256\:1509f2fc8a60501d604d21d983ed6f5d0ea40ccdd7cc6ba6c994389ef7db16d8 \ + kube-proxy-amd64\:v1.8.0@sha256\:3da0e03a49404119fbf104037b7ac24d871842bf565a4364390a7d6ea60f48a0 \ 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 \ + kube-apiserver-amd64\:v1.8.0@sha256\:e7377096f0b88b0fcc5dce1c56aed002f999f095a30676c68b8f686a6bb1e943 \ + kube-controller-manager-amd64\:v1.8.0@sha256\:9b1ae1007d3d0f4272e7ad5e8a6d34a1f49c2e3a33339773864aed525a667d26 \ + kube-scheduler-amd64\:v1.8.0@sha256\:79b5b697b1bc1023b5f18a792ea7020c4ad8403d861169b1b420d3fe673b9fe4 \ etcd-amd64\:3.0.17@sha256\:d83d3545e06fb035db8512e33bd44afb55dea007a3abd7b17742d3ac6d235940 diff --git a/projects/kubernetes/kubernetes/Dockerfile b/projects/kubernetes/kubernetes/Dockerfile index af4da42b9..770cf12cc 100644 --- a/projects/kubernetes/kubernetes/Dockerfile +++ b/projects/kubernetes/kubernetes/Dockerfile @@ -1,6 +1,6 @@ FROM linuxkit/alpine:28254e4530703db4caa6b0199a025c30a987dfa1 AS build -ENV kubernetes_version v1.7.6 +ENV kubernetes_version v1.8.0 ENV cni_version v0.6.0 RUN apk add -U --no-cache \