CadolesKube
/
typhoon
mirror of https://github.com/puppetmaster/typhoon.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update bootkube and terraform-render-bootkube to v0.9.1

This commit is contained in:
Dalton Hubble 2017-12-15 01:45:02 -08:00
parent 63f5a26a72
commit 495e33e213
13 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.md
View File

@ -11,6 +11,7 @@ Notable changes between versions.
* Older clusters (with CLUO addon) auto-update node's Container Linux version * Older clusters (with CLUO addon) auto-update node's Container Linux version
and will begin using Docker 17.09. and will begin using Docker 17.09.
* Fix race where `etcd-member.service` could fail to resolve peers ([#69](https://github.com/poseidon/typhoon/pull/69)) * Fix race where `etcd-member.service` could fail to resolve peers ([#69](https://github.com/poseidon/typhoon/pull/69))
* Use kubernetes-incubator/bootkube v0.9.1
#### Bare-Metal #### Bare-Metal

2
aws/container-linux/kubernetes/bootkube.tf
View File

@ -1,6 +1,6 @@
# Self-hosted Kubernetes assets (kubeconfig, manifests) # Self-hosted Kubernetes assets (kubeconfig, manifests)
module "bootkube" { module "bootkube" {
source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=533e82f833c166297abd249ac3d4853d6ebed364" source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=v0.9.1"
cluster_name = "${var.cluster_name}" cluster_name = "${var.cluster_name}"
api_servers = ["${format("%s.%s", var.cluster_name, var.dns_zone)}"] api_servers = ["${format("%s.%s", var.cluster_name, var.dns_zone)}"]

2
aws/container-linux/kubernetes/cl/controller.yaml.tmpl
View File

@ -150,7 +150,7 @@ storage:
# Move experimental manifests # 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-* [ -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_ACI="$${BOOTKUBE_ACI:-quay.io/coreos/bootkube}"
BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.9.0}" BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.9.1}"
BOOTKUBE_ASSETS="$${BOOTKUBE_ASSETS:-/opt/bootkube/assets}" BOOTKUBE_ASSETS="$${BOOTKUBE_ASSETS:-/opt/bootkube/assets}"
exec /usr/bin/rkt run \ exec /usr/bin/rkt run \
--trust-keys-from-https \ --trust-keys-from-https \

2
bare-metal/container-linux/kubernetes/bootkube.tf
View File

@ -1,6 +1,6 @@
# Self-hosted Kubernetes assets (kubeconfig, manifests) # Self-hosted Kubernetes assets (kubeconfig, manifests)
module "bootkube" { module "bootkube" {
source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=533e82f833c166297abd249ac3d4853d6ebed364" source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=v0.9.1"
cluster_name = "${var.cluster_name}" cluster_name = "${var.cluster_name}"
api_servers = ["${var.k8s_domain_name}"] api_servers = ["${var.k8s_domain_name}"]

2
bare-metal/container-linux/kubernetes/cl/controller.yaml.tmpl
View File

@ -144,7 +144,7 @@ storage:
# Move experimental manifests # 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-* [ -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_ACI="$${BOOTKUBE_ACI:-quay.io/coreos/bootkube}"
BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.9.0}" BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.9.1}"
BOOTKUBE_ASSETS="$${BOOTKUBE_ASSETS:-/opt/bootkube/assets}" BOOTKUBE_ASSETS="$${BOOTKUBE_ASSETS:-/opt/bootkube/assets}"
exec /usr/bin/rkt run \ exec /usr/bin/rkt run \
--trust-keys-from-https \ --trust-keys-from-https \

2
digital-ocean/container-linux/kubernetes/bootkube.tf
View File

@ -1,6 +1,6 @@
# Self-hosted Kubernetes assets (kubeconfig, manifests) # Self-hosted Kubernetes assets (kubeconfig, manifests)
module "bootkube" { module "bootkube" {
source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=533e82f833c166297abd249ac3d4853d6ebed364" source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=v0.9.1"
cluster_name = "${var.cluster_name}" cluster_name = "${var.cluster_name}"
api_servers = ["${format("%s.%s", var.cluster_name, var.dns_zone)}"] api_servers = ["${format("%s.%s", var.cluster_name, var.dns_zone)}"]

2
digital-ocean/container-linux/kubernetes/cl/controller.yaml.tmpl
View File

@ -141,7 +141,7 @@ storage:
# Move experimental manifests # 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-* [ -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_ACI="$${BOOTKUBE_ACI:-quay.io/coreos/bootkube}"
BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.9.0}" BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.9.1}"
BOOTKUBE_ASSETS="$${BOOTKUBE_ASSETS:-/opt/bootkube/assets}" BOOTKUBE_ASSETS="$${BOOTKUBE_ASSETS:-/opt/bootkube/assets}"
exec /usr/bin/rkt run \ exec /usr/bin/rkt run \
--trust-keys-from-https \ --trust-keys-from-https \

2
docs/aws.md
View File

@ -119,7 +119,7 @@ Get or update Terraform modules.
$ terraform get # downloads missing modules $ terraform get # downloads missing modules
$ terraform get --update # updates all modules $ terraform get --update # updates all modules
Get: git::https://github.com/poseidon/typhoon (update) Get: git::https://github.com/poseidon/typhoon (update)
Get: git::https://github.com/poseidon/bootkube-terraform.git?ref=v0.9.0 (update) Get: git::https://github.com/poseidon/bootkube-terraform.git?ref=v0.9.1 (update)
``` ```
Plan the resources to be created. Plan the resources to be created.

2
docs/bare-metal.md
View File

@ -219,7 +219,7 @@ Get or update Terraform modules.
$ terraform get # downloads missing modules $ terraform get # downloads missing modules
$ terraform get --update # updates all modules $ terraform get --update # updates all modules
Get: git::https://github.com/poseidon/typhoon (update) Get: git::https://github.com/poseidon/typhoon (update)
Get: git::https://github.com/poseidon/bootkube-terraform.git?ref=v0.9.0 (update) Get: git::https://github.com/poseidon/bootkube-terraform.git?ref=v0.9.1 (update)
``` ```
Plan the resources to be created. Plan the resources to be created.

2
docs/digital-ocean.md
View File

@ -114,7 +114,7 @@ Get or update Terraform modules.
$ terraform get # downloads missing modules $ terraform get # downloads missing modules
$ terraform get --update # updates all modules $ terraform get --update # updates all modules
Get: git::https://github.com/poseidon/typhoon (update) Get: git::https://github.com/poseidon/typhoon (update)
Get: git::https://github.com/poseidon/bootkube-terraform.git?ref=v0.9.0 (update) Get: git::https://github.com/poseidon/bootkube-terraform.git?ref=v0.9.1 (update)
``` ```
Plan the resources to be created. Plan the resources to be created.

2
docs/google-cloud.md
View File

@ -120,7 +120,7 @@ Get or update Terraform modules.
$ terraform get # downloads missing modules $ terraform get # downloads missing modules
$ terraform get --update # updates all modules $ terraform get --update # updates all modules
Get: git::https://github.com/poseidon/typhoon (update) Get: git::https://github.com/poseidon/typhoon (update)
Get: git::https://github.com/poseidon/bootkube-terraform.git?ref=v0.9.0 (update) Get: git::https://github.com/poseidon/bootkube-terraform.git?ref=v0.9.1 (update)
``` ```
Plan the resources to be created. Plan the resources to be created.

2
google-cloud/container-linux/kubernetes/bootkube.tf
View File

@ -1,6 +1,6 @@
# Self-hosted Kubernetes assets (kubeconfig, manifests) # Self-hosted Kubernetes assets (kubeconfig, manifests)
module "bootkube" { module "bootkube" {
source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=533e82f833c166297abd249ac3d4853d6ebed364" source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=v0.9.1"
cluster_name = "${var.cluster_name}" cluster_name = "${var.cluster_name}"
api_servers = ["${format("%s.%s", var.cluster_name, var.dns_zone)}"] api_servers = ["${format("%s.%s", var.cluster_name, var.dns_zone)}"]

2
google-cloud/container-linux/kubernetes/controllers/cl/controller.yaml.tmpl
View File

@ -151,7 +151,7 @@ storage:
# Move experimental manifests # 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-* [ -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_ACI="$${BOOTKUBE_ACI:-quay.io/coreos/bootkube}"
BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.9.0}" BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.9.1}"
BOOTKUBE_ASSETS="$${BOOTKUBE_ASSETS:-/opt/bootkube/assets}" BOOTKUBE_ASSETS="$${BOOTKUBE_ASSETS:-/opt/bootkube/assets}"
exec /usr/bin/rkt run \ exec /usr/bin/rkt run \
--trust-keys-from-https \ --trust-keys-from-https \