From 75f4826097564db69b3695aad08a70688c11f6ba Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Mon, 24 Jul 2017 18:51:39 -0700 Subject: [PATCH] Update Kubernetes from v1.6.7 to v1.7.1 --- gce-bootkube-controller/cl/bootkube-controller.yaml.tmpl | 4 ++-- gce-bootkube-worker/cl/bootkube-worker.yaml.tmpl | 4 ++-- gce-bootkube/bootkube.tf | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gce-bootkube-controller/cl/bootkube-controller.yaml.tmpl b/gce-bootkube-controller/cl/bootkube-controller.yaml.tmpl index 2605e6a9..434f94c9 100644 --- a/gce-bootkube-controller/cl/bootkube-controller.yaml.tmpl +++ b/gce-bootkube-controller/cl/bootkube-controller.yaml.tmpl @@ -101,7 +101,7 @@ storage: contents: inline: | KUBELET_IMAGE_URL=quay.io/coreos/hyperkube - KUBELET_IMAGE_TAG=v1.6.7_coreos.0 + KUBELET_IMAGE_TAG=v1.7.1_coreos.0 - path: /etc/sysctl.d/max-user-watches.conf filesystem: root contents: @@ -123,7 +123,7 @@ storage: [ -d /opt/bootkube/assets/experimental/manifests ] && mv /opt/bootkube/assets/experimental/manifests/* /opt/bootkube/assets/manifests && rm -r /opt/bootkube/assets/experimental/manifests [ -d /opt/bootkube/assets/experimental/bootstrap-manifests ] && mv /opt/bootkube/assets/experimental/bootstrap-manifests/* /opt/bootkube/assets/bootstrap-manifests && rm -r /opt/bootkube/assets/experimental/bootstrap-manifests BOOTKUBE_ACI="$${BOOTKUBE_ACI:-quay.io/coreos/bootkube}" - BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.5.1}" + BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.6.0}" BOOTKUBE_ASSETS="$${BOOTKUBE_ASSETS:-/opt/bootkube/assets}" exec /usr/bin/rkt run \ --trust-keys-from-https \ diff --git a/gce-bootkube-worker/cl/bootkube-worker.yaml.tmpl b/gce-bootkube-worker/cl/bootkube-worker.yaml.tmpl index a8f57e74..4f278182 100644 --- a/gce-bootkube-worker/cl/bootkube-worker.yaml.tmpl +++ b/gce-bootkube-worker/cl/bootkube-worker.yaml.tmpl @@ -99,7 +99,7 @@ storage: contents: inline: | KUBELET_IMAGE_URL=quay.io/coreos/hyperkube - KUBELET_IMAGE_TAG=v1.6.7_coreos.0 + KUBELET_IMAGE_TAG=v1.7.1_coreos.0 - path: /etc/sysctl.d/max-user-watches.conf filesystem: root contents: @@ -116,7 +116,7 @@ storage: --trust-keys-from-https \ --volume config,kind=host,source=/etc/kubernetes \ --mount volume=config,target=/etc/kubernetes \ - quay.io/coreos/hyperkube:v1.6.7_coreos.0 \ + quay.io/coreos/hyperkube:v1.7.1_coreos.0 \ --net=host \ --dns=host \ --exec=/kubectl -- --kubeconfig=/etc/kubernetes/kubeconfig delete node $(hostname) diff --git a/gce-bootkube/bootkube.tf b/gce-bootkube/bootkube.tf index c6d2c4fe..fd959a0c 100644 --- a/gce-bootkube/bootkube.tf +++ b/gce-bootkube/bootkube.tf @@ -1,6 +1,6 @@ # Self-hosted Kubernetes assets (kubeconfig, manifests) module "bootkube" { - source = "git::https://github.com/dghubble/bootkube-terraform.git?ref=v0.5.1" + source = "git::https://github.com/dghubble/bootkube-terraform.git?ref=v0.6.0" cluster_name = "${var.cluster_name}" api_servers = ["${var.k8s_domain_name}"]