refactor(prometheus): use values ns var

!1

templates/ClusterRoleBinding-prometheus.yaml

@@ -17,4 +17,4 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: prometheus-k8s
-  namespace: monitoring
+  namespace: {{ .Values.nfc_monitoring.prometheus.namespace }}

templates/PodDisruptionBudget-prometheus.yaml

@@ -10,7 +10,7 @@ metadata:
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
   name: prometheus-k8s
-  namespace: monitoring
+  namespace: {{ .Values.nfc_monitoring.prometheus.namespace }}
 spec:
   minAvailable: 1
   selector:

templates/PrometheusRule-alertmanager.yaml

@@ -12,7 +12,7 @@ metadata:
     prometheus: k8s
     role: alert-rules
   name: alertmanager-main-rules
-  namespace: {{ .Values.nfc_monitoring.alert_manager.namespace | quote }}
+  namespace: {{ .Values.nfc_monitoring.prometheus.namespace }}
 spec:
   groups:
   - name: alertmanager.rules

templates/PrometheusRule-grafana-agent.yaml

@@ -11,7 +11,7 @@ metadata:
     prometheus: k8s
     role: grafana-agent-promtail
   name: grafana-agent
-  namespace: monitoring
+  namespace: {{ .Values.nfc_monitoring.prometheus.namespace }}
 spec:
   groups:
   - name: grafana_agent

templates/PrometheusRule-grafana.yaml

@@ -11,7 +11,7 @@ metadata:
     prometheus: k8s
     role: alert-rules
   name: grafana-rules
-  namespace: monitoring
+  namespace: {{ .Values.nfc_monitoring.prometheus.namespace }}
 spec:
   groups:
   - name: GrafanaAlerts

templates/PrometheusRule-kubePrometheus.yaml

@@ -11,7 +11,7 @@ metadata:
     prometheus: k8s
     role: alert-rules
   name: kube-prometheus-rules
-  namespace: monitoring
+  namespace: {{ .Values.nfc_monitoring.prometheus.namespace }}
 spec:
   groups:
   - name: general.rules

templates/PrometheusRule-kubeStateMetrics.yaml

@@ -11,7 +11,7 @@ metadata:
     prometheus: k8s
     role: alert-rules
   name: kube-state-metrics-rules
-  namespace: monitoring
+  namespace: {{ .Values.nfc_monitoring.prometheus.namespace }}
 spec:
   groups:
   - name: kube-state-metrics

templates/PrometheusRule-kubernetesControlPlane.yaml

@@ -10,7 +10,7 @@ metadata:
     prometheus: k8s
     role: alert-rules
   name: kubernetes-monitoring-rules
-  namespace: monitoring
+  namespace: {{ .Values.nfc_monitoring.prometheus.namespace }}
 spec:
   groups:
   - name: kubernetes-apps

templates/PrometheusRule-loki.yaml

@@ -12,7 +12,7 @@ metadata:
     prometheus: k8s
     role: alert-rules
   name: loki
-  namespace: monitoring
+  namespace: {{ .Values.nfc_monitoring.prometheus.namespace }}
 spec:
   groups:
   - name: loki_rules

templates/PrometheusRule-nodeExporter.yaml

@@ -11,7 +11,7 @@ metadata:
     prometheus: k8s
     role: alert-rules
   name: node-exporter-rules
-  namespace: monitoring
+  namespace: {{ .Values.nfc_monitoring.prometheus.namespace }}
 spec:
   groups:
   - name: node-exporter

templates/PrometheusRule-prometheus.yaml

@@ -11,7 +11,7 @@ metadata:
     prometheus: k8s
     role: alert-rules
   name: prometheus-k8s-prometheus-rules
-  namespace: monitoring
+  namespace: {{ .Values.nfc_monitoring.prometheus.namespace }}
 spec:
   groups:
   - name: prometheus

templates/Role-SpecificNamespaces-prometheus.yaml

@@ -90,7 +90,7 @@ items:
       app.kubernetes.io/managed-by: {{ $.Release.Service }}
       app.kubernetes.io/version: {{ $.Chart.Version }}
     name: prometheus-k8s
-    namespace: monitoring
+    namespace: {{ .Values.nfc_monitoring.prometheus.namespace }}
   rules:
   - apiGroups:
     - ""

templates/RoleBinding-Config-prometheus.yaml

@@ -10,7 +10,7 @@ metadata:
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
   name: prometheus-k8s-config
