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

Fix the terraform fmt of configs

This commit is contained in:
Dalton Hubble 2017-10-16 01:32:25 -07:00
parent 734bc1d32a
commit 43dc44623f
9 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
aws/container-linux/kubernetes/outputs.tf
View File

@ -2,4 +2,3 @@ output "ingress_dns_name" {
value = "${aws_elb.ingress.dns_name}" value = "${aws_elb.ingress.dns_name}"
description = "DNS name of the ELB for distributing traffic to Ingress controllers" description = "DNS name of the ELB for distributing traffic to Ingress controllers"
} }

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

@ -89,7 +89,6 @@ resource "null_resource" "copy-kubeconfig" {
} }
} }
# 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" {

1
bare-metal/container-linux/kubernetes/variables.tf
View File

@ -129,4 +129,3 @@ variable "worker_networkds" {
description = "Worker Container Linux config networkd section" description = "Worker Container Linux config networkd section"
default = [] default = []
} }

1
bare-metal/container-linux/pxe-worker/variables.tf
View File

@ -59,6 +59,7 @@ variable "kube_dns_service_ip" {
variable "kernel_args" { variable "kernel_args" {
description = "Additional kernel arguments to provide at PXE boot." description = "Additional kernel arguments to provide at PXE boot."
type = "list" type = "list"
default = [ default = [
"root=/dev/sda1", "root=/dev/sda1",
] ]

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

@ -66,6 +66,7 @@ data "template_file" "controller_config" {
# Cannot use cyclic dependencies on controllers or their DNS records # Cannot use cyclic dependencies on controllers or their DNS records
etcd_name = "etcd${count.index}" etcd_name = "etcd${count.index}"
etcd_domain = "${var.cluster_name}-etcd${count.index}.${var.dns_zone}" etcd_domain = "${var.cluster_name}-etcd${count.index}.${var.dns_zone}"
# etcd0=https://cluster-etcd0.example.com,etcd1=https://cluster-etcd1.example.com,... # 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))}" 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)}" k8s_dns_service_ip = "${cidrhost(var.service_cidr, 10)}"

1
google-cloud/container-linux/kubernetes/controllers/controllers.tf
View File

@ -55,6 +55,7 @@ resource "google_compute_instance_template" "controller" {
boot = true boot = true
source_image = "${var.os_image}" source_image = "${var.os_image}"
disk_size_gb = "${var.disk_size}" disk_size_gb = "${var.disk_size}"
// Set explicit name to match the new default name set by the API. // Set explicit name to match the new default name set by the API.
// https://github.com/terraform-providers/terraform-provider-google/issues/574 // https://github.com/terraform-providers/terraform-provider-google/issues/574
device_name = "persistent-disk-0" device_name = "persistent-disk-0"

1
google-cloud/container-linux/kubernetes/workers/workers.tf
View File

@ -55,6 +55,7 @@ resource "google_compute_instance_template" "worker" {
boot = true boot = true
source_image = "${var.os_image}" source_image = "${var.os_image}"
disk_size_gb = "${var.disk_size}" disk_size_gb = "${var.disk_size}"
// Set explicit name to match the new default name set by the API. // Set explicit name to match the new default name set by the API.
// https://github.com/terraform-providers/terraform-provider-google/issues/574 // https://github.com/terraform-providers/terraform-provider-google/issues/574
device_name = "persistent-disk-0" device_name = "persistent-disk-0"