From 85282a5553a6be467af230bd60ff078d80815984 Mon Sep 17 00:00:00 2001 From: Jaskaran Sarkaria Date: Tue, 17 Dec 2024 16:21:56 +0000 Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20remove=20existing=20pvc?= =?UTF-8?q?=20(#312)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/thanos-values.yaml.tpl | 3 --- thanos.tf | 9 ++++----- variables.tf | 5 ----- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/templates/thanos-values.yaml.tpl b/templates/thanos-values.yaml.tpl index 10ed075..956d285 100644 --- a/templates/thanos-values.yaml.tpl +++ b/templates/thanos-values.yaml.tpl @@ -83,9 +83,6 @@ compactor: retentionResolution5m: 180d retentionResolution1h: 365d persistence: - %{ if compactor_existing_pvc_claim_id != "disabled" ~} - existingClaim: "${compactor_existing_pvc_claim_id}" - %{ endif ~} size: 16000Gi serviceAccount: create: false diff --git a/thanos.tf b/thanos.tf index 546692f..6edab24 100644 --- a/thanos.tf +++ b/thanos.tf @@ -8,11 +8,10 @@ resource "helm_release" "thanos" { version = "15.0.0" timeout = 900 values = [templatefile("${path.module}/templates/thanos-values.yaml.tpl", { - prometheus_sa_name = local.prometheus_sa_name - enabled_compact = var.enable_thanos_compact - monitoring_aws_role = module.iam_assumable_role_monitoring.this_iam_role_name - clusterName = terraform.workspace - compactor_existing_pvc_claim_id = var.compactor_existing_pvc_claim_id + prometheus_sa_name = local.prometheus_sa_name + enabled_compact = var.enable_thanos_compact + monitoring_aws_role = module.iam_assumable_role_monitoring.this_iam_role_name + clusterName = terraform.workspace })] depends_on = [ diff --git a/variables.tf b/variables.tf index 67d57aa..5dccbc3 100644 --- a/variables.tf +++ b/variables.tf @@ -140,8 +140,3 @@ variable "aws_subnet_exporter_image_tag" { default = "" type = string } - -variable "compactor_existing_pvc_claim_id" { - description = "this is an existing pvc that thanos compactor should connect with" - default = "disabled" -}