From f68ec6f1fb2cfcf87edd0318118513ae35ebfac3 Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Fri, 21 Feb 2025 18:01:05 -0500 Subject: [PATCH 1/3] add wait and timeout --- README.md | 4 ++-- main.tf | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index b50041a..2f92f12 100644 --- a/README.md +++ b/README.md @@ -30,8 +30,8 @@ Developer NOTE: We should automate this configuration. | Name | Version | |------|---------| -| [aws](#provider\_aws) | 5.73.0 | -| [helm](#provider\_helm) | 2.16.1 | +| [aws](#provider\_aws) | >= 5.14.0 | +| [helm](#provider\_helm) | >= 2.11.0 | ## Modules diff --git a/main.tf b/main.tf index 6458cc4..b0cb5dd 100644 --- a/main.tf +++ b/main.tf @@ -42,16 +42,17 @@ resource "helm_release" "tempo" { create_namespace = true repository = "https://grafana.github.io/helm-charts" values = [file("${path.module}/tempo_values.yaml")] - + wait = true + timeout = 300 set { name = "tempo.storage.trace.s3.insecure" value = "false" } - # set { - # name = "replicas" - # value = "3" - # } + set { + name = "tempo.replicas" + value = "2" + } set { name = "tempo.repository" value = format("%v/%v", @@ -84,5 +85,4 @@ resource "helm_release" "tempo" { value = var.rwo_storage_class } - timeout = 60 } From d48afc08f0c11f11101ab70a2ad85384ce042a7c Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Mon, 24 Feb 2025 17:43:37 -0500 Subject: [PATCH 2/3] update tempo defaults --- tempo_values.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/tempo_values.yaml b/tempo_values.yaml index f9aaa61..8be8c8b 100644 --- a/tempo_values.yaml +++ b/tempo_values.yaml @@ -1,3 +1,4 @@ +--- tempo: storage: trace: From 99064baad7f9185a71acf381d34fad0b55aa5a03 Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Mon, 24 Feb 2025 17:43:56 -0500 Subject: [PATCH 3/3] update precommit --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 5a5c34b..ef52d70 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -37,7 +37,7 @@ repos: # Terraform Hooks - repo: https://github.com/antonbabenko/pre-commit-terraform - rev: v1.96.1 # Get the latest from: https://github.com/antonbabenko/pre-commit-terraform/releases + rev: v1.97.3 # Get the latest from: https://github.com/antonbabenko/pre-commit-terraform/releases hooks: - id: terraform_fmt args: