Merge branch 'master' into stu203404/spesb-180-Introduce-Helm-Chart

execution/README.md

@@ -98,7 +98,7 @@ kubectl apply -f infrastructure/kafka/service-monitor.yaml
 Other Kafka deployments, for example, using Strimzi, should work in a similar way.
 
 *Please note that currently, even if installed differently, the corresponding services must run at
-*my-confluent-cp-kafka:9092*, *my-confluent-cp-zookeeper:2181* and *my-confluent-cp-schema-registry:8081*.
+`my-confluent-cp-kafka:9092`, `my-confluent-cp-zookeeper:2181` and `my-confluent-cp-schema-registry:8081`.*
 
 #### A Kafka Client Pod
 

execution/helm/templates/dashboard-config-map.yaml → 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:

execution/helm/templates/kafka-client.yaml → 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

execution/helm/templates/service-monitor.yaml → 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:

execution/helm/templates/cluster-role-binding.yaml → 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

execution/helm/templates/cluster-role.yaml → 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:

execution/helm/templates/prometheus-datasource-config-map.yaml → 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:

execution/helm/templates/prometheus.yaml → 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

execution/helm/templates/service-account.yaml → 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