From f67373122f19739ee0ca59f698ed9e38209408d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Henning?= <soeren.henning@email.uni-kiel.de>
Date: Fri, 19 Mar 2021 16:13:42 +0100
Subject: [PATCH] Change Helm dir. structure and prefix resources

---
 .../helm/templates/{ => grafana}/dashboard-config-map.yaml  | 2 +-
 execution/helm/templates/{ => kafka}/kafka-client.yaml      | 2 +-
 execution/helm/templates/{ => kafka}/service-monitor.yaml   | 2 +-
 .../templates/{ => prometheus}/cluster-role-binding.yaml    | 6 +++---
 execution/helm/templates/{ => prometheus}/cluster-role.yaml | 2 +-
 .../datasource-config-map.yaml}                             | 2 +-
 execution/helm/templates/{ => prometheus}/prometheus.yaml   | 2 +-
 .../helm/templates/{ => prometheus}/service-account.yaml    | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)
 rename execution/helm/templates/{ => grafana}/dashboard-config-map.yaml (99%)
 rename execution/helm/templates/{ => kafka}/kafka-client.yaml (87%)
 rename execution/helm/templates/{ => kafka}/service-monitor.yaml (83%)
 rename execution/helm/templates/{ => prometheus}/cluster-role-binding.yaml (61%)
 rename execution/helm/templates/{ => prometheus}/cluster-role.yaml (86%)
 rename execution/helm/templates/{prometheus-datasource-config-map.yaml => prometheus/datasource-config-map.yaml} (94%)
 rename execution/helm/templates/{ => prometheus}/prometheus.yaml (86%)
 rename execution/helm/templates/{ => prometheus}/service-account.yaml (65%)

diff --git a/execution/helm/templates/dashboard-config-map.yaml b/execution/helm/templates/grafana/dashboard-config-map.yaml
similarity index 99%
rename from execution/helm/templates/dashboard-config-map.yaml
rename to execution/helm/templates/grafana/dashboard-config-map.yaml
index 87e588f29..1125d7833 100644
--- a/execution/helm/templates/dashboard-config-map.yaml
+++ b/execution/helm/templates/grafana/dashboard-config-map.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: scalability
+  name: {{ template "theodolite.fullname" . }}-grafana-scalability
   labels:
     grafana_dashboard: "1"
 data:
diff --git a/execution/helm/templates/kafka-client.yaml b/execution/helm/templates/kafka/kafka-client.yaml
similarity index 87%
rename from execution/helm/templates/kafka-client.yaml
rename to execution/helm/templates/kafka/kafka-client.yaml
index 853cb7686..02e16d33d 100644
--- a/execution/helm/templates/kafka-client.yaml
+++ b/execution/helm/templates/kafka/kafka-client.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: Pod
 metadata:
   # name: {{ template "theodolite.fullname" . }}-kafka-client
-  name: kafka-client
+  name: {{ template "theodolite.fullname" . }}-kafka-client
 spec:
   containers:
   - name: kafka-client
diff --git a/execution/helm/templates/service-monitor.yaml b/execution/helm/templates/kafka/service-monitor.yaml
similarity index 83%
rename from execution/helm/templates/service-monitor.yaml
rename to execution/helm/templates/kafka/service-monitor.yaml
index 50e4688cf..68fd5f759 100644
--- a/execution/helm/templates/service-monitor.yaml
+++ b/execution/helm/templates/kafka/service-monitor.yaml
@@ -5,7 +5,7 @@ metadata:
   labels:
     app: cp-kafka
     appScope: titan-ccp
-  name: kafka
+  name: {{ template "theodolite.fullname" . }}-cp-kafka
 spec:
   selector:
     matchLabels:
diff --git a/execution/helm/templates/cluster-role-binding.yaml b/execution/helm/templates/prometheus/cluster-role-binding.yaml
similarity index 61%
rename from execution/helm/templates/cluster-role-binding.yaml
rename to execution/helm/templates/prometheus/cluster-role-binding.yaml
index 400a972cd..f2f167b94 100644
--- a/execution/helm/templates/cluster-role-binding.yaml
+++ b/execution/helm/templates/prometheus/cluster-role-binding.yaml
@@ -2,13 +2,13 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: prometheus
+  name: {{ template "theodolite.fullname" . }}-prometheus
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: prometheus
+  name: {{ template "theodolite.fullname" . }}-prometheus
 subjects:
 - kind: ServiceAccount
-  name: prometheus
+  name: {{ template "theodolite.fullname" . }}-prometheus
   namespace: {{ .Release.Namespace }}
 {{- end}}
\ No newline at end of file
diff --git a/execution/helm/templates/cluster-role.yaml b/execution/helm/templates/prometheus/cluster-role.yaml
similarity index 86%
rename from execution/helm/templates/cluster-role.yaml
rename to execution/helm/templates/prometheus/cluster-role.yaml
index 2a272718d..c2fea2205 100644
--- a/execution/helm/templates/cluster-role.yaml
+++ b/execution/helm/templates/prometheus/cluster-role.yaml
@@ -2,7 +2,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: prometheus
+  name: {{ template "theodolite.fullname" . }}-prometheus
 rules:
 - apiGroups: [""]
   resources:
diff --git a/execution/helm/templates/prometheus-datasource-config-map.yaml b/execution/helm/templates/prometheus/datasource-config-map.yaml
similarity index 94%
rename from execution/helm/templates/prometheus-datasource-config-map.yaml
rename to execution/helm/templates/prometheus/datasource-config-map.yaml
index 4e793ff83..b28157940 100644
--- a/execution/helm/templates/prometheus-datasource-config-map.yaml
+++ b/execution/helm/templates/prometheus/datasource-config-map.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: prometheus
+  name: {{ template "theodolite.fullname" . }}-prometheus
   labels:
     grafana_datasource: "1"
 data:
diff --git a/execution/helm/templates/prometheus.yaml b/execution/helm/templates/prometheus/prometheus.yaml
similarity index 86%
rename from execution/helm/templates/prometheus.yaml
rename to execution/helm/templates/prometheus/prometheus.yaml
index a3060798a..4e297b202 100644
--- a/execution/helm/templates/prometheus.yaml
+++ b/execution/helm/templates/prometheus/prometheus.yaml
@@ -4,7 +4,7 @@ kind: Prometheus
 metadata:
   name: {{ template "theodolite.fullname" . }}-prometheus
 spec:
-  serviceAccountName: prometheus
+  serviceAccountName: {{ template "theodolite.fullname" . }}-prometheus
   serviceMonitorSelector:
     matchLabels:
       #app: cp-kafka
diff --git a/execution/helm/templates/service-account.yaml b/execution/helm/templates/prometheus/service-account.yaml
similarity index 65%
rename from execution/helm/templates/service-account.yaml
rename to execution/helm/templates/prometheus/service-account.yaml
index 2e14c8eb8..090284a0c 100644
--- a/execution/helm/templates/service-account.yaml
+++ b/execution/helm/templates/prometheus/service-account.yaml
@@ -2,5 +2,5 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: prometheus
+  name: {{ template "theodolite.fullname" . }}-prometheus
 {{- end}}
\ No newline at end of file
-- 
GitLab