From 8e7e6b9f7f9eca4fca8c5c6e4d9c9fdbf0115294 Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Sun, 11 Mar 2018 14:46:05 -0700 Subject: [PATCH] Normalize Terraform configs with terraform fmt --- aws/container-linux/kubernetes/outputs.tf | 6 ++--- aws/container-linux/kubernetes/workers.tf | 22 +++++++++---------- .../kubernetes/workers/variables.tf | 8 +++---- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/aws/container-linux/kubernetes/outputs.tf b/aws/container-linux/kubernetes/outputs.tf index b126dd92..1d5e3535 100644 --- a/aws/container-linux/kubernetes/outputs.tf +++ b/aws/container-linux/kubernetes/outputs.tf @@ -6,17 +6,17 @@ output "ingress_dns_name" { # Outputs for worker pools output "vpc_id" { - value = "${aws_vpc.network.id}" + value = "${aws_vpc.network.id}" description = "ID of the VPC for creating worker instances" } output "subnet_ids" { - value = ["${aws_subnet.public.*.id}"] + value = ["${aws_subnet.public.*.id}"] description = "List of subnet IDs for creating worker instances" } output "worker_security_groups" { - value = ["${aws_security_group.worker.id}"] + value = ["${aws_security_group.worker.id}"] description = "List of worker security group IDs" } diff --git a/aws/container-linux/kubernetes/workers.tf b/aws/container-linux/kubernetes/workers.tf index 6515b994..4add5b46 100644 --- a/aws/container-linux/kubernetes/workers.tf +++ b/aws/container-linux/kubernetes/workers.tf @@ -1,19 +1,19 @@ module "workers" { source = "workers" - name = "${var.cluster_name}" - + name = "${var.cluster_name}" + # AWS - vpc_id = "${aws_vpc.network.id}" - subnet_ids = ["${aws_subnet.public.*.id}"] + vpc_id = "${aws_vpc.network.id}" + subnet_ids = ["${aws_subnet.public.*.id}"] security_groups = ["${aws_security_group.worker.id}"] - count = "${var.worker_count}" - instance_type = "${var.worker_type}" - os_channel = "${var.os_channel}" - disk_size = "${var.disk_size}" + count = "${var.worker_count}" + instance_type = "${var.worker_type}" + os_channel = "${var.os_channel}" + disk_size = "${var.disk_size}" # configuration - kubeconfig = "${module.bootkube.kubeconfig}" - ssh_authorized_key = "${var.ssh_authorized_key}" - service_cidr = "${var.service_cidr}" + kubeconfig = "${module.bootkube.kubeconfig}" + ssh_authorized_key = "${var.ssh_authorized_key}" + service_cidr = "${var.service_cidr}" cluster_domain_suffix = "${var.cluster_domain_suffix}" } diff --git a/aws/container-linux/kubernetes/workers/variables.tf b/aws/container-linux/kubernetes/workers/variables.tf index 4f73a33d..93f00704 100644 --- a/aws/container-linux/kubernetes/workers/variables.tf +++ b/aws/container-linux/kubernetes/workers/variables.tf @@ -4,17 +4,17 @@ variable "name" { } variable "vpc_id" { - type = "string" + type = "string" description = "ID of the VPC for creating instances" } variable "subnet_ids" { - type = "list" + type = "list" description = "List of subnet IDs for creating instances" } variable "security_groups" { - type = "list" + type = "list" description = "List of security group IDs" } @@ -47,7 +47,7 @@ variable "disk_size" { # configuration variable "kubeconfig" { - type = "string" + type = "string" description = "Generated Kubelet kubeconfig" }