From 04d9432a469640169b394cfd74cf1e4e17aa9f26 Mon Sep 17 00:00:00 2001
From: Jim Martens <github@2martens.de>
Date: Wed, 8 Nov 2023 09:34:52 +0100
Subject: [PATCH] Replaced namespaces with variable

---
 .../monitoring/templates/thanos-query-deployment.yaml       | 4 ++--
 .../thanos/monitoring/templates/thanos-query-service.yaml   | 2 +-
 .../monitoring/templates/thanos-query-serviceAccount.yaml   | 2 +-
 .../monitoring/templates/thanos-query-serviceMonitor.yaml   | 2 +-
 .../templates/thanos-receive-ingestor-default-service.yaml  | 2 +-
 .../thanos-receive-ingestor-default-statefulSet.yaml        | 6 +++---
 .../templates/thanos-receive-ingestor-serviceAccount.yaml   | 2 +-
 .../templates/thanos-receive-ingestor-serviceMonitor.yaml   | 2 +-
 .../templates/thanos-receive-router-configmap.yaml          | 2 +-
 .../templates/thanos-receive-router-deployment.yaml         | 2 +-
 .../monitoring/templates/thanos-receive-router-service.yaml | 2 +-
 .../templates/thanos-receive-router-serviceAccount.yaml     | 2 +-
 .../thanos/monitoring/templates/thanos-store-service.yaml   | 2 +-
 .../monitoring/templates/thanos-store-serviceAccount.yaml   | 2 +-
 .../monitoring/templates/thanos-store-serviceMonitor.yaml   | 2 +-
 .../monitoring/templates/thanos-store-statefulSet.yaml      | 4 ++--
 16 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/argocd/thanos/monitoring/templates/thanos-query-deployment.yaml b/argocd/thanos/monitoring/templates/thanos-query-deployment.yaml
index 9215460..8d97516 100644
--- a/argocd/thanos/monitoring/templates/thanos-query-deployment.yaml
+++ b/argocd/thanos/monitoring/templates/thanos-query-deployment.yaml
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/name: thanos-query
     app.kubernetes.io/version: v0.31.0
   name: thanos-query
-  namespace: thanos
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: 1
   selector:
@@ -34,7 +34,7 @@ spec:
                   values:
                   - thanos-query
               namespaces:
-              - thanos
+              - {{ .Release.Namespace }}
               topologyKey: kubernetes.io/hostname
             weight: 100
       containers:
diff --git a/argocd/thanos/monitoring/templates/thanos-query-service.yaml b/argocd/thanos/monitoring/templates/thanos-query-service.yaml
index 0dc4a48..e2d1072 100644
--- a/argocd/thanos/monitoring/templates/thanos-query-service.yaml
+++ b/argocd/thanos/monitoring/templates/thanos-query-service.yaml
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/name: thanos-query
     app.kubernetes.io/version: v0.31.0
   name: thanos-query
-  namespace: thanos
+  namespace: {{ .Release.Namespace }}
 spec:
   ports:
   - name: grpc
diff --git a/argocd/thanos/monitoring/templates/thanos-query-serviceAccount.yaml b/argocd/thanos/monitoring/templates/thanos-query-serviceAccount.yaml
index 9a6d701..68ffef0 100644
--- a/argocd/thanos/monitoring/templates/thanos-query-serviceAccount.yaml
+++ b/argocd/thanos/monitoring/templates/thanos-query-serviceAccount.yaml
@@ -8,4 +8,4 @@ metadata:
     app.kubernetes.io/name: thanos-query
     app.kubernetes.io/version: v0.31.0
   name: thanos-query
-  namespace: thanos
+  namespace: {{ .Release.Namespace }}
diff --git a/argocd/thanos/monitoring/templates/thanos-query-serviceMonitor.yaml b/argocd/thanos/monitoring/templates/thanos-query-serviceMonitor.yaml
index 4cffad7..1beeb0a 100644
--- a/argocd/thanos/monitoring/templates/thanos-query-serviceMonitor.yaml
+++ b/argocd/thanos/monitoring/templates/thanos-query-serviceMonitor.yaml
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/name: thanos-query
     app.kubernetes.io/version: v0.31.0
   name: thanos-query
-  namespace: thanos
+  namespace: {{ .Release.Namespace }}
 spec:
   endpoints:
   - port: http
