From 1b2ef812daee39c72e4bcd456b8a2e59423e562d Mon Sep 17 00:00:00 2001 From: mcgin314 Date: Thu, 6 Mar 2025 17:23:47 -0500 Subject: [PATCH] Terraform fmt --- copy_images.tf | 20 ++++++++++---------- examples/simple/open-telemetry.tf | 8 ++++---- main.tf | 26 +++++++++++++------------- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/copy_images.tf b/copy_images.tf index f7c8f82..95b8623 100644 --- a/copy_images.tf +++ b/copy_images.tf @@ -1,23 +1,23 @@ locals { - otel_name = "opentelemetry-operator" + otel_name = "opentelemetry-operator" otel_version = "0.110.0" - otel_key = format("%v#%v", local.otel_name, local.otel_version) + otel_key = format("%v#%v", local.otel_name, local.otel_version) - collector_name = "opentelemetry-collector-k8s" + collector_name = "opentelemetry-collector-k8s" collector_version = "0.111.0-amd64" - collector_key = format("%v#%v", local.collector_name, local.collector_version) + collector_key = format("%v#%v", local.collector_name, local.collector_version) - collector_contrib_name = "opentelemetry-collector-contrib" + collector_contrib_name = "opentelemetry-collector-contrib" collector_contrib_version = "0.113.0-amd64" - collector_contrib_key = format("%v#%v", local.collector_contrib_name, local.collector_contrib_version) + collector_contrib_key = format("%v#%v", local.collector_contrib_name, local.collector_contrib_version) - rbac_proxy_name = "kube-rbac-proxy" + rbac_proxy_name = "kube-rbac-proxy" rbac_proxy_version = "v0.18.1" - rbac_proxy_key = format("%v#%v", local.rbac_proxy_name, local.rbac_proxy_version) + rbac_proxy_key = format("%v#%v", local.rbac_proxy_name, local.rbac_proxy_version) - auto_instrumentation_java_name = "autoinstrumentation-java" + auto_instrumentation_java_name = "autoinstrumentation-java" auto_instrumentation_java_version = "2.9.0" - auto_instrumentation_java_key = format("%v#%v", local.auto_instrumentation_java_name, local.auto_instrumentation_java_version) + auto_instrumentation_java_key = format("%v#%v", local.auto_instrumentation_java_name, local.auto_instrumentation_java_version) image_config = [ { diff --git a/examples/simple/open-telemetry.tf b/examples/simple/open-telemetry.tf index c90dc01..14e7816 100644 --- a/examples/simple/open-telemetry.tf +++ b/examples/simple/open-telemetry.tf @@ -1,11 +1,11 @@ module "metrics-server" { source = "../.." - region = var.region - profile = var.profile - cluster_name = var.cluster_name + region = var.region + profile = var.profile + cluster_name = var.cluster_name namespace = var.namespace loki_endpoint = var.loki_endpoint tempo_endpoint = var.tempo_endpoint - tags = var.tags + tags = var.tags } diff --git a/main.tf b/main.tf index fa28830..7514e7d 100644 --- a/main.tf +++ b/main.tf @@ -12,11 +12,11 @@ resource "helm_release" "opentelemetry-operator" { module.images, ] - chart = "opentelemetry-operator" - name = "opentelemetry-operator" - namespace = local.telemetry_ns - repository = var.otel_helm_repo - version = var.otel_helm_version + chart = "opentelemetry-operator" + name = "opentelemetry-operator" + namespace = local.telemetry_ns + repository = var.otel_helm_repo + version = var.otel_helm_version set { name = "manager.image.repository" @@ -26,7 +26,7 @@ resource "helm_release" "opentelemetry-operator" { ) } set { - name = "manager.image.tag" + name = "manager.image.tag" value = module.images.images[local.otel_key].tag } @@ -76,10 +76,10 @@ resource "helm_release" "otel-resources" { helm_release.opentelemetry-operator, ] - chart = "./otel" - name = "otel-resources" - namespace = local.telemetry_ns - version = local.module_version + chart = "./otel" + name = "otel-resources" + namespace = local.telemetry_ns + version = local.module_version set { name = "collector.image" @@ -104,15 +104,15 @@ resource "helm_release" "otel-resources" { value = module.images.images[local.collector_contrib_key].tag } set { - name = "loki.endpoint" + name = "loki.endpoint" value = var.loki_endpoint } set { - name = "tempo.endpoint" + name = "tempo.endpoint" value = var.tempo_endpoint } set { - name = "otel.endpoint" + name = "otel.endpoint" value = local.otel_internal_url } set {