-  namespace: monitoring
+  namespace: {{ .Values.nfc_monitoring.prometheus.namespace }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
@@ -18,4 +18,4 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: prometheus-k8s
-  namespace: monitoring
+  namespace: {{ .Values.nfc_monitoring.prometheus.namespace }}

templates/RoleBinding-SpecificNamespaces-prometheus.yaml

@@ -20,7 +20,7 @@ items:
   subjects:
   - kind: ServiceAccount
     name: prometheus-k8s
-    namespace: monitoring
+    namespace: {{ .Values.nfc_monitoring.prometheus.namespace }}
 
 - apiVersion: rbac.authorization.k8s.io/v1
   kind: RoleBinding
@@ -41,7 +41,7 @@ items:
   subjects:
   - kind: ServiceAccount
     name: prometheus-k8s
-    namespace: monitoring
+    namespace: {{ .Values.nfc_monitoring.prometheus.namespace }}
 
 
 
@@ -64,7 +64,7 @@ items:
   subjects:
   - kind: ServiceAccount
     name: prometheus-k8s
-    namespace: monitoring
+    namespace: {{ .Values.nfc_monitoring.prometheus.namespace }}
 
 
 - apiVersion: rbac.authorization.k8s.io/v1
@@ -86,7 +86,7 @@ items:
   subjects:
   - kind: ServiceAccount
     name: prometheus-k8s
-    namespace: monitoring
+    namespace: {{ .Values.nfc_monitoring.prometheus.namespace }}
 
 - apiVersion: rbac.authorization.k8s.io/v1
   kind: RoleBinding
@@ -107,7 +107,7 @@ items:
   subjects:
   - kind: ServiceAccount
     name: prometheus-k8s
-    namespace: monitoring
+    namespace: {{ .Values.nfc_monitoring.prometheus.namespace }}
 
 - apiVersion: rbac.authorization.k8s.io/v1
   kind: RoleBinding
@@ -128,7 +128,7 @@ items:
   subjects:
   - kind: ServiceAccount
     name: prometheus-k8s
-    namespace: monitoring
+    namespace: {{ .Values.nfc_monitoring.prometheus.namespace }}
 
 
 
@@ -175,7 +175,7 @@ items:
   subjects:
   - kind: ServiceAccount
     name: prometheus-k8s
-    namespace: monitoring
+    namespace: {{ .Values.nfc_monitoring.prometheus.namespace }}
 - apiVersion: rbac.authorization.k8s.io/v1
   kind: RoleBinding
   metadata:
@@ -195,7 +195,7 @@ items:
   subjects:
   - kind: ServiceAccount
     name: prometheus-k8s
-    namespace: monitoring
+    namespace: {{ .Values.nfc_monitoring.prometheus.namespace }}
 - apiVersion: rbac.authorization.k8s.io/v1
   kind: RoleBinding
   metadata:
@@ -215,7 +215,7 @@ items:
   subjects:
   - kind: ServiceAccount
     name: prometheus-k8s
-    namespace: monitoring
+    namespace: {{ .Values.nfc_monitoring.prometheus.namespace }}
 - apiVersion: rbac.authorization.k8s.io/v1
   kind: RoleBinding
   metadata:
@@ -235,7 +235,7 @@ items:
   subjects:
   - kind: ServiceAccount
     name: prometheus-k8s
-    namespace: monitoring
+    namespace: {{ .Values.nfc_monitoring.prometheus.namespace }}
 
 
 

templates/RoleConfig-prometheus.yaml

@@ -10,7 +10,7 @@ metadata:
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
   name: prometheus-k8s-config
-  namespace: monitoring
+  namespace: {{ .Values.nfc_monitoring.prometheus.namespace }}
 rules:
 - apiGroups:
   - ""

templates/Service-prometheus.yaml

@@ -10,7 +10,7 @@ metadata:
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
   name: prometheus-k8s
-  namespace: monitoring
+  namespace: {{ .Values.nfc_monitoring.prometheus.namespace }}
 spec:
   ports:
   - name: web

templates/ServiceAccount-prometheus.yaml

@@ -11,4 +11,4 @@ metadata:
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
   name: prometheus-k8s
-  namespace: monitoring
+  namespace: {{ .Values.nfc_monitoring.prometheus.namespace }}

templates/ServiceMonitor-prometheus.yaml

@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
   name: prometheus-k8s
-  namespace: monitoring
+  namespace: {{ .Values.nfc_monitoring.prometheus.namespace }}
 spec:
   endpoints:
   - interval: 30s

templates/prometheusRule-ceph.yaml

@@ -13,7 +13,7 @@ metadata:
     prometheus: k8s
     role: alert-rules
   name: ceph-rules
-  namespace: monitoring
+  namespace: {{ .Values.nfc_monitoring.prometheus.namespace }}
 spec:
   groups:
   - name: "cluster health"