diff --git a/argocd/thanos/monitoring/templates/thanos-receive-ingestor-default-service.yaml b/argocd/thanos/monitoring/templates/thanos-receive-ingestor-default-service.yaml
index 7cd8aca..08b8ba2 100644
--- a/argocd/thanos/monitoring/templates/thanos-receive-ingestor-default-service.yaml
+++ b/argocd/thanos/monitoring/templates/thanos-receive-ingestor-default-service.yaml
@@ -8,7 +8,7 @@ metadata:
     app.kubernetes.io/version: v0.31.0
     controller.receive.thanos.io/hashring: default
   name: thanos-receive-ingestor-default
-  namespace: thanos
+  namespace: {{ .Release.Namespace }}
 spec:
   clusterIP: None
   ports:
diff --git a/argocd/thanos/monitoring/templates/thanos-receive-ingestor-default-statefulSet.yaml b/argocd/thanos/monitoring/templates/thanos-receive-ingestor-default-statefulSet.yaml
index c330e94..8e03bd7 100644
--- a/argocd/thanos/monitoring/templates/thanos-receive-ingestor-default-statefulSet.yaml
+++ b/argocd/thanos/monitoring/templates/thanos-receive-ingestor-default-statefulSet.yaml
@@ -9,7 +9,7 @@ metadata:
     controller.receive.thanos.io: thanos-receive-controller
     controller.receive.thanos.io/hashring: default
   name: thanos-receive-ingestor-default
-  namespace: thanos
+  namespace: {{ .Release.Namespace }}
 spec:
   minReadySeconds: 0
   replicas: 1
@@ -44,7 +44,7 @@ spec:
                   values:
                   - thanos-receive-ingestor-default
               namespaces:
-              - thanos
+              - {{ .Release.Namespace }}
               topologyKey: kubernetes.io/hostname
             weight: 100
           - podAffinityTerm:
@@ -59,7 +59,7 @@ spec:
                   values:
                   - thanos-receive-ingestor-default
               namespaces:
-              - thanos
+              - {{ .Release.Namespace }}
               topologyKey: topology.kubernetes.io/zone
             weight: 100
       containers:
diff --git a/argocd/thanos/monitoring/templates/thanos-receive-ingestor-serviceAccount.yaml b/argocd/thanos/monitoring/templates/thanos-receive-ingestor-serviceAccount.yaml
index d1589c5..f602f8d 100644
--- a/argocd/thanos/monitoring/templates/thanos-receive-ingestor-serviceAccount.yaml
+++ b/argocd/thanos/monitoring/templates/thanos-receive-ingestor-serviceAccount.yaml
@@ -8,4 +8,4 @@ metadata:
     app.kubernetes.io/name: thanos-receive
     app.kubernetes.io/version: v0.31.0
   name: thanos-receive-ingestor
-  namespace: thanos
+  namespace: {{ .Release.Namespace }}
diff --git a/argocd/thanos/monitoring/templates/thanos-receive-ingestor-serviceMonitor.yaml b/argocd/thanos/monitoring/templates/thanos-receive-ingestor-serviceMonitor.yaml
index f5d7297..94e7451 100644
--- a/argocd/thanos/monitoring/templates/thanos-receive-ingestor-serviceMonitor.yaml
+++ b/argocd/thanos/monitoring/templates/thanos-receive-ingestor-serviceMonitor.yaml
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/name: thanos-receive
     app.kubernetes.io/version: v0.31.0
   name: thanos-receive-ingestor
-  namespace: thanos
+  namespace: {{ .Release.Namespace }}
 spec:
   endpoints:
   - port: http
diff --git a/argocd/thanos/monitoring/templates/thanos-receive-router-configmap.yaml b/argocd/thanos/monitoring/templates/thanos-receive-router-configmap.yaml
index c0158a9..05a4e0b 100644
--- a/argocd/thanos/monitoring/templates/thanos-receive-router-configmap.yaml
+++ b/argocd/thanos/monitoring/templates/thanos-receive-router-configmap.yaml
@@ -4,4 +4,4 @@ data:
 kind: ConfigMap
 metadata:
   name: hashring-config
