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

*: Fix Terraform fmt and comments

This commit is contained in:
Dalton Hubble 2017-09-17 21:43:00 -07:00
parent d8e4ac172a
commit 7c046b6206
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bare-metal/container-linux/kubernetes/ssh.tf
View File

@ -71,8 +71,7 @@ resource "null_resource" "copy-secrets" {
resource "null_resource" "bootkube-start" { resource "null_resource" "bootkube-start" {
# Without depends_on, this remote-exec may start before the kubeconfig copy. # Without depends_on, this remote-exec may start before the kubeconfig copy.
# Terraform only does one task at a time, so it would try to bootstrap # Terraform only does one task at a time, so it would try to bootstrap
# Kubernetes and Tectonic while no Kubelets are running. Ensure all nodes # while no Kubelets are running.
# receive a kubeconfig before proceeding with bootkube.
depends_on = ["null_resource.copy-secrets"] depends_on = ["null_resource.copy-secrets"]
connection { connection {

4
digital-ocean/container-linux/kubernetes/controllers.tf
View File

@ -46,8 +46,8 @@ data "template_file" "controller_config" {
template = "${file("${path.module}/cl/controller.yaml.tmpl")}" template = "${file("${path.module}/cl/controller.yaml.tmpl")}"
vars = { vars = {
k8s_dns_service_ip = "${cidrhost(var.service_cidr, 10)}" k8s_dns_service_ip = "${cidrhost(var.service_cidr, 10)}"
k8s_etcd_service_ip = "${cidrhost(var.service_cidr, 15)}" k8s_etcd_service_ip = "${cidrhost(var.service_cidr, 15)}"
} }
} }

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

@ -20,7 +20,7 @@ resource "null_resource" "copy-secrets" {
] ]
} }
} }
# Secure copy bootkube assets to ONE controller and start bootkube to perform # Secure copy bootkube assets to ONE controller and start bootkube to perform
# one-time self-hosted cluster bootstrapping. # one-time self-hosted cluster bootstrapping.
resource "null_resource" "bootkube-start" { resource "null_resource" "bootkube-start" {

4
digital-ocean/container-linux/kubernetes/workers.tf
View File

@ -43,8 +43,8 @@ data "template_file" "worker_config" {
template = "${file("${path.module}/cl/worker.yaml.tmpl")}" template = "${file("${path.module}/cl/worker.yaml.tmpl")}"
vars = { vars = {
k8s_dns_service_ip = "${cidrhost(var.service_cidr, 10)}" k8s_dns_service_ip = "${cidrhost(var.service_cidr, 10)}"
k8s_etcd_service_ip = "${cidrhost(var.service_cidr, 15)}" k8s_etcd_service_ip = "${cidrhost(var.service_cidr, 15)}"
} }
} }