From 3d3847ebe3a24aeebad7abc8c36d9caff57f44fe Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Fri, 18 Apr 2025 02:17:33 -0400 Subject: [PATCH] add image versions passthrough --- lab/_envcommon/default-versions.hcl | 3 ++- .../vpc/csvd-platform-lab-mcm/eks-otel/terragrunt.hcl | 10 +++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/lab/_envcommon/default-versions.hcl b/lab/_envcommon/default-versions.hcl index 3c09157..7f59640 100644 --- a/lab/_envcommon/default-versions.hcl +++ b/lab/_envcommon/default-versions.hcl @@ -168,8 +168,9 @@ locals { # Open Telemetry ################ auto_instrumentation_java_version = "2.9.0" - collector_version = "0.111.0-amd64" collector_contrib_version = "0.113.0-amd64" + collector_version = "0.111.0-amd64" + otel_helm_version = "0.71.2" otel_version = "0.110.0" rbac_proxy_version = "v0.18.1" diff --git a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-otel/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-otel/terragrunt.hcl index e52ef7a..1d6ff7f 100644 --- a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-otel/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-otel/terragrunt.hcl @@ -68,9 +68,17 @@ inputs = { eecr_account_id = include.root.inputs.eecr_account_id profile = include.root.inputs.aws_profile region = include.root.inputs.aws_region + # Clouster Config + cluster_name = dependency.eks.outputs.cluster_name - cluster_name = dependency.eks.outputs.cluster_name + # OTEL Configuration namespace = include.root.inputs.namespaces["otel"] loki_endpoint = dependency.eks-loki.outputs.gateway_internal_endpoint.url tempo_endpoint = dependency.eks-tempo.outputs.tempo_otlp_endpoint.url + # Image Version + auto_instrumentation_java_version = include.root.inputs.auto_instrumentation_java_version + collector_contrib_version = include.root.inputs.collector_contrib_version + collector_version = include.root.inputs.collector_version + otel_helm_version = include.root.inputs.otel_helm_version + rbac_proxy_version = include.root.inputs.rbac_proxy_version }