fix: 🐛 remove existing pvc (#312)

ministryofjustice · Dec 17, 2024 · 85282a5 · 85282a5
1 parent a847163
commit 85282a5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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"
-}