CadolesKube/typhoon
7
0
Fork 0
mirror of https://github.com/puppetmaster/typhoon.git synced 2025-07-16 14:11:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dalton Hubble
2017-12-01 22:27:48 -08:00
parent 5308fde3d3
commit 5f5eec1175
13 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -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.2}"
BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.9.0}"
BOOTKUBE_ASSETS="$${BOOTKUBE_ASSETS:-/opt/bootkube/assets}"
exec /usr/bin/rkt run \
--trust-keys-from-https \