From dc3ff174ea0b5991ebfb72ac6976976b8734915e Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Wed, 16 Aug 2017 18:28:38 -0700 Subject: [PATCH] Update Kubernetes from v1.7.1 to v1.7.3 --- README.md | 2 +- bare-metal/container-linux/kubernetes/bootkube.tf | 2 +- bare-metal/container-linux/kubernetes/cl/controller.yaml.tmpl | 4 ++-- bare-metal/container-linux/kubernetes/cl/worker.yaml.tmpl | 2 +- .../container-linux/pxe-worker/cl/bootkube-worker.yaml.tmpl | 2 +- digital-ocean/container-linux/kubernetes/bootkube.tf | 2 +- .../container-linux/kubernetes/cl/controller.yaml.tmpl | 4 ++-- digital-ocean/container-linux/kubernetes/cl/worker.yaml.tmpl | 4 ++-- .../container-linux/controllers/cl/controller.yaml.tmpl | 4 ++-- google-cloud/container-linux/kubernetes/bootkube.tf | 2 +- google-cloud/container-linux/workers/cl/worker.yaml.tmpl | 4 ++-- 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 75059002..f1ea2ab5 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Typhoon is [dghubble](https://twitter.com/dghubble)'s personal Kubernetes distri ## Features -* Kubernetes v1.7.1 with self-hosted control plane via [kubernetes-incubator/bootkube](https://github.com/kubernetes-incubator/bootkube) +* Kubernetes v1.7.3 with self-hosted control plane via [kubernetes-incubator/bootkube](https://github.com/kubernetes-incubator/bootkube) * Secure etcd with generated TLS certs, [RBAC](https://kubernetes.io/docs/admin/authorization/rbac/)-enabled, generated admin kubeconfig * Multi-master, workload isolation * Ingress-ready (perhaps include by default) diff --git a/bare-metal/container-linux/kubernetes/bootkube.tf b/bare-metal/container-linux/kubernetes/bootkube.tf index 971ef664..e2566ff5 100644 --- a/bare-metal/container-linux/kubernetes/bootkube.tf +++ b/bare-metal/container-linux/kubernetes/bootkube.tf @@ -1,6 +1,6 @@ # Self-hosted Kubernetes assets (kubeconfig, manifests) module "bootkube" { - source = "git::https://github.com/poseidon/bootkube-terraform.git?ref=v0.6.0" + source = "git::https://github.com/poseidon/bootkube-terraform.git?ref=v0.6.1" cluster_name = "${var.cluster_name}" api_servers = ["${var.k8s_domain_name}"] diff --git a/bare-metal/container-linux/kubernetes/cl/controller.yaml.tmpl b/bare-metal/container-linux/kubernetes/cl/controller.yaml.tmpl index 3055b6e1..aac3fd46 100644 --- a/bare-metal/container-linux/kubernetes/cl/controller.yaml.tmpl +++ b/bare-metal/container-linux/kubernetes/cl/controller.yaml.tmpl @@ -128,7 +128,7 @@ storage: contents: inline: | KUBELET_IMAGE_URL=quay.io/coreos/hyperkube - KUBELET_IMAGE_TAG=v1.7.1_coreos.0 + KUBELET_IMAGE_TAG=v1.7.3_coreos.0 - path: /etc/hostname filesystem: root mode: 0644 @@ -156,7 +156,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.6.0}" + BOOTKUBE_VERSION="${BOOTKUBE_VERSION:-v0.6.1}" BOOTKUBE_ASSETS="${BOOTKUBE_ASSETS:-/opt/bootkube/assets}" exec /usr/bin/rkt run \ --trust-keys-from-https \ diff --git a/bare-metal/container-linux/kubernetes/cl/worker.yaml.tmpl b/bare-metal/container-linux/kubernetes/cl/worker.yaml.tmpl index 94348525..3fc16720 100644 --- a/bare-metal/container-linux/kubernetes/cl/worker.yaml.tmpl +++ b/bare-metal/container-linux/kubernetes/cl/worker.yaml.tmpl @@ -92,7 +92,7 @@ storage: contents: inline: | KUBELET_IMAGE_URL=quay.io/coreos/hyperkube - KUBELET_IMAGE_TAG=v1.7.1_coreos.0 + KUBELET_IMAGE_TAG=v1.7.3_coreos.0 - path: /etc/hostname filesystem: root mode: 0644 diff --git a/bare-metal/container-linux/pxe-worker/cl/bootkube-worker.yaml.tmpl b/bare-metal/container-linux/pxe-worker/cl/bootkube-worker.yaml.tmpl index a1d03087..7847e878 100644 --- a/bare-metal/container-linux/pxe-worker/cl/bootkube-worker.yaml.tmpl +++ b/bare-metal/container-linux/pxe-worker/cl/bootkube-worker.yaml.tmpl @@ -92,7 +92,7 @@ storage: contents: inline: | KUBELET_IMAGE_URL=quay.io/coreos/hyperkube - KUBELET_IMAGE_TAG=v1.7.1_coreos.0 + KUBELET_IMAGE_TAG=v1.7.3_coreos.0 - path: /etc/hostname filesystem: root mode: 0644 diff --git a/digital-ocean/container-linux/kubernetes/bootkube.tf b/digital-ocean/container-linux/kubernetes/bootkube.tf index 92046624..d53b2d70 100644 --- a/digital-ocean/container-linux/kubernetes/bootkube.tf +++ b/digital-ocean/container-linux/kubernetes/bootkube.tf @@ -1,6 +1,6 @@ # Self-hosted Kubernetes assets (kubeconfig, manifests) module "bootkube" { - source = "git::https://github.com/poseidon/bootkube-terraform.git?ref=v0.6.0" + source = "git::https://github.com/poseidon/bootkube-terraform.git?ref=v0.6.1" cluster_name = "${var.cluster_name}" api_servers = ["${format("%s.%s", var.cluster_name, var.dns_zone)}"] diff --git a/digital-ocean/container-linux/kubernetes/cl/controller.yaml.tmpl b/digital-ocean/container-linux/kubernetes/cl/controller.yaml.tmpl index f631d280..8024e200 100644 --- a/digital-ocean/container-linux/kubernetes/cl/controller.yaml.tmpl +++ b/digital-ocean/container-linux/kubernetes/cl/controller.yaml.tmpl @@ -105,7 +105,7 @@ storage: contents: inline: | KUBELET_IMAGE_URL=quay.io/coreos/hyperkube - KUBELET_IMAGE_TAG=v1.7.1_coreos.0 + KUBELET_IMAGE_TAG=v1.7.3_coreos.0 - path: /etc/sysctl.d/max-user-watches.conf filesystem: root contents: @@ -127,7 +127,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.6.0}" + BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.6.1}" BOOTKUBE_ASSETS="$${BOOTKUBE_ASSETS:-/opt/bootkube/assets}" exec /usr/bin/rkt run \ --trust-keys-from-https \ diff --git a/digital-ocean/container-linux/kubernetes/cl/worker.yaml.tmpl b/digital-ocean/container-linux/kubernetes/cl/worker.yaml.tmpl index 5c375f36..5904d201 100644 --- a/digital-ocean/container-linux/kubernetes/cl/worker.yaml.tmpl +++ b/digital-ocean/container-linux/kubernetes/cl/worker.yaml.tmpl @@ -103,7 +103,7 @@ storage: contents: inline: | KUBELET_IMAGE_URL=quay.io/coreos/hyperkube - KUBELET_IMAGE_TAG=v1.7.1_coreos.0 + KUBELET_IMAGE_TAG=v1.7.3_coreos.0 - path: /etc/sysctl.d/max-user-watches.conf filesystem: root contents: @@ -120,7 +120,7 @@ storage: --trust-keys-from-https \ --volume config,kind=host,source=/etc/kubernetes \ --mount volume=config,target=/etc/kubernetes \ - quay.io/coreos/hyperkube:v1.7.1_coreos.0 \ + quay.io/coreos/hyperkube:v1.7.3_coreos.0 \ --net=host \ --dns=host \ --exec=/kubectl -- --kubeconfig=/etc/kubernetes/kubeconfig delete node $(hostname) diff --git a/google-cloud/container-linux/controllers/cl/controller.yaml.tmpl b/google-cloud/container-linux/controllers/cl/controller.yaml.tmpl index 434f94c9..1e04df43 100644 --- a/google-cloud/container-linux/controllers/cl/controller.yaml.tmpl +++ b/google-cloud/container-linux/controllers/cl/controller.yaml.tmpl @@ -101,7 +101,7 @@ storage: contents: inline: | KUBELET_IMAGE_URL=quay.io/coreos/hyperkube - KUBELET_IMAGE_TAG=v1.7.1_coreos.0 + KUBELET_IMAGE_TAG=v1.7.3_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.6.0}" + BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.6.1}" BOOTKUBE_ASSETS="$${BOOTKUBE_ASSETS:-/opt/bootkube/assets}" exec /usr/bin/rkt run \ --trust-keys-from-https \ diff --git a/google-cloud/container-linux/kubernetes/bootkube.tf b/google-cloud/container-linux/kubernetes/bootkube.tf index 92046624..d53b2d70 100644 --- a/google-cloud/container-linux/kubernetes/bootkube.tf +++ b/google-cloud/container-linux/kubernetes/bootkube.tf @@ -1,6 +1,6 @@ # Self-hosted Kubernetes assets (kubeconfig, manifests) module "bootkube" { - source = "git::https://github.com/poseidon/bootkube-terraform.git?ref=v0.6.0" + source = "git::https://github.com/poseidon/bootkube-terraform.git?ref=v0.6.1" cluster_name = "${var.cluster_name}" api_servers = ["${format("%s.%s", var.cluster_name, var.dns_zone)}"] diff --git a/google-cloud/container-linux/workers/cl/worker.yaml.tmpl b/google-cloud/container-linux/workers/cl/worker.yaml.tmpl index 4f278182..0bceb469 100644 --- a/google-cloud/container-linux/workers/cl/worker.yaml.tmpl +++ b/google-cloud/container-linux/workers/cl/worker.yaml.tmpl @@ -99,7 +99,7 @@ storage: contents: inline: | KUBELET_IMAGE_URL=quay.io/coreos/hyperkube - KUBELET_IMAGE_TAG=v1.7.1_coreos.0 + KUBELET_IMAGE_TAG=v1.7.3_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.7.1_coreos.0 \ + quay.io/coreos/hyperkube:v1.7.3_coreos.0 \ --net=host \ --dns=host \ --exec=/kubectl -- --kubeconfig=/etc/kubernetes/kubeconfig delete node $(hostname)