From be3054f34ecf25eb7930af653539be6ffa2fc35f Mon Sep 17 00:00:00 2001 From: Matthew Creal Morgan Date: Wed, 25 Jun 2025 11:09:12 -0700 Subject: [PATCH] update sources and helm syntax (#3) --- README.md | 11 +-- copy_images.tf | 7 +- main.tf | 188 ++++++++++++++++++++++++------------------------- 3 files changed, 106 insertions(+), 100 deletions(-) diff --git a/README.md b/README.md index 8c4c4ae..dd8aa83 100644 --- a/README.md +++ b/README.md @@ -20,16 +20,16 @@ This modules installs the OpenTelemetry Collector operator and two Collectors. O | Name | Version | |------|---------| -| [aws](#provider\_aws) | 5.94.1 | -| [aws.eecr](#provider\_aws.eecr) | 5.94.1 | -| [helm](#provider\_helm) | 2.17.0 | -| [null](#provider\_null) | 3.2.3 | +| [aws](#provider\_aws) | 6.0.0 | +| [aws.eecr](#provider\_aws.eecr) | 6.0.0 | +| [helm](#provider\_helm) | 3.0.2 | +| [null](#provider\_null) | 3.2.4 | ## Modules | Name | Source | Version | |------|--------|---------| -| [images](#module\_images) | git::https://github.e.it.census.gov/terraform-modules/aws-ecr-copy-images.git/ | tf-upgrade | +| [images](#module\_images) | git::https://github.e.it.census.gov/terraform-modules/aws-ecr-copy-images.git | tf-upgrade | ## Resources @@ -66,6 +66,7 @@ This modules installs the OpenTelemetry Collector operator and two Collectors. O | Name | Description | |------|-------------| +| [image\_config](#output\_image\_config) | Map of image references to their full source paths | | [module\_name](#output\_module\_name) | The name of this module. | | [module\_version](#output\_module\_version) | The version of this module. | diff --git a/copy_images.tf b/copy_images.tf index 81118dd..196a52f 100644 --- a/copy_images.tf +++ b/copy_images.tf @@ -72,7 +72,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 @@ -105,3 +105,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 +} diff --git a/main.tf b/main.tf index d4c7d7d..cc52ea2 100644 --- a/main.tf +++ b/main.tf @@ -16,55 +16,53 @@ resource "helm_release" "opentelemetry-operator" { repository = var.otel_helm_repo version = var.otel_helm_version - set { - name = "manager.image.repository" - value = format("%v/%v", - module.images.images[local.otel_key].dest_registry, - module.images.images[local.otel_key].dest_repository - ) - } - set { - name = "manager.image.tag" - value = module.images.images[local.otel_key].tag - } - - set { - name = "manager.collectorImage.repository" - value = format("%v/%v", - module.images.images[local.collector_key].dest_registry, - module.images.images[local.collector_key].dest_repository - ) - } - set { - name = "manager.collectorImage.tag" - value = module.images.images[local.collector_key].tag - } - - set { - name = "kubeRBACProxy.image.repository" - value = format("%v/%v", - module.images.images[local.rbac_proxy_key].dest_registry, - module.images.images[local.rbac_proxy_key].dest_repository - ) - } - set { - name = "kubeRBACProxy.image.tag" - value = module.images.images[local.rbac_proxy_key].tag - } - - set { - name = "admissionWebhooks.certManager.enabled" - value = true - } - set { - name = "admissionWebhooks.certManager.issuerRef.kind" - value = "ClusterIssuer" - } - set { - name = "admissionWebhooks.certManager.issuerRef.name" - value = "clusterissuer" - } - + set = [ + { + name = "manager.image.repository" + value = format("%v/%v", + module.images.images[local.otel_key].dest_registry, + module.images.images[local.otel_key].dest_repository + ) + }, + { + name = "manager.image.tag" + value = module.images.images[local.otel_key].tag + }, + { + name = "manager.collectorImage.repository" + value = format("%v/%v", + module.images.images[local.collector_key].dest_registry, + module.images.images[local.collector_key].dest_repository + ) + }, + { + name = "manager.collectorImage.tag" + value = module.images.images[local.collector_key].tag + }, + { + name = "kubeRBACProxy.image.repository" + value = format("%v/%v", + module.images.images[local.rbac_proxy_key].dest_registry, + module.images.images[local.rbac_proxy_key].dest_repository + ) + }, + { + name = "kubeRBACProxy.image.tag" + value = module.images.images[local.rbac_proxy_key].tag + }, + { + name = "admissionWebhooks.certManager.enabled" + value = true + }, + { + name = "admissionWebhooks.certManager.issuerRef.kind" + value = "ClusterIssuer" + }, + { + name = "admissionWebhooks.certManager.issuerRef.name" + value = "clusterissuer" + }, + ] timeout = 180 } @@ -79,49 +77,51 @@ resource "helm_release" "otel-resources" { namespace = var.namespace version = local.module_version - set { - name = "collector.image" - value = format("%v/%v", - module.images.images[local.collector_key].dest_registry, - module.images.images[local.collector_key].dest_repository - ) - } - set { - name = "collector.tag" - value = module.images.images[local.collector_key].tag - } - set { - name = "collectorContrib.image" - value = format("%v/%v", - module.images.images[local.collector_contrib_key].dest_registry, - module.images.images[local.collector_contrib_key].dest_repository - ) - } - set { - name = "collectorContrib.tag" - value = module.images.images[local.collector_contrib_key].tag - } - set { - name = "loki.endpoint" - value = var.loki_endpoint - } - set { - name = "tempo.endpoint" - value = var.tempo_endpoint - } - set { - name = "otel.endpoint" - value = local.otel_internal_url - } - set { - name = "autoinstrumentation.java.image" - value = format("%v/%v", - module.images.images[local.auto_instrumentation_java_key].dest_registry, - module.images.images[local.auto_instrumentation_java_key].dest_repository - ) - } - set { - name = "autoinstrumentation.java.tag" - value = module.images.images[local.auto_instrumentation_java_key].tag - } + set = [ + { + name = "collector.image" + value = format("%v/%v", + module.images.images[local.collector_key].dest_registry, + module.images.images[local.collector_key].dest_repository + ) + }, + { + name = "collector.tag" + value = module.images.images[local.collector_key].tag + }, + { + name = "collectorContrib.image" + value = format("%v/%v", + module.images.images[local.collector_contrib_key].dest_registry, + module.images.images[local.collector_contrib_key].dest_repository + ) + }, + { + name = "collectorContrib.tag" + value = module.images.images[local.collector_contrib_key].tag + }, + { + name = "loki.endpoint" + value = var.loki_endpoint + }, + { + name = "tempo.endpoint" + value = var.tempo_endpoint + }, + { + name = "otel.endpoint" + value = local.otel_internal_url + }, + { + name = "autoinstrumentation.java.image" + value = format("%v/%v", + module.images.images[local.auto_instrumentation_java_key].dest_registry, + module.images.images[local.auto_instrumentation_java_key].dest_repository + ) + }, + { + name = "autoinstrumentation.java.tag" + value = module.images.images[local.auto_instrumentation_java_key].tag + } + ] }