From 509f5a580eafbe95d4b813f736ad51d4157aac1f Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Fri, 23 Jan 2026 16:09:12 -0500 Subject: [PATCH 1/4] fix(main.tf) update helm syntax --- README.md | 8 +++--- main.tf | 76 +++++++++++++++++++++++++++---------------------------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/README.md b/README.md index 2b75d13..b92729e 100644 --- a/README.md +++ b/README.md @@ -30,10 +30,10 @@ Developer NOTE: We should automate this configuration. | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 5.14.0 | -| [aws.eecr](#provider\_aws.eecr) | >= 5.14.0 | -| [helm](#provider\_helm) | >= 2.11.0 | -| [null](#provider\_null) | >= 3.2.1 | +| [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 | | [terraform](#provider\_terraform) | n/a | ## Modules diff --git a/main.tf b/main.tf index 4515b8f..d1ec87e 100644 --- a/main.tf +++ b/main.tf @@ -51,44 +51,44 @@ resource "helm_release" "tempo" { wait = true timeout = 300 - set { + set = [{ name = "replicas" value = "1" - } - set { - name = "tempo.repository" - value = format("%v/%v", - module.images.images[local.tempo_key].dest_registry, - module.images.images[local.tempo_key].dest_repository - ) - } - set { - name = "tempo.tag" - value = var.tempo_tag - } - set { - name = "tempo.storage.trace.s3.bucket" - value = module.tempo_s3.s3_bucket_id - } - set { - name = "tempo.storage.trace.s3.endpoint" - value = "s3.${var.region}.amazonaws.com" - } - set { - name = "tempo.metricsGenerator.enabled" - value = true - } - set { - name = "tempo.metricsGenerator.remoteWriteUrl" - value = "http://${var.prometheus_svc}.${var.prometheus_namespace}:${var.prometheus_port}/api/v1/write" - } - set { - name = "serviceAccount.annotations.eks\\.amazonaws\\.com/role-arn" - value = module.tempo-irsa-role.iam_role_arn - } - set { - name = "persistence.storageClassName" - value = var.rwo_storage_class - } - + }, + { + name = "tempo.repository" + value = format("%v/%v", + module.images.images[local.tempo_key].dest_registry, + module.images.images[local.tempo_key].dest_repository + ) + }, + { + name = "tempo.tag" + value = var.tempo_tag + }, + { + name = "tempo.storage.trace.s3.bucket" + value = module.tempo_s3.s3_bucket_id + }, + { + name = "tempo.storage.trace.s3.endpoint" + value = "s3.${var.region}.amazonaws.com" + }, + { + name = "tempo.metricsGenerator.enabled" + value = true + }, + { + name = "tempo.metricsGenerator.remoteWriteUrl" + value = "http://${var.prometheus_svc}.${var.prometheus_namespace}:${var.prometheus_port}/api/v1/write" + }, + { + name = "serviceAccount.annotations.eks\\.amazonaws\\.com/role-arn" + value = module.tempo-irsa-role.iam_role_arn + }, + { + name = "persistence.storageClassName" + value = var.rwo_storage_class + } + ] } From 8b7fabed6a77f8b016997008e42185588f0b49af Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Fri, 23 Jan 2026 16:18:40 -0500 Subject: [PATCH 2/4] fix(main.tf) update tempo irsa role version --- README.md | 2 +- main.tf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b92729e..a2a09f4 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ Developer NOTE: We should automate this configuration. | Name | Source | Version | |------|--------|---------| | [images](#module\_images) | git::https://github.e.it.census.gov/terraform-modules/aws-ecr-copy-images.git/ | tf-upgrade | -| [tempo-irsa-role](#module\_tempo-irsa-role) | git::https://github.e.it.census.gov/SCT-Engineering/tfmod-custom-iam-role-for-service-account-eks.git/ | base | +| [tempo-irsa-role](#module\_tempo-irsa-role) | git::https://github.e.it.census.gov/SCT-Engineering/tfmod-custom-iam-role-for-service-account-eks.git/ | 1.0.1 | | [tempo\_s3](#module\_tempo\_s3) | git::https://github.e.it.census.gov/terraform-modules/aws-s3.git//standard | tf-upgrade | ## Resources diff --git a/main.tf b/main.tf index d1ec87e..eb4ff92 100644 --- a/main.tf +++ b/main.tf @@ -14,7 +14,7 @@ locals { # IRSA Role for Tempo ################################################################################ module "tempo-irsa-role" { - source = "git::https://github.e.it.census.gov/SCT-Engineering/tfmod-custom-iam-role-for-service-account-eks.git/?ref=base" + source = "git::https://github.e.it.census.gov/SCT-Engineering/tfmod-custom-iam-role-for-service-account-eks.git/?ref=1.0.1" role_name = format("%v%v-%v", local.prefixes["eks-role"], var.cluster_name, "tempo") attach_s3_bucket_owner_policy = true From 09b4267ae6c22cb51437ac49758b06f9d45e6ef9 Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Fri, 23 Jan 2026 16:56:29 -0500 Subject: [PATCH 3/4] fix(main.tf) adjust prometheus endpoint --- README.md | 2 +- main.tf | 21 ++++++++++++--------- tempo_values.yaml | 2 +- variables.tf | 2 +- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index a2a09f4..246678b 100644 --- a/README.md +++ b/README.md @@ -66,7 +66,7 @@ Developer NOTE: We should automate this configuration. | [namespace](#input\_namespace) | The namespace into which tempo will be deployed | `string` | `"tempo"` | no | | [oidc\_provider\_arn](#input\_oidc\_provider\_arn) | The ARN in the EKS cluster for the OpenID Connect identity provider. | `string` | n/a | yes | | [profile](#input\_profile) | AWS config profile used to upload images into ECR | `string` | `""` | no | -| [prometheus\_namespace](#input\_prometheus\_namespace) | Namespace where Prometheus is installed. | `string` | `"prometheus"` | no | +| [prometheus\_namespace](#input\_prometheus\_namespace) | Namespace where Prometheus is installed. | `string` | `"telemetry"` | no | | [prometheus\_port](#input\_prometheus\_port) | Port number of Prometheus service, mostly either 80 or 9090 | `string` | `"80"` | no | | [prometheus\_svc](#input\_prometheus\_svc) | Prometheus service name. | `string` | `"prometheus-server"` | no | | [region](#input\_region) | The region holding these resources (for the s3 bucket.) | `string` | n/a | yes | diff --git a/main.tf b/main.tf index eb4ff92..e75b75c 100644 --- a/main.tf +++ b/main.tf @@ -41,6 +41,7 @@ module "tempo-irsa-role" { # Helm Chart for Tempo ################################################################################ resource "helm_release" "tempo" { + depends_on = [module.tempo-irsa-role, module.images, module.tempo_s3] chart = "tempo" version = var.tempo_chart_version name = "tempo" @@ -51,16 +52,18 @@ resource "helm_release" "tempo" { wait = true timeout = 300 - set = [{ - name = "replicas" - value = "1" + set = [ + { + name = "replicas" + value = "1" + }, + { + name = "tempo.registry" + value = module.images.images[local.tempo_key].dest_registry }, { - name = "tempo.repository" - value = format("%v/%v", - module.images.images[local.tempo_key].dest_registry, - module.images.images[local.tempo_key].dest_repository - ) + name = "tempo.repository" + value = module.images.images[local.tempo_key].dest_repository }, { name = "tempo.tag" @@ -80,7 +83,7 @@ resource "helm_release" "tempo" { }, { name = "tempo.metricsGenerator.remoteWriteUrl" - value = "http://${var.prometheus_svc}.${var.prometheus_namespace}:${var.prometheus_port}/api/v1/write" + value = "http://${var.prometheus_svc}.${var.prometheus_namespace}.svc.cluster.local:${var.prometheus_port}/api/v1/write" }, { name = "serviceAccount.annotations.eks\\.amazonaws\\.com/role-arn" diff --git a/tempo_values.yaml b/tempo_values.yaml index 5b2e47b..3494f11 100644 --- a/tempo_values.yaml +++ b/tempo_values.yaml @@ -16,7 +16,7 @@ tempo: value: "9411" metricsGenerator: enabled: true - remoteWriteUrl: http://prometheus-server.prometheus:80/api/v1/write + remoteWriteUrl: "http://prometheus-server.telemetry.svc.cluster.local:80/api/v1/write" reportingEnabled: false serviceAccount: diff --git a/variables.tf b/variables.tf index dc41667..4b6197d 100644 --- a/variables.tf +++ b/variables.tf @@ -45,7 +45,7 @@ variable "profile" { variable "prometheus_namespace" { description = "Namespace where Prometheus is installed." type = string - default = "prometheus" + default = "telemetry" } variable "prometheus_port" { From c5e82a061f50946e309d0971334a2c1405d43666 Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Fri, 23 Jan 2026 16:57:42 -0500 Subject: [PATCH 4/4] fix(main.tf) add atomic true to helm chart --- main.tf | 1 + 1 file changed, 1 insertion(+) diff --git a/main.tf b/main.tf index e75b75c..b821ce8 100644 --- a/main.tf +++ b/main.tf @@ -42,6 +42,7 @@ module "tempo-irsa-role" { ################################################################################ resource "helm_release" "tempo" { depends_on = [module.tempo-irsa-role, module.images, module.tempo_s3] + atomic = true chart = "tempo" version = var.tempo_chart_version name = "tempo"