From 0638108b870fbf85b5b52eff4eeef229eb7a32c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gon=C3=A7alo=20Heleno?= <goncalo.heleno@camptocamp.com>
Date: Wed, 7 Aug 2024 12:01:47 +0200
Subject: [PATCH] fix: remove the working_directory attribute in the compactor
 config

This [flag](https://github.com/grafana/helm-charts/commit/824e3da82e5a9aeb09da211f71f86a98f89e64b2#diff-c09523f8c89a2fdb980fa9bb57eebcbb45a5950391a6bb8d44b549ea184388f6) was hardcoded before and was removed on the version 0.79.x of the chart. As a consequence, it seems that the attribute `compactor.working_directory' was taking its place and breaking our deployments. As a fix, I've decided to revert to the default configuration which uses the `/var/loki` directory (which is mounted as a persistent volume created automatically, as defined by our values).
---
 aks/locals.tf  | 3 +--
 eks/locals.tf  | 3 +--
 kind/locals.tf | 3 +--
 sks/locals.tf  | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/aks/locals.tf b/aks/locals.tf
index a299d912..b222d4e9 100644
--- a/aks/locals.tf
+++ b/aks/locals.tf
@@ -50,8 +50,7 @@ locals {
         }
         structuredConfig = {
           compactor = {
-            shared_store      = "azure"
-            working_directory = "/var/loki"
+            shared_store = "azure"
           }
         }
       })
diff --git a/eks/locals.tf b/eks/locals.tf
index 604787e3..4a322a68 100644
--- a/eks/locals.tf
+++ b/eks/locals.tf
@@ -26,8 +26,7 @@ locals {
         }
         structuredConfig = {
           compactor = {
-            working_directory = "/data/compactor"
-            shared_store      = "s3"
+            shared_store = "s3"
           }
         }
       }
diff --git a/kind/locals.tf b/kind/locals.tf
index 3ce1d8c9..7efac53e 100644
--- a/kind/locals.tf
+++ b/kind/locals.tf
@@ -30,8 +30,7 @@ locals {
         }
         structuredConfig = {
           compactor = {
-            working_directory = "/data/compactor"
-            shared_store      = "aws"
+            shared_store = "aws"
           }
         }
       }
diff --git a/sks/locals.tf b/sks/locals.tf
index a0f1a3f8..e46ffe98 100644
--- a/sks/locals.tf
+++ b/sks/locals.tf
@@ -29,8 +29,7 @@ locals {
         }
         structuredConfig = {
           compactor = {
-            working_directory = "/data/compactor"
-            shared_store      = "s3"
+            shared_store = "s3"
           }
         }
       }