From 4f0976fdbd80be747818174e8dc0ceabc67dfaa8 Mon Sep 17 00:00:00 2001
From: Charlie Nederhoed <Whyeasy@users.noreply.github.com>
Date: Fri, 7 Aug 2020 08:41:56 +0200
Subject: [PATCH] Move ruler rules to seperate folder (#3323)

Removing subpaths from deployments.
---
 bitnami/thanos/templates/bucketweb/deployment.yaml     | 1 -
 bitnami/thanos/templates/compactor/deployment.yaml     | 1 -
 bitnami/thanos/templates/querier/deployment.yaml       | 1 -
 bitnami/thanos/templates/ruler/statefulset.yaml        | 6 ++----
 bitnami/thanos/templates/storegateway/statefulset.yaml | 1 -
 5 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/bitnami/thanos/templates/bucketweb/deployment.yaml b/bitnami/thanos/templates/bucketweb/deployment.yaml
index 384e1aa46..42c10734b 100644
--- a/bitnami/thanos/templates/bucketweb/deployment.yaml
+++ b/bitnami/thanos/templates/bucketweb/deployment.yaml
@@ -83,7 +83,6 @@ spec:
               mountPath: /conf
               {{- else }}
               mountPath: /conf/objstore.yml
-              subPath: objstore.yml
               {{- end }}
       volumes:
         - name: objstore-config
diff --git a/bitnami/thanos/templates/compactor/deployment.yaml b/bitnami/thanos/templates/compactor/deployment.yaml
index 2a89a88d0..ddd8a138c 100644
--- a/bitnami/thanos/templates/compactor/deployment.yaml
+++ b/bitnami/thanos/templates/compactor/deployment.yaml
@@ -101,7 +101,6 @@ spec:
               mountPath: /conf
               {{- else }}
               mountPath: /conf/objstore.yml
-              subPath: objstore.yml
               {{- end }}
             - name: data
               mountPath: /data
diff --git a/bitnami/thanos/templates/querier/deployment.yaml b/bitnami/thanos/templates/querier/deployment.yaml
index 7ecebc507..723b84984 100644
--- a/bitnami/thanos/templates/querier/deployment.yaml
+++ b/bitnami/thanos/templates/querier/deployment.yaml
@@ -110,7 +110,6 @@ spec:
       {{- if or (include "thanos.querier.createSDConfigmap" .) .Values.querier.existingSDConfigmap }}
             - name: sd-config
               mountPath: /conf/servicediscovery.yml
-              subPath: servicediscovery.yml
       {{- end }}
       {{- if .Values.querier.grpcTLS.server.secure }}
             - name: tls-server
diff --git a/bitnami/thanos/templates/ruler/statefulset.yaml b/bitnami/thanos/templates/ruler/statefulset.yaml
index 43ca73c3f..d4f66303e 100644
--- a/bitnami/thanos/templates/ruler/statefulset.yaml
+++ b/bitnami/thanos/templates/ruler/statefulset.yaml
@@ -88,7 +88,7 @@ spec:
             - --label=ruler_cluster="{{ .Values.ruler.clusterName }}"
             - --alert.label-drop="replica"
             - --objstore.config-file=/conf/objstore.yml
-            - --rule-file=/conf/ruler.yml
+            - --rule-file=/conf/rules/ruler.yml
             {{- range .Values.ruler.queries }}
             - --query={{ . }}
             {{- end }}
@@ -118,14 +118,12 @@ spec:
           {{- end }}
           volumeMounts:
             - name: ruler-config
-              mountPath: /conf/ruler.yml
-              subPath: ruler.yml
+              mountPath: /conf/rules/ruler.yml
             - name: objstore-config
               {{- if .Values.existingObjstoreSecretItems }}
               mountPath: /conf
               {{- else }}
               mountPath: /conf/objstore.yml
-              subPath: objstore.yml
               {{- end }}
             - name: data
               mountPath: /data
diff --git a/bitnami/thanos/templates/storegateway/statefulset.yaml b/bitnami/thanos/templates/storegateway/statefulset.yaml
index 91733ca7b..afa5db1c3 100644
--- a/bitnami/thanos/templates/storegateway/statefulset.yaml
+++ b/bitnami/thanos/templates/storegateway/statefulset.yaml
@@ -102,7 +102,6 @@ spec:
               mountPath: /conf
               {{- else }}
               mountPath: /conf/objstore.yml
-              subPath: objstore.yml
               {{- end }}
             - name: data
               mountPath: /data