From 127f9e8d335f55fddb6068fa3062565ddcf70ac9 Mon Sep 17 00:00:00 2001 From: mcgin314 Date: Tue, 23 Jul 2024 14:52:13 -0400 Subject: [PATCH] Terraform fmt, should be a hook --- examples/simple/main.tf | 24 ++++++++++++------------ main.tf | 16 ++++++++-------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/examples/simple/main.tf b/examples/simple/main.tf index 74dcec8..b2ed1d7 100644 --- a/examples/simple/main.tf +++ b/examples/simple/main.tf @@ -34,18 +34,18 @@ locals { namespace = "prometheus" create_namespace = "true" -# tags = { -# project_number = "fs0000000078" -# project_name = "csvd_platformbaseline" -# project_role = "csvd_platformbaseline_app" -# organization = "census:ocio:csvd" -# created_by = "luther.coleman.mcginty@census.gov" -# created_for = "luther.coleman.mcginty@census.gov" -# created_reason = "Testing eks module operation" -# Terraform = "true" -# Terragrunt = "true" -# test_adjustment = "testing adding tags" -# } + # tags = { + # project_number = "fs0000000078" + # project_name = "csvd_platformbaseline" + # project_role = "csvd_platformbaseline_app" + # organization = "census:ocio:csvd" + # created_by = "luther.coleman.mcginty@census.gov" + # created_for = "luther.coleman.mcginty@census.gov" + # created_reason = "Testing eks module operation" + # Terraform = "true" + # Terragrunt = "true" + # test_adjustment = "testing adding tags" + # } } module "prometheus" { diff --git a/main.tf b/main.tf index c436ac3..f901ec8 100644 --- a/main.tf +++ b/main.tf @@ -49,7 +49,7 @@ resource "helm_release" "prometheus" { # Prometheus chart: set { - name = "configmapReload.prometheus.image.repository" + name = "configmapReload.prometheus.image.repository" value = split(":", module.images.images[local.prom_config_reload_key].dest_full_path)[0] } set { @@ -57,7 +57,7 @@ resource "helm_release" "prometheus" { value = split(":", module.images.images[local.prom_config_reload_key].dest_full_path)[1] } set { - name = "server.image.repository" + name = "server.image.repository" value = split(":", module.images.images[local.prom_key].dest_full_path)[0] } set { @@ -71,7 +71,7 @@ resource "helm_release" "prometheus" { # alertmanager subchart: set { - name = "alertmanager.image.repository" + name = "alertmanager.image.repository" value = split(":", module.images.images[local.alertman_key].dest_full_path)[0] } set { @@ -79,7 +79,7 @@ resource "helm_release" "prometheus" { value = module.images.images[local.alertman_key].tag } set { - name = "alertmanager.configmapReload.image.repository" + name = "alertmanager.configmapReload.image.repository" value = split(":", module.images.images[local.prom_config_reload_key].dest_full_path)[0] } set { @@ -93,11 +93,11 @@ resource "helm_release" "prometheus" { # kube-state-metrics subchart: set { - name = "kube-state-metrics.image.registry" + name = "kube-state-metrics.image.registry" value = module.images.images[local.ksm_key].dest_registry } set { - name = "kube-state-metrics.image.repository" + name = "kube-state-metrics.image.repository" value = module.images.images[local.ksm_key].dest_repository } set { @@ -112,7 +112,7 @@ resource "helm_release" "prometheus" { } set { name = "prometheus-node-exporter.image.repository" - value = module.images.images[local.node_exporter_key].dest_repository + value = module.images.images[local.node_exporter_key].dest_repository } set { name = "prometheus-node-exporter.image.tag" @@ -121,7 +121,7 @@ resource "helm_release" "prometheus" { # prometheus-pushgateway set { - name = "prometheus-pushgateway.image.repository" + name = "prometheus-pushgateway.image.repository" value = split(":", module.images.images[local.pushgateway_key].dest_full_path)[0] } set {