From 878f5a3647af3a29059876d68844f15089908eb1 Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Sat, 28 Oct 2017 12:50:37 -0700 Subject: [PATCH] Bump bootkube and terraform-render-bootkube to v0.8.1 * Use the v0.8.1 tagged terraform-render-bootkube module * Use the v0.8.1 quay.io/coreos/bootkube image to bootstrap --- CHANGES.md | 1 + 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, 13 insertions(+), 12 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 889b7ace..d2cf096a 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -12,6 +12,7 @@ Notable changes between versions. * Update flannel from v0.8.0 to v0.9.0 * Add `hairpinMode` to flannel CNI config * Add `--no-negcache` to kube-dns dnsmasq +* Use kubernetes-incubator/bootkube v0.8.1 ## v1.8.1 diff --git a/aws/container-linux/kubernetes/bootkube.tf b/aws/container-linux/kubernetes/bootkube.tf index 6d9d3334..aca04af4 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=b6b320ef6aceb7b72802b3aea6da6690d6a7c509" + source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=v0.8.1" 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 4ea56df4..c68f81d7 100644 --- a/aws/container-linux/kubernetes/cl/controller.yaml.tmpl +++ b/aws/container-linux/kubernetes/cl/controller.yaml.tmpl @@ -129,7 +129,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.0}" + BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.8.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/bootkube.tf b/bare-metal/container-linux/kubernetes/bootkube.tf index 0519e10e..a2e39aa8 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=b6b320ef6aceb7b72802b3aea6da6690d6a7c509" + source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=v0.8.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 4877bbf6..41f5cf76 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: [ -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.0}" + BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.8.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/bootkube.tf b/digital-ocean/container-linux/kubernetes/bootkube.tf index 40d3ca89..e4cad9f3 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=b6b320ef6aceb7b72802b3aea6da6690d6a7c509" + source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=v0.8.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 ebe073ef..3ad19b2b 100644 --- a/digital-ocean/container-linux/kubernetes/cl/controller.yaml.tmpl +++ b/digital-ocean/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.0}" + BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.8.1}" 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 f8e189b0..976e9db3 100644 --- a/docs/aws.md +++ b/docs/aws.md @@ -125,7 +125,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.0 (update) +Get: git::https://github.com/poseidon/bootkube-terraform.git?ref=v0.8.1 (update) ``` Plan the resources to be created. diff --git a/docs/bare-metal.md b/docs/bare-metal.md index d5eba5e2..9a13a049 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.0 (update) +Get: git::https://github.com/poseidon/bootkube-terraform.git?ref=v0.8.1 (update) ``` Plan the resources to be created. diff --git a/docs/digital-ocean.md b/docs/digital-ocean.md index cb5e1394..dabb9496 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.0 (update) +Get: git::https://github.com/poseidon/bootkube-terraform.git?ref=v0.8.1 (update) ``` Plan the resources to be created. diff --git a/docs/google-cloud.md b/docs/google-cloud.md index ad22b59e..12779da5 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.0 (update) +Get: git::https://github.com/poseidon/bootkube-terraform.git?ref=v0.8.1 (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 ee5e13e9..8736f828 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=b6b320ef6aceb7b72802b3aea6da6690d6a7c509" + source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=v0.8.1" 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 5c721814..79fb9846 100644 --- a/google-cloud/container-linux/kubernetes/controllers/cl/controller.yaml.tmpl +++ b/google-cloud/container-linux/kubernetes/controllers/cl/controller.yaml.tmpl @@ -130,7 +130,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.0}" + BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.8.1}" BOOTKUBE_ASSETS="$${BOOTKUBE_ASSETS:-/opt/bootkube/assets}" exec /usr/bin/rkt run \ --trust-keys-from-https \