update sources and helm syntax

README.md

@@ -71,16 +71,16 @@ sys     0m3.489s
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.94.1 |
-| <a name="provider_aws.eecr"></a> [aws.eecr](#provider\_aws.eecr) | 5.94.1 |
-| <a name="provider_helm"></a> [helm](#provider\_helm) | 2.17.0 |
-| <a name="provider_null"></a> [null](#provider\_null) | 3.2.3 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | 6.0.0 |
+| <a name="provider_aws.eecr"></a> [aws.eecr](#provider\_aws.eecr) | 6.0.0 |
+| <a name="provider_helm"></a> [helm](#provider\_helm) | 3.0.2 |
+| <a name="provider_null"></a> [null](#provider\_null) | 3.2.4 |
 
 ## Modules
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_images"></a> [images](#module\_images) | git::https://github.e.it.census.gov/terraform-modules/aws-ecr-copy-images.git/ | tf-upgrade |
+| <a name="module_images"></a> [images](#module\_images) | git::https://github.e.it.census.gov/terraform-modules/aws-ecr-copy-images.git | tf-upgrade |
 
 ## Resources
 
@@ -116,6 +116,7 @@ sys     0m3.489s
 |------|-------------|
 | <a name="output_alertmanager_headless_internal_endpoint"></a> [alertmanager\_headless\_internal\_endpoint](#output\_alertmanager\_headless\_internal\_endpoint) | headless internal endpoint for alertmanager |
 | <a name="output_alertmanager_internal_endpoint"></a> [alertmanager\_internal\_endpoint](#output\_alertmanager\_internal\_endpoint) | internal endpoint for alertmanager |
+| <a name="output_image_config"></a> [image\_config](#output\_image\_config) | Map of image references to their full source paths |
 | <a name="output_module_name"></a> [module\_name](#output\_module\_name) | The name of this module. |
 | <a name="output_module_version"></a> [module\_version](#output\_module\_version) | The version of this module. |
 | <a name="output_prometheus_namespace"></a> [prometheus\_namespace](#output\_prometheus\_namespace) | namespace for prometheus |

copy_images.tf

@@ -78,7 +78,7 @@ locals {
 }
 
 module "images" {
-  source = "git::https://github.e.it.census.gov/terraform-modules/aws-ecr-copy-images.git/?ref=tf-upgrade"
+  source = "git::https://github.e.it.census.gov/terraform-modules/aws-ecr-copy-images.git?ref=tf-upgrade"
 
   profile          = var.profile
   application_name = var.cluster_name
@@ -111,3 +111,8 @@ provider "aws" {
   profile = var.eecr_info.profile
   region  = var.eecr_info.region
 }
+
+output "image_config" {
+  description = "Map of image references to their full source paths"
+  value       = local.image_config
+}

main.tf

@@ -27,133 +27,114 @@ resource "helm_release" "prometheus" {
   repository = "https://prometheus-community.github.io/helm-charts"
   timeout    = 600
 
-  # Global
-  set {
-    name  = "server.web.enable-remote-write-receiver"
-    value = ""
-  }
-
-  # Prometheus chart:
-  set {
-    name  = "configmapReload.prometheus.image.repository"
-    value = split(":", module.images.images[local.prom_config_reload_key].dest_full_path)[0]
-  }
-  set {
-    name  = "configmapReload.prometheus.image.tag"
-    value = split(":", module.images.images[local.prom_config_reload_key].dest_full_path)[1]
-  }
-  set {
-    name  = "server.image.repository"
-    value = split(":", module.images.images[local.prom_key].dest_full_path)[0]
-  }
-  set {
-    name  = "server.image.tag"
-    value = module.images.images[local.prom_key].tag
-  }
-  set {
-    name  = "server.persistentVolume.storageClass"
-    value = var.rwo_storage_class
-  }
-
-  # alertmanager subchart:
-  set {
-    name  = "alertmanager.image.repository"
-    value = split(":", module.images.images[local.alertman_key].dest_full_path)[0]
-  }
-  set {
-    name  = "alertmanager.image.tag"
-    value = module.images.images[local.alertman_key].tag
-  }
-  set {
-    name  = "alertmanager.configmapReload.image.repository"
-    value = split(":", module.images.images[local.prom_config_reload_key].dest_full_path)[0]
-  }
-  set {
-    name  = "alertmanager.configmapReload.image.tag"
-    value = module.images.images[local.prom_config_reload_key].tag
-  }
-  set {
-    name  = "alertmanager.persistence.storageClass"
-    value = var.rwo_storage_class
-  }
-
-  # kube-state-metrics subchart:
-  set {
-    name  = "kube-state-metrics.image.registry"
-    value = module.images.images[local.ksm_key].dest_registry
-  }
-  set {
-    name  = "kube-state-metrics.image.repository"
-    value = module.images.images[local.ksm_key].dest_repository
-  }
-  set {
-    name  = "kube-state-metrics.image.tag"
-    value = module.images.images[local.ksm_key].tag
-  }
-
-  # prometheus-node-exporter subject:
-  set {
-    name  = "prometheus-node-exporter.image.registry"
-    value = module.images.images[local.node_exporter_key].dest_registry
-  }
-  set {
-    name  = "prometheus-node-exporter.image.repository"
-    value = module.images.images[local.node_exporter_key].dest_repository
-  }
-  set {
-    name  = "prometheus-node-exporter.image.tag"
-    value = module.images.images[local.node_exporter_key].tag
-  }
-
-  # prometheus-pushgateway
-  set {
-    name  = "prometheus-pushgateway.image.repository"
-    value = split(":", module.images.images[local.pushgateway_key].dest_full_path)[0]
-  }
-  set {
-    name  = "prometheus-pushgateway.image.tag"
-    value = module.images.images[local.pushgateway_key].tag
-  }
-
-  set {
-    name  = "server.resources.requests.cpu"
-    value = "100m"
-  }
-
-  set {
-    name  = "server.resources.requests.memory"
-    value = "128Mi"
-  }
-
-  set {
-    name  = "server.resources.limits.cpu"
-    value = "1000m"
-  }
-
-  set {
-    name  = "server.resources.limits.memory"
-    value = "2Gi"
-  }
-
-  # Autoscaling for Prometheus server
-  set {
-    name  = "server.autoscaling.enabled"
-    value = "true"
-  }
-
-  set {
-    name  = "server.autoscaling.minReplicas"
-    value = "1"
-  }
-
-  set {
-    name  = "server.autoscaling.maxReplicas"
-    value = "5"
-  }
-
-  set {
-    name  = "server.autoscaling.targetCPUUtilizationPercentage"
-    value = "80"
-  }
-
+  set = [
+    {
+      name  = "server.web.enable-remote-write-receiver"
+      value = ""
+    },
+    {
+      name  = "configmapReload.prometheus.image.repository"
+      value = split(":", module.images.images[local.prom_config_reload_key].dest_full_path)[0]
+    },
+    {
+      name  = "configmapReload.prometheus.image.tag"
+      value = split(":", module.images.images[local.prom_config_reload_key].dest_full_path)[1]
+    },
+    {
+      name  = "server.image.repository"
+      value = split(":", module.images.images[local.prom_key].dest_full_path)[0]
+    },
+    {
+      name  = "server.image.tag"
+      value = module.images.images[local.prom_key].tag
+    },
+    {
+      name  = "server.persistentVolume.storageClass"
+      value = var.rwo_storage_class
+    },
+    {
+      name  = "alertmanager.image.repository"
+      value = split(":", module.images.images[local.alertman_key].dest_full_path)[0]
+    },
+    {
+      name  = "alertmanager.image.tag"
+      value = module.images.images[local.alertman_key].tag
+    },
+    {
+      name  = "alertmanager.configmapReload.image.repository"
+      value = split(":", module.images.images[local.prom_config_reload_key].dest_full_path)[0]
+    },
+    {
+      name  = "alertmanager.configmapReload.image.tag"
+      value = module.images.images[local.prom_config_reload_key].tag
+    },
+    {
+      name  = "alertmanager.persistence.storageClass"
+      value = var.rwo_storage_class
+    },
+    {
+      name  = "kube-state-metrics.image.registry"
+      value = module.images.images[local.ksm_key].dest_registry
+    },
+    {
+      name  = "kube-state-metrics.image.repository"
+      value = module.images.images[local.ksm_key].dest_repository
+    },
+    {
+      name  = "kube-state-metrics.image.tag"
+      value = module.images.images[local.ksm_key].tag
+    },
+    {
+      name  = "prometheus-node-exporter.image.registry"
+      value = module.images.images[local.node_exporter_key].dest_registry
+    },
+    {
+      name  = "prometheus-node-exporter.image.repository"
+      value = module.images.images[local.node_exporter_key].dest_repository
+    },
+    {
+      name  = "prometheus-node-exporter.image.tag"
+      value = module.images.images[local.node_exporter_key].tag
+    },
+    {
+      name  = "prometheus-pushgateway.image.repository"
+      value = split(":", module.images.images[local.pushgateway_key].dest_full_path)[0]
+    },
+    {
+      name  = "prometheus-pushgateway.image.tag"
+      value = module.images.images[local.pushgateway_key].tag
+    },
+    {
+      name  = "server.resources.requests.cpu"
+      value = "100m"
+    },
+    {
+      name  = "server.resources.requests.memory"
+      value = "128Mi"
+    },
+    {
+      name  = "server.resources.limits.cpu"
+      value = "1000m"
+    },
+    {
+      name  = "server.resources.limits.memory"
+      value = "2Gi"
+    },
+    {
+      name  = "server.autoscaling.enabled"
+      value = "true"
+    },
+    {
+      name  = "server.autoscaling.minReplicas"
+      value = "1"
+    },
+    {
+      name  = "server.autoscaling.maxReplicas"
+      value = "5"
+    },
+    {
+      name  = "server.autoscaling.targetCPUUtilizationPercentage"
+      value = "80"
+    },
+  ]
 }