mirror of
https://github.com/puppetmaster/typhoon.git
synced 2024-12-24 18:19:33 +01:00
Fix the terraform fmt of configs
This commit is contained in:
parent
734bc1d32a
commit
43dc44623f
@ -2,4 +2,3 @@ output "ingress_dns_name" {
|
||||
value = "${aws_elb.ingress.dns_name}"
|
||||
description = "DNS name of the ELB for distributing traffic to Ingress controllers"
|
||||
}
|
||||
|
||||
|
@ -89,7 +89,6 @@ resource "null_resource" "copy-kubeconfig" {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
# Secure copy bootkube assets to ONE controller and start bootkube to perform
|
||||
# one-time self-hosted cluster bootstrapping.
|
||||
resource "null_resource" "bootkube-start" {
|
||||
|
@ -129,4 +129,3 @@ variable "worker_networkds" {
|
||||
description = "Worker Container Linux config networkd section"
|
||||
default = []
|
||||
}
|
||||
|
||||
|
@ -59,6 +59,7 @@ variable "kube_dns_service_ip" {
|
||||
variable "kernel_args" {
|
||||
description = "Additional kernel arguments to provide at PXE boot."
|
||||
type = "list"
|
||||
|
||||
default = [
|
||||
"root=/dev/sda1",
|
||||
]
|
||||
|
@ -66,6 +66,7 @@ data "template_file" "controller_config" {
|
||||
# Cannot use cyclic dependencies on controllers or their DNS records
|
||||
etcd_name = "etcd${count.index}"
|
||||
etcd_domain = "${var.cluster_name}-etcd${count.index}.${var.dns_zone}"
|
||||
|
||||
# etcd0=https://cluster-etcd0.example.com,etcd1=https://cluster-etcd1.example.com,...
|
||||
etcd_initial_cluster = "${join(",", formatlist("%s=https://%s:2380", null_resource.repeat.*.triggers.name, null_resource.repeat.*.triggers.domain))}"
|
||||
k8s_dns_service_ip = "${cidrhost(var.service_cidr, 10)}"
|
||||
|
@ -55,6 +55,7 @@ resource "google_compute_instance_template" "controller" {
|
||||
boot = true
|
||||
source_image = "${var.os_image}"
|
||||
disk_size_gb = "${var.disk_size}"
|
||||
|
||||
// Set explicit name to match the new default name set by the API.
|
||||
// https://github.com/terraform-providers/terraform-provider-google/issues/574
|
||||
device_name = "persistent-disk-0"
|
||||
|
@ -55,6 +55,7 @@ resource "google_compute_instance_template" "worker" {
|
||||
boot = true
|
||||
source_image = "${var.os_image}"
|
||||
disk_size_gb = "${var.disk_size}"
|
||||
|
||||
// Set explicit name to match the new default name set by the API.
|
||||
// https://github.com/terraform-providers/terraform-provider-google/issues/574
|
||||
device_name = "persistent-disk-0"
|
||||
|
Loading…
Reference in New Issue
Block a user