From 868265988b41133a39340f1710b1fa112eba5f22 Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Fri, 19 Jan 2018 23:10:45 -0800 Subject: [PATCH] Update bootkube and terraform-render-bootkube to v0.10.0 --- CHANGES.md | 2 ++ aws/container-linux/kubernetes/bootkube.tf | 2 +- aws/container-linux/kubernetes/cl/controller.yaml.tmpl | 2 +- bare-metal/container-linux/kubernetes/bootkube.tf | 2 +- bare-metal/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, 14 insertions(+), 12 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 1644bb1d..5f300677 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -12,8 +12,10 @@ Notable changes between versions. * Retain support for Terraform v0.10.4+ * Add [migration guide](https://github.com/poseidon/typhoon/blob/master/docs/topics/maintenance.md) from Terraform v0.10.x to v0.11.x (**action required!**) * Update etcd from 3.2.13 to 3.2.14 +* Update calico from 2.6.5 to 2.6.6 * Update kube-dns from v1.14.7 to v1.14.8 * Use separate service account for kube-dns +* Use kubernetes-incubator/bootkube v0.10.0 #### Addons diff --git a/aws/container-linux/kubernetes/bootkube.tf b/aws/container-linux/kubernetes/bootkube.tf index 4f4d5b1e..0b748bb3 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=9795894004d84dc2037ad9ebecf399e19421c3a1" + source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=v0.10.0" 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 9afa38cf..2db05e20 100644 --- a/aws/container-linux/kubernetes/cl/controller.yaml.tmpl +++ b/aws/container-linux/kubernetes/cl/controller.yaml.tmpl @@ -150,7 +150,7 @@ storage: # Move experimental manifests [ -n "$(ls /opt/bootkube/assets/manifests-*/* 2>/dev/null)" ] && mv /opt/bootkube/assets/manifests-*/* /opt/bootkube/assets/manifests && rm -rf /opt/bootkube/assets/manifests-* BOOTKUBE_ACI="$${BOOTKUBE_ACI:-quay.io/coreos/bootkube}" - BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.9.1}" + BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.10.0}" 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 d105ad4e..506f28a8 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=9795894004d84dc2037ad9ebecf399e19421c3a1" + source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=v0.10.0" 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 dfcf8ef6..d42eb550 100644 --- a/bare-metal/container-linux/kubernetes/cl/controller.yaml.tmpl +++ b/bare-metal/container-linux/kubernetes/cl/controller.yaml.tmpl @@ -144,7 +144,7 @@ storage: # Move experimental manifests [ -n "$(ls /opt/bootkube/assets/manifests-*/* 2>/dev/null)" ] && mv /opt/bootkube/assets/manifests-*/* /opt/bootkube/assets/manifests && rm -rf /opt/bootkube/assets/manifests-* BOOTKUBE_ACI="$${BOOTKUBE_ACI:-quay.io/coreos/bootkube}" - BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.9.1}" + BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.10.0}" 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 f8957cda..d79a58bb 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=9795894004d84dc2037ad9ebecf399e19421c3a1" + source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=v0.10.0" 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 72725de8..a9921d6c 100644 --- a/digital-ocean/container-linux/kubernetes/cl/controller.yaml.tmpl +++ b/digital-ocean/container-linux/kubernetes/cl/controller.yaml.tmpl @@ -141,7 +141,7 @@ storage: # Move experimental manifests [ -n "$(ls /opt/bootkube/assets/manifests-*/* 2>/dev/null)" ] && mv /opt/bootkube/assets/manifests-*/* /opt/bootkube/assets/manifests && rm -rf /opt/bootkube/assets/manifests-* BOOTKUBE_ACI="$${BOOTKUBE_ACI:-quay.io/coreos/bootkube}" - BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.9.1}" + BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.10.0}" 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 a6e00f6f..f2095177 100644 --- a/docs/aws.md +++ b/docs/aws.md @@ -150,7 +150,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.9.1 (update) +Get: git::https://github.com/poseidon/bootkube-terraform.git?ref=v0.10.0 (update) ``` Plan the resources to be created. diff --git a/docs/bare-metal.md b/docs/bare-metal.md index 5a2cf577..c9e927ca 100644 --- a/docs/bare-metal.md +++ b/docs/bare-metal.md @@ -246,7 +246,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.9.1 (update) +Get: git::https://github.com/poseidon/bootkube-terraform.git?ref=v0.10.0 (update) ``` Plan the resources to be created. diff --git a/docs/digital-ocean.md b/docs/digital-ocean.md index 22e98b2c..120b345f 100644 --- a/docs/digital-ocean.md +++ b/docs/digital-ocean.md @@ -144,7 +144,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.9.1 (update) +Get: git::https://github.com/poseidon/bootkube-terraform.git?ref=v0.10.0 (update) ``` Plan the resources to be created. diff --git a/docs/google-cloud.md b/docs/google-cloud.md index 9c73cf06..57e0f1fa 100644 --- a/docs/google-cloud.md +++ b/docs/google-cloud.md @@ -151,7 +151,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.9.1 (update) +Get: git::https://github.com/poseidon/bootkube-terraform.git?ref=v0.10.0 (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 7b0bd5d9..504c732f 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=9795894004d84dc2037ad9ebecf399e19421c3a1" + source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=v0.10.0" 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 3dc09fd9..ff0a9173 100644 --- a/google-cloud/container-linux/kubernetes/controllers/cl/controller.yaml.tmpl +++ b/google-cloud/container-linux/kubernetes/controllers/cl/controller.yaml.tmpl @@ -151,7 +151,7 @@ storage: # Move experimental manifests [ -n "$(ls /opt/bootkube/assets/manifests-*/* 2>/dev/null)" ] && mv /opt/bootkube/assets/manifests-*/* /opt/bootkube/assets/manifests && rm -rf /opt/bootkube/assets/manifests-* BOOTKUBE_ACI="$${BOOTKUBE_ACI:-quay.io/coreos/bootkube}" - BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.9.1}" + BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.10.0}" BOOTKUBE_ASSETS="$${BOOTKUBE_ASSETS:-/opt/bootkube/assets}" exec /usr/bin/rkt run \ --trust-keys-from-https \