-  namespace: thanos
+  namespace: {{ .Release.Namespace }}
diff --git a/argocd/thanos/monitoring/templates/thanos-receive-router-deployment.yaml b/argocd/thanos/monitoring/templates/thanos-receive-router-deployment.yaml
index 9d5d202..673d3be 100644
--- a/argocd/thanos/monitoring/templates/thanos-receive-router-deployment.yaml
+++ b/argocd/thanos/monitoring/templates/thanos-receive-router-deployment.yaml
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/name: thanos-receive
     app.kubernetes.io/version: v0.31.0
   name: thanos-receive-router
-  namespace: thanos
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: 1
   selector:
diff --git a/argocd/thanos/monitoring/templates/thanos-receive-router-service.yaml b/argocd/thanos/monitoring/templates/thanos-receive-router-service.yaml
index 46eb1ba..a50a4cd 100644
--- a/argocd/thanos/monitoring/templates/thanos-receive-router-service.yaml
+++ b/argocd/thanos/monitoring/templates/thanos-receive-router-service.yaml
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/name: thanos-receive
     app.kubernetes.io/version: v0.31.0
   name: thanos-receive-router
-  namespace: thanos
+  namespace: {{ .Release.Namespace }}
 spec:
   ports:
   - name: grpc
diff --git a/argocd/thanos/monitoring/templates/thanos-receive-router-serviceAccount.yaml b/argocd/thanos/monitoring/templates/thanos-receive-router-serviceAccount.yaml
index f9ad6ef..5c14f4c 100644
--- a/argocd/thanos/monitoring/templates/thanos-receive-router-serviceAccount.yaml
+++ b/argocd/thanos/monitoring/templates/thanos-receive-router-serviceAccount.yaml
@@ -8,4 +8,4 @@ metadata:
     app.kubernetes.io/name: thanos-receive
     app.kubernetes.io/version: v0.31.0
   name: thanos-receive-router
-  namespace: thanos
+  namespace: {{ .Release.Namespace }}
diff --git a/argocd/thanos/monitoring/templates/thanos-store-service.yaml b/argocd/thanos/monitoring/templates/thanos-store-service.yaml
index 2e17fb2..2e74f0c 100644
--- a/argocd/thanos/monitoring/templates/thanos-store-service.yaml
+++ b/argocd/thanos/monitoring/templates/thanos-store-service.yaml
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/name: thanos-store
     app.kubernetes.io/version: v0.31.0
   name: thanos-store
-  namespace: thanos
+  namespace: {{ .Release.Namespace }}
 spec:
   clusterIP: None
   ports:
diff --git a/argocd/thanos/monitoring/templates/thanos-store-serviceAccount.yaml b/argocd/thanos/monitoring/templates/thanos-store-serviceAccount.yaml
index e0b60cb..fc92615 100644
--- a/argocd/thanos/monitoring/templates/thanos-store-serviceAccount.yaml
+++ b/argocd/thanos/monitoring/templates/thanos-store-serviceAccount.yaml
@@ -8,4 +8,4 @@ metadata:
     app.kubernetes.io/name: thanos-store
     app.kubernetes.io/version: v0.31.0
   name: thanos-store
-  namespace: thanos
+  namespace: {{ .Release.Namespace }}
diff --git a/argocd/thanos/monitoring/templates/thanos-store-serviceMonitor.yaml b/argocd/thanos/monitoring/templates/thanos-store-serviceMonitor.yaml
index 3c55f9e..660eb37 100644
--- a/argocd/thanos/monitoring/templates/thanos-store-serviceMonitor.yaml
+++ b/argocd/thanos/monitoring/templates/thanos-store-serviceMonitor.yaml
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/name: thanos-store
     app.kubernetes.io/version: v0.31.0
   name: thanos-store
-  namespace: thanos
+  namespace: {{ .Release.Namespace }}
 spec:
   endpoints:
   - port: http
diff --git a/argocd/thanos/monitoring/templates/thanos-store-statefulSet.yaml b/argocd/thanos/monitoring/templates/thanos-store-statefulSet.yaml
index a1146e9..4632841 100644
--- a/argocd/thanos/monitoring/templates/thanos-store-statefulSet.yaml
+++ b/argocd/thanos/monitoring/templates/thanos-store-statefulSet.yaml
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/name: thanos-store
     app.kubernetes.io/version: v0.31.0
   name: thanos-store
-  namespace: thanos
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: 1
   selector:
@@ -39,7 +39,7 @@ spec:
                   values:
                   - thanos-store
               namespaces:
-              - thanos
+              - {{ .Release.Namespace }}
               topologyKey: kubernetes.io/hostname
             weight: 100
       containers: