From 7c046b6206073aa7635093001dd6c1de6887026c Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Sun, 17 Sep 2017 21:43:00 -0700 Subject: [PATCH] *: Fix Terraform fmt and comments --- bare-metal/container-linux/kubernetes/ssh.tf | 3 +-- digital-ocean/container-linux/kubernetes/controllers.tf | 4 ++-- digital-ocean/container-linux/kubernetes/ssh.tf | 2 +- digital-ocean/container-linux/kubernetes/workers.tf | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/bare-metal/container-linux/kubernetes/ssh.tf b/bare-metal/container-linux/kubernetes/ssh.tf index 3d20d349..059b6e92 100644 --- a/bare-metal/container-linux/kubernetes/ssh.tf +++ b/bare-metal/container-linux/kubernetes/ssh.tf @@ -71,8 +71,7 @@ resource "null_resource" "copy-secrets" { resource "null_resource" "bootkube-start" { # 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 - # Kubernetes and Tectonic while no Kubelets are running. Ensure all nodes - # receive a kubeconfig before proceeding with bootkube. + # while no Kubelets are running. depends_on = ["null_resource.copy-secrets"] connection { diff --git a/digital-ocean/container-linux/kubernetes/controllers.tf b/digital-ocean/container-linux/kubernetes/controllers.tf index c0279e03..4a381f6e 100644 --- a/digital-ocean/container-linux/kubernetes/controllers.tf +++ b/digital-ocean/container-linux/kubernetes/controllers.tf @@ -46,8 +46,8 @@ data "template_file" "controller_config" { template = "${file("${path.module}/cl/controller.yaml.tmpl")}" vars = { - k8s_dns_service_ip = "${cidrhost(var.service_cidr, 10)}" - k8s_etcd_service_ip = "${cidrhost(var.service_cidr, 15)}" + k8s_dns_service_ip = "${cidrhost(var.service_cidr, 10)}" + k8s_etcd_service_ip = "${cidrhost(var.service_cidr, 15)}" } } diff --git a/digital-ocean/container-linux/kubernetes/ssh.tf b/digital-ocean/container-linux/kubernetes/ssh.tf index 6e270916..166230b5 100644 --- a/digital-ocean/container-linux/kubernetes/ssh.tf +++ b/digital-ocean/container-linux/kubernetes/ssh.tf @@ -20,7 +20,7 @@ resource "null_resource" "copy-secrets" { ] } } - + # Secure copy bootkube assets to ONE controller and start bootkube to perform # one-time self-hosted cluster bootstrapping. resource "null_resource" "bootkube-start" { diff --git a/digital-ocean/container-linux/kubernetes/workers.tf b/digital-ocean/container-linux/kubernetes/workers.tf index 1f33a418..658a4a01 100644 --- a/digital-ocean/container-linux/kubernetes/workers.tf +++ b/digital-ocean/container-linux/kubernetes/workers.tf @@ -43,8 +43,8 @@ data "template_file" "worker_config" { template = "${file("${path.module}/cl/worker.yaml.tmpl")}" vars = { - k8s_dns_service_ip = "${cidrhost(var.service_cidr, 10)}" - k8s_etcd_service_ip = "${cidrhost(var.service_cidr, 15)}" + k8s_dns_service_ip = "${cidrhost(var.service_cidr, 10)}" + k8s_etcd_service_ip = "${cidrhost(var.service_cidr, 15)}" } }