From 5f6b0728c53ba6412bc6cbdad6fdd1b1a1764f7b Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Fri, 10 Nov 2017 20:01:37 -0800 Subject: [PATCH] Update bootkube and terraform-render-bootkube to v0.8.2 --- CHANGES.md | 5 +++-- aws/container-linux/kubernetes/bootkube.tf | 2 +- aws/container-linux/kubernetes/cl/controller.yaml.tmpl | 2 +- bare-metal/container-linux/kubernetes/bootkube.tf | 2 +- .../container-linux/kubernetes/cl/controller.yaml.tmpl | 2 +- digital-ocean/container-linux/kubernetes/bootkube.tf | 2 +- .../container-linux/kubernetes/cl/controller.yaml.tmpl | 2 +- docs/aws.md | 2 +- docs/bare-metal.md | 2 +- docs/digital-ocean.md | 2 +- docs/google-cloud.md | 2 +- google-cloud/container-linux/kubernetes/bootkube.tf | 2 +- .../kubernetes/controllers/cl/controller.yaml.tmpl | 2 +- 13 files changed, 15 insertions(+), 14 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 7a71c51d..79136b37 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -5,8 +5,9 @@ Notable changes between versions. ## Latest * Kubernetes v1.8.3 -* All platforms run etcd on-host, across controllers -* AWS platform promoted to beta +* Run etcd on-host, across controllers +* Promote AWS platform to beta +* Use kubernetes-incubator/bootkube v0.8.2 #### Google Cloud diff --git a/aws/container-linux/kubernetes/bootkube.tf b/aws/container-linux/kubernetes/bootkube.tf index 7257b506..1dfe96d2 100644 --- a/aws/container-linux/kubernetes/bootkube.tf +++ b/aws/container-linux/kubernetes/bootkube.tf @@ -1,6 +1,6 @@ # Self-hosted Kubernetes assets (kubeconfig, manifests) module "bootkube" { - source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=4f6af5b811a326dc13f6eb40680dc4dd013f8dd3" + source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=v0.8.2" cluster_name = "${var.cluster_name}" api_servers = ["${format("%s.%s", var.cluster_name, var.dns_zone)}"] diff --git a/aws/container-linux/kubernetes/cl/controller.yaml.tmpl b/aws/container-linux/kubernetes/cl/controller.yaml.tmpl index 6c90e686..2ed123ba 100644 --- a/aws/container-linux/kubernetes/cl/controller.yaml.tmpl +++ b/aws/container-linux/kubernetes/cl/controller.yaml.tmpl @@ -151,7 +151,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.8.1}" + BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.8.2}" BOOTKUBE_ASSETS="$${BOOTKUBE_ASSETS:-/opt/bootkube/assets}" exec /usr/bin/rkt run \ --trust-keys-from-https \ diff --git a/bare-metal/container-linux/kubernetes/bootkube.tf b/bare-metal/container-linux/kubernetes/bootkube.tf index 500ea6a3..01316cf0 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/terraform-render-bootkube.git?ref=4f6af5b811a326dc13f6eb40680dc4dd013f8dd3" + source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=v0.8.2" 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 4b4a6fde..5ec93b99 100644 --- a/bare-metal/container-linux/kubernetes/cl/controller.yaml.tmpl +++ b/bare-metal/container-linux/kubernetes/cl/controller.yaml.tmpl @@ -143,7 +143,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.8.1}" + BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.8.2}" BOOTKUBE_ASSETS="$${BOOTKUBE_ASSETS:-/opt/bootkube/assets}" exec /usr/bin/rkt run \ --trust-keys-from-https \ diff --git a/digital-ocean/container-linux/kubernetes/bootkube.tf b/digital-ocean/container-linux/kubernetes/bootkube.tf index ed3058ef..1f01a890 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/terraform-render-bootkube.git?ref=4f6af5b811a326dc13f6eb40680dc4dd013f8dd3" + source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=v0.8.2" 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 1fa34e05..f118d932 100644 --- a/digital-ocean/container-linux/kubernetes/cl/controller.yaml.tmpl +++ b/digital-ocean/container-linux/kubernetes/cl/controller.yaml.tmpl @@ -142,7 +142,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.8.1}" + BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.8.2}" BOOTKUBE_ASSETS="$${BOOTKUBE_ASSETS:-/opt/bootkube/assets}" exec /usr/bin/rkt run \ --trust-keys-from-https \ diff --git a/docs/aws.md b/docs/aws.md index 1e281c14..c5007735 100644 --- a/docs/aws.md +++ b/docs/aws.md @@ -119,7 +119,7 @@ Get or update Terraform modules. $ terraform get # downloads missing modules $ terraform get --update # updates all modules Get: git::https://github.com/poseidon/typhoon (update) -Get: git::https://github.com/poseidon/bootkube-terraform.git?ref=v0.8.1 (update) +Get: git::https://github.com/poseidon/bootkube-terraform.git?ref=v0.8.2 (update) ``` Plan the resources to be created. diff --git a/docs/bare-metal.md b/docs/bare-metal.md index fd6141dd..8e84c86f 100644 --- a/docs/bare-metal.md +++ b/docs/bare-metal.md @@ -219,7 +219,7 @@ Get or update Terraform modules. $ terraform get # downloads missing modules $ terraform get --update # updates all modules Get: git::https://github.com/poseidon/typhoon (update) -Get: git::https://github.com/poseidon/bootkube-terraform.git?ref=v0.8.1 (update) +Get: git::https://github.com/poseidon/bootkube-terraform.git?ref=v0.8.2 (update) ``` Plan the resources to be created. diff --git a/docs/digital-ocean.md b/docs/digital-ocean.md index 59f124e4..f3de4c66 100644 --- a/docs/digital-ocean.md +++ b/docs/digital-ocean.md @@ -114,7 +114,7 @@ Get or update Terraform modules. $ terraform get # downloads missing modules $ terraform get --update # updates all modules Get: git::https://github.com/poseidon/typhoon (update) -Get: git::https://github.com/poseidon/bootkube-terraform.git?ref=v0.8.1 (update) +Get: git::https://github.com/poseidon/bootkube-terraform.git?ref=v0.8.2 (update) ``` Plan the resources to be created. diff --git a/docs/google-cloud.md b/docs/google-cloud.md index f0f90867..8c2489ed 100644 --- a/docs/google-cloud.md +++ b/docs/google-cloud.md @@ -120,7 +120,7 @@ Get or update Terraform modules. $ terraform get # downloads missing modules $ terraform get --update # updates all modules Get: git::https://github.com/poseidon/typhoon (update) -Get: git::https://github.com/poseidon/bootkube-terraform.git?ref=v0.8.1 (update) +Get: git::https://github.com/poseidon/bootkube-terraform.git?ref=v0.8.2 (update) ``` Plan the resources to be created. diff --git a/google-cloud/container-linux/kubernetes/bootkube.tf b/google-cloud/container-linux/kubernetes/bootkube.tf index 658696b4..796b8c22 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/terraform-render-bootkube.git?ref=4f6af5b811a326dc13f6eb40680dc4dd013f8dd3" + source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=v0.8.2" cluster_name = "${var.cluster_name}" api_servers = ["${format("%s.%s", var.cluster_name, var.dns_zone)}"] diff --git a/google-cloud/container-linux/kubernetes/controllers/cl/controller.yaml.tmpl b/google-cloud/container-linux/kubernetes/controllers/cl/controller.yaml.tmpl index ce2e74d0..bd385a98 100644 --- a/google-cloud/container-linux/kubernetes/controllers/cl/controller.yaml.tmpl +++ b/google-cloud/container-linux/kubernetes/controllers/cl/controller.yaml.tmpl @@ -152,7 +152,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.8.1}" + BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.8.2}" BOOTKUBE_ASSETS="$${BOOTKUBE_ASSETS:-/opt/bootkube/assets}" exec /usr/bin/rkt run \ --trust-keys-from-https \