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

Fix terraform fmt

This commit is contained in:
Dalton Hubble 2018-08-21 21:59:55 -07:00
parent 99e3721181
commit bdf1e6986e
11 changed files with 48 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bare-metal/container-linux/kubernetes/profiles.tf
View File

@ -125,11 +125,11 @@ data "ct_config" "controller-ignitions" {
count = "${length(var.controller_names)}" count = "${length(var.controller_names)}"
content = "${element(data.template_file.controller-configs.*.rendered, count.index)}" content = "${element(data.template_file.controller-configs.*.rendered, count.index)}"
pretty_print = false pretty_print = false
# Must use direct lookup. Cannot use lookup(map, key) since it only works for flat maps # Must use direct lookup. Cannot use lookup(map, key) since it only works for flat maps
snippets = ["${local.clc_map[element(var.controller_names, count.index)]}"] snippets = ["${local.clc_map[element(var.controller_names, count.index)]}"]
} }
data "template_file" "controller-configs" { data "template_file" "controller-configs" {
count = "${length(var.controller_names)}" count = "${length(var.controller_names)}"
@ -152,11 +152,11 @@ resource "matchbox_profile" "workers" {
raw_ignition = "${element(data.ct_config.worker-ignitions.*.rendered, count.index)}" raw_ignition = "${element(data.ct_config.worker-ignitions.*.rendered, count.index)}"
} }
data "ct_config" "worker-ignitions" { data "ct_config" "worker-ignitions" {
count = "${length(var.worker_names)}" count = "${length(var.worker_names)}"
content = "${element(data.template_file.worker-configs.*.rendered, count.index)}" content = "${element(data.template_file.worker-configs.*.rendered, count.index)}"
pretty_print = false pretty_print = false
# Must use direct lookup. Cannot use lookup(map, key) since it only works for flat maps # Must use direct lookup. Cannot use lookup(map, key) since it only works for flat maps
snippets = ["${local.clc_map[element(var.worker_names, count.index)]}"] snippets = ["${local.clc_map[element(var.worker_names, count.index)]}"]
} }
@ -179,6 +179,7 @@ locals {
# Default Container Linux config snippets map every node names to list("\n") so # Default Container Linux config snippets map every node names to list("\n") so
# all lookups succeed # all lookups succeed
clc_defaults = "${zipmap(concat(var.controller_names, var.worker_names), chunklist(data.template_file.clc-default-snippets.*.rendered, 1))}" clc_defaults = "${zipmap(concat(var.controller_names, var.worker_names), chunklist(data.template_file.clc-default-snippets.*.rendered, 1))}"
# Union of the default and user specific snippets, later overrides prior. # Union of the default and user specific snippets, later overrides prior.
clc_map = "${merge(local.clc_defaults, var.clc_snippets)}" clc_map = "${merge(local.clc_defaults, var.clc_snippets)}"
} }

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

@ -40,6 +40,7 @@ resource "google_compute_target_tcp_proxy" "ingress-https" {
# HTTP URL Map (required) # HTTP URL Map (required)
resource "google_compute_url_map" "ingress-http" { resource "google_compute_url_map" "ingress-http" {
name = "${var.cluster_name}-ingress-http" name = "${var.cluster_name}-ingress-http"
# Do not add host/path rules for applications here. Use Ingress resources. # Do not add host/path rules for applications here. Use Ingress resources.
default_service = "${google_compute_backend_service.ingress-http.self_link}" default_service = "${google_compute_backend_service.ingress-http.self_link}"
} }

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

@ -57,7 +57,6 @@ resource "google_compute_firewall" "allow-apiserver" {
target_tags = ["${var.cluster_name}-controller"] target_tags = ["${var.cluster_name}-controller"]
} }
# Calico BGP and IPIP # Calico BGP and IPIP
# https://docs.projectcalico.org/v2.5/reference/public-cloud/gce # https://docs.projectcalico.org/v2.5/reference/public-cloud/gce
resource "google_compute_firewall" "internal-calico" { resource "google_compute_firewall" "internal-calico" {

1
google-cloud/fedora-atomic/kubernetes/ingress.tf
View File

@ -40,6 +40,7 @@ resource "google_compute_target_tcp_proxy" "ingress-https" {
# HTTP URL Map (required) # HTTP URL Map (required)
resource "google_compute_url_map" "ingress-http" { resource "google_compute_url_map" "ingress-http" {
name = "${var.cluster_name}-ingress-http" name = "${var.cluster_name}-ingress-http"
# Do not add host/path rules for applications here. Use Ingress resources. # Do not add host/path rules for applications here. Use Ingress resources.
default_service = "${google_compute_backend_service.ingress-http.self_link}" default_service = "${google_compute_backend_service.ingress-http.self_link}"
} }

1
google-cloud/fedora-atomic/kubernetes/network.tf
View File

@ -57,7 +57,6 @@ resource "google_compute_firewall" "allow-apiserver" {
target_tags = ["${var.cluster_name}-controller"] target_tags = ["${var.cluster_name}-controller"]
} }
# Calico BGP and IPIP # Calico BGP and IPIP
# https://docs.projectcalico.org/v2.5/reference/public-cloud/gce # https://docs.projectcalico.org/v2.5/reference/public-cloud/gce
resource "google_compute_firewall" "internal-calico" { resource "google_compute_firewall" "internal-calico" {