feat(labels): lables moved to values.yaml

!4

templates/APIService-prometheus-adapter.yaml

@@ -3,9 +3,7 @@ apiVersion: apiregistration.k8s.io/v1
 kind: APIService
 metadata:
   labels:
-    app.kubernetes.io/component: metrics-adapter
+    {{ toYaml $.Values.nfc_monitoring.prometheus_adaptor.labels | nindent 4 }}
-    app.kubernetes.io/instance: main
-    app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}

templates/AlertManager-k8s.yaml

@@ -3,9 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: Alertmanager
 metadata:
   labels:
-    app.kubernetes.io/instance: main
+    {{ toYaml $.Values.nfc_monitoring.alert_manager.labels | nindent 4 }}
-    app.kubernetes.io/component: alert-router
-    app.kubernetes.io/name: alertmanager
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}

templates/ClusterPolicy-Prometheus-Role.yaml

@@ -14,8 +14,7 @@ metadata:
       monitoring instances is created to enable monitoring of  the namespace in
       question.
   labels:
-    app.kubernetes.io/component: prometheus
+    {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 4 }}
-    app.kubernetes.io/name: prometheus
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
@@ -38,9 +37,7 @@ spec:
         data:
           metadata:
             labels:
-              app.kubernetes.io/component: prometheus
+              {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 14 }}
-              app.kubernetes.io/instance: k8s
-              app.kubernetes.io/name: prometheus
               app.kubernetes.io/part-of: {{ $.Chart.Name }}
               app.kubernetes.io/version: {{ $.Chart.Version }}
             

templates/ClusterPolicy-Prometheus-RoleBinding.yaml

@@ -14,8 +14,7 @@ metadata:
       monitoring instances is created to enable monitoring of  the namespace in
       question.
   labels:
-    app.kubernetes.io/component: prometheus
+    {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 4 }}
-    app.kubernetes.io/name: prometheus
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
@@ -38,8 +37,7 @@ spec:
         data:
           metadata:
             labels:
-              app.kubernetes.io/component: prometheus
+              {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 14 }}
-              app.kubernetes.io/name: prometheus
               app.kubernetes.io/part-of: {{ $.Chart.Name }}
               app.kubernetes.io/version: {{ $.Chart.Version }}
           roleRef:

templates/ClusterRole-GrafanaAgent.yaml

@@ -4,9 +4,7 @@ kind: ClusterRole
 metadata:
   name: grafana-agent
   labels:
-    app.kubernetes.io/instance: k8s
+    {{ toYaml $.Values.nfc_monitoring.grafana_agent.labels | nindent 4 }}
-    app.kubernetes.io/component: exporter
-    app.kubernetes.io/name: grafana-agent
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/version: {{ $.Chart.Version }}

templates/ClusterRole-aggregated-metrics-reader.yaml

@@ -3,9 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
-    app.kubernetes.io/component: metrics-adapter
+    {{ toYaml $.Values.nfc_monitoring.prometheus_adaptor.labels | nindent 4 }}
-    app.kubernetes.io/instance: main
-    app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}

templates/ClusterRole-binding-delegator-prometheus-adaptor.yaml

@@ -3,8 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   labels:
-    app.kubernetes.io/component: metrics-adapter
+    {{ toYaml $.Values.nfc_monitoring.prometheus_adaptor.labels | nindent 4 }}
-    app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}

templates/ClusterRole-binding-hpa-custom-metrics-prometheus-adaptor.yaml

@@ -4,8 +4,7 @@ kind: ClusterRoleBinding
 metadata:
   name: hpa-controller-custom-metrics
   labels:
-    app.kubernetes.io/component: metrics-adapter
+    {{ toYaml $.Values.nfc_monitoring.prometheus_adaptor.labels | nindent 4 }}
-    app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}

templates/ClusterRole-binding-prometheus.yaml

@@ -3,8 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   labels:
-    app.kubernetes.io/component: metrics-adapter
+    {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 4 }}
-    app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}

templates/ClusterRole-grafana-SideCar.yaml

@@ -4,9 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
-    app.kubernetes.io/component: graphing
+    {{ toYaml $.Values.nfc_monitoring.grafana.labels | nindent 4 }}
-    app.kubernetes.io/instance: k8s
-    app.kubernetes.io/name: grafana
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/version: {{ $.Chart.Version }}

templates/ClusterRole-metrics-server-resources-prometheus-adaptor.yaml

@@ -3,8 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
-    app.kubernetes.io/component: metrics-adapter
+    {{ toYaml $.Values.nfc_monitoring.prometheus_adaptor.labels | nindent 4 }}
-    app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}

templates/ClusterRole-prometheus-adapter.yaml

@@ -3,9 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
-    app.kubernetes.io/component: metrics-adapter
+    {{ toYaml $.Values.nfc_monitoring.prometheus_adaptor.labels | nindent 4 }}
-    app.kubernetes.io/instance: main
-    app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}

templates/ClusterRole-prometheus.yaml

@@ -3,9 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
-    app.kubernetes.io/component: prometheus
+    {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 4 }}
-    app.kubernetes.io/instance: k8s
-    app.kubernetes.io/name: prometheus
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}

templates/ClusterRoleBinding-Grafana-Agent.yaml

@@ -3,9 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   labels:
-    app.kubernetes.io/instance: k8s
+    {{ toYaml $.Values.nfc_monitoring.grafana_agent.labels | nindent 4 }}
-    app.kubernetes.io/component: exporter
-    app.kubernetes.io/name: grafana-agent
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/version: {{ $.Chart.Version }}

templates/ClusterRoleBinding-Grafana-SideCar.yaml

@@ -4,9 +4,7 @@ kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   labels:
-    app.kubernetes.io/component: graphing
+    {{ toYaml $.Values.nfc_monitoring.grafana.labels | nindent 4 }}
-    app.kubernetes.io/instance: k8s
-    app.kubernetes.io/name: grafana
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/version: {{ $.Chart.Version }}

templates/ClusterRoleBinding-prometheus.yaml

@@ -3,9 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   labels:
-    app.kubernetes.io/component: prometheus
+    {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 4 }}
-    app.kubernetes.io/instance: k8s
-    app.kubernetes.io/name: prometheus
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}

templates/ConfigMap-Grafana.yaml

@@ -5,9 +5,7 @@ metadata:
   name: grafana-config
   namespace: "{{ .Values.nfc_monitoring.grafana.namespace }}"
   labels:
-    app.kubernetes.io/component: graphing
+    {{ toYaml $.Values.nfc_monitoring.grafana.labels | nindent 4 }}
-    app.kubernetes.io/instance: k8s
-    app.kubernetes.io/name: grafana
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
@@ -50,9 +48,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   labels:
-    app.kubernetes.io/component: graphing
+    {{ toYaml $.Values.nfc_monitoring.grafana.labels | nindent 4 }}
-    app.kubernetes.io/instance: k8s
-    app.kubernetes.io/name: grafana
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/version: {{ $.Chart.Version }}

templates/ConfigMap-GrafanaAgent.yaml

@@ -3,9 +3,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   labels:
-    app.kubernetes.io/instance: k8s
+    {{ toYaml $.Values.nfc_monitoring.grafana_agent.labels | nindent 4 }}
-    app.kubernetes.io/component: exporter
-    app.kubernetes.io/name: grafana-agent
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/version: {{ $.Chart.Version }}

templates/ConfigMap-GrafanaProvisioning.yaml

@@ -5,9 +5,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   labels:
-    app.kubernetes.io/component: graphing
+    {{ toYaml $.Values.nfc_monitoring.grafana.labels | nindent 4 }}
-    app.kubernetes.io/instance: k8s
-    app.kubernetes.io/name: grafana
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/version: {{ $.Chart.Version }}

templates/ConfigMap-prometheus-adapter.yaml

@@ -3,9 +3,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   labels:
-    app.kubernetes.io/component: metrics-adapter
+    {{ toYaml $.Values.nfc_monitoring.prometheus_adaptor.labels | nindent 4 }}
-    app.kubernetes.io/instance: main
-    app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/version: {{ $.Chart.Version }}

templates/Daemonset-GrafanaAgent.yaml

@@ -3,9 +3,7 @@ apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   labels:
-    app.kubernetes.io/instance: k8s
+    {{ toYaml $.Values.nfc_monitoring.grafana_agent.labels | nindent 4 }}
-    app.kubernetes.io/component: exporter
-    app.kubernetes.io/name: grafana-agent
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
@@ -17,9 +15,7 @@ metadata:
 spec:
   selector:
     matchLabels:
-      app.kubernetes.io/instance: k8s
+      {{ toYaml $.Values.nfc_monitoring.grafana_agent.labels | nindent 6 }}
-      app.kubernetes.io/component: exporter
-      app.kubernetes.io/name: grafana-agent
       app.kubernetes.io/managed-by: {{ $.Release.Service }}
       app.kubernetes.io/part-of: {{ $.Chart.Name }}
       app.kubernetes.io/version: {{ $.Chart.Version }}
@@ -29,9 +25,7 @@ spec:
   template:
     metadata:
       labels:
-        app.kubernetes.io/instance: k8s
+        {{ toYaml $.Values.nfc_monitoring.grafana_agent.labels | nindent 8 }}
-        app.kubernetes.io/component: exporter
-        app.kubernetes.io/name: grafana-agent
         app.kubernetes.io/managed-by: {{ $.Release.Service }}
         app.kubernetes.io/part-of: {{ $.Chart.Name }}
         app.kubernetes.io/version: {{ $.Chart.Version }}

templates/Deployment-prometheus-adapter.yaml

@@ -3,9 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    app.kubernetes.io/component: metrics-adapter
+    {{ toYaml $.Values.nfc_monitoring.prometheus_adaptor.labels | nindent 4 }}
-    app.kubernetes.io/instance: main
-    app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
@@ -15,9 +13,7 @@ spec:
   replicas: 2
   selector:
     matchLabels:
-      app.kubernetes.io/component: metrics-adapter
+      {{ toYaml $.Values.nfc_monitoring.prometheus_adaptor.labels | nindent 6 }}
-      app.kubernetes.io/instance: main
-      app.kubernetes.io/name: prometheus-adapter
       app.kubernetes.io/part-of: {{ $.Chart.Name }}
       app.kubernetes.io/managed-by: {{ $.Release.Service }}
       app.kubernetes.io/version: {{ $.Chart.Version }}
@@ -28,9 +24,7 @@ spec:
   template:
     metadata:
       labels:
-        app.kubernetes.io/component: metrics-adapter
+        {{ toYaml $.Values.nfc_monitoring.prometheus_adaptor.labels | nindent 8 }}
-        app.kubernetes.io/instance: main
-        app.kubernetes.io/name: prometheus-adapter
         app.kubernetes.io/part-of: {{ $.Chart.Name }}
         app.kubernetes.io/managed-by: {{ $.Release.Service }}
         app.kubernetes.io/version: {{ $.Chart.Version }}

templates/Grafana-Grafana.yaml

@@ -3,9 +3,7 @@ apiVersion: grafana.integreatly.org/v1beta1
 kind: Grafana
 metadata:
   labels:
-    app.kubernetes.io/component: graphing
+    {{ toYaml $.Values.nfc_monitoring.grafana.labels | nindent 4 }}
-    app.kubernetes.io/instance: k8s
-    app.kubernetes.io/name: grafana
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
@@ -23,9 +21,7 @@ spec:
   deployment:
     metadata:
       labels:
-        app.kubernetes.io/component: graphing
+        {{ toYaml $.Values.nfc_monitoring.grafana.labels | nindent 8 }}
-        app.kubernetes.io/instance: k8s
-        app.kubernetes.io/name: grafana
         app.kubernetes.io/managed-by: {{ $.Release.Service }}
         app.kubernetes.io/part-of: {{ $.Chart.Name }}
         app.kubernetes.io/version: {{ $.Chart.Version }}
@@ -33,9 +29,7 @@ spec:
       replicas: {{ .Values.nfc_monitoring.grafana.replicas | int }}
       selector:
         matchLabels:
-          app.kubernetes.io/component: graphing
+          {{ toYaml $.Values.nfc_monitoring.grafana.labels | nindent 10 }}
-          app.kubernetes.io/instance: k8s
-          app.kubernetes.io/name: grafana
           app.kubernetes.io/managed-by: {{ $.Release.Service }}
           app.kubernetes.io/part-of: {{ $.Chart.Name }}
       strategy:
@@ -45,9 +39,7 @@ spec:
       template:
         metadata:
           labels:
-            app.kubernetes.io/component: graphing
+            {{ toYaml $.Values.nfc_monitoring.grafana.labels | nindent 12 }}
-            app.kubernetes.io/instance: k8s
-            app.kubernetes.io/name: grafana
             app.kubernetes.io/managed-by: {{ $.Release.Service }}
             app.kubernetes.io/part-of: {{ $.Chart.Name }}
             app.kubernetes.io/version: {{ $.Chart.Version }}

templates/GrafanaDatasources.yaml

@@ -18,9 +18,7 @@ items:
     spec:
       instanceSelector:
         matchLabels:
-          app.kubernetes.io/component: graphing
+          {{ toYaml $.Values.nfc_monitoring.grafana.labels | nindent 10 }}
-          app.kubernetes.io/instance: k8s
-          app.kubernetes.io/name: grafana
       allowCrossNamespaceImport: true
       datasource:
         {{ toYaml . | nindent 8 }}

templates/PodDisruptionBudget-alertmanager.yaml

@@ -3,9 +3,7 @@ apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   labels:
-    app.kubernetes.io/component: alert-router
+    {{ toYaml $.Values.nfc_monitoring.alert_manager.labels | nindent 4 }}
-    app.kubernetes.io/instance: main
-    app.kubernetes.io/name: alertmanager
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
@@ -15,7 +13,5 @@ spec:
   maxUnavailable: 1
   selector:
     matchLabels:
-      app.kubernetes.io/component: alert-router
+      {{ toYaml $.Values.nfc_monitoring.alert_manager.labels | nindent 6 }}
-      app.kubernetes.io/instance: main
-      app.kubernetes.io/name: alertmanager
       app.kubernetes.io/part-of: {{ $.Chart.Name }}

templates/PodDisruptionBudget-prometheus-adapter.yaml

@@ -3,9 +3,7 @@ apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   labels:
-    app.kubernetes.io/component: metrics-adapter
+    {{ toYaml $.Values.nfc_monitoring.prometheus_adaptor.labels | nindent 4 }}
-    app.kubernetes.io/instance: main
-    app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
@@ -15,7 +13,5 @@ spec:
   minAvailable: 1
   selector:
     matchLabels:
-      app.kubernetes.io/component: metrics-adapter
+      {{ toYaml $.Values.nfc_monitoring.prometheus_adaptor.labels | nindent 6 }}
-      app.kubernetes.io/instance: main
-      app.kubernetes.io/name: prometheus-adapter
       app.kubernetes.io/part-of: {{ $.Chart.Name }}

templates/PodDisruptionBudget-prometheus.yaml

@@ -3,9 +3,7 @@ apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   labels:
-    app.kubernetes.io/component: prometheus
+    {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 4 }}
-    app.kubernetes.io/instance: k8s
-    app.kubernetes.io/name: prometheus
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
@@ -15,6 +13,5 @@ spec:
   minAvailable: 1
   selector:
     matchLabels:
-      app.kubernetes.io/component: prometheus
+      {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 6 }}
-      app.kubernetes.io/instance: k8s
       app.kubernetes.io/part-of: {{ $.Chart.Name }}

templates/Prometheus-prometheus.yaml

@@ -3,8 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: Prometheus
 metadata:
   labels:
-    app.kubernetes.io/component: prometheus
+    {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 4 }}
-    app.kubernetes.io/name: prometheus
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
@@ -26,9 +25,7 @@ spec:
     kubernetes.io/os: linux
   podMetadata:
     labels:
-      app.kubernetes.io/component: prometheus
+      {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 6 }}
-      app.kubernetes.io/instance: k8s
-      app.kubernetes.io/name: prometheus
       app.kubernetes.io/part-of: {{ $.Chart.Name }}
       app.kubernetes.io/managed-by: {{ $.Release.Service }}
       app.kubernetes.io/version: {{ $.Chart.Version }}

templates/PrometheusRule-alertmanager.yaml

@@ -3,9 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   labels:
-    app.kubernetes.io/component: alert-router
+    {{ toYaml $.Values.nfc_monitoring.alert_manager.labels | nindent 4 }}
-    app.kubernetes.io/instance: main
-    app.kubernetes.io/name: alertmanager
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}

templates/PrometheusRule-grafana-agent.yaml

@@ -3,8 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   labels:
-    app.kubernetes.io/component: exporter
+    {{ toYaml $.Values.nfc_monitoring.grafana_agent.labels | nindent 4 }}
-    app.kubernetes.io/name: grafana-agent
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}

templates/PrometheusRule-grafana.yaml

@@ -3,8 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   labels:
-    app.kubernetes.io/component: grafana
+    {{ toYaml $.Values.nfc_monitoring.grafana.labels | nindent 4 }}
-    app.kubernetes.io/name: grafana
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}

templates/PrometheusRule-prometheus.yaml

@@ -3,8 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   labels:
-    app.kubernetes.io/component: prometheus
+    {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 4 }}
-    app.kubernetes.io/name: prometheus
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}

templates/Role-SpecificNamespaces-prometheus.yaml

@@ -7,9 +7,7 @@ items:
   kind: Role
   metadata:
     labels:
-      app.kubernetes.io/component: prometheus
+      {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 6 }}
-      app.kubernetes.io/instance: k8s
-      app.kubernetes.io/name: prometheus
       app.kubernetes.io/part-of: {{ $.Chart.Name }}
       app.kubernetes.io/managed-by: {{ $.Release.Service }}
       app.kubernetes.io/version: {{ $.Chart.Version }}

templates/RoleBinding-Config-prometheus.yaml

@@ -3,9 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   labels:
-    app.kubernetes.io/component: prometheus
+    {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 4 }}
-    app.kubernetes.io/instance: k8s
-    app.kubernetes.io/name: prometheus
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}

templates/RoleBinding-SpecificNamespaces-prometheus.yaml

@@ -6,9 +6,7 @@ items:
   kind: RoleBinding
   metadata:
     labels:
-      app.kubernetes.io/component: prometheus
+      {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 6 }}
-      app.kubernetes.io/instance: k8s
-      app.kubernetes.io/name: prometheus
       app.kubernetes.io/part-of: {{ $.Chart.Name }}
       app.kubernetes.io/managed-by: {{ $.Release.Service }}
       app.kubernetes.io/version: {{ $.Chart.Version }}

templates/RoleBinding-prometheus-adapter-auth-reader.yaml

@@ -3,8 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   labels:
-    app.kubernetes.io/component: metrics-adapter
+    {{ toYaml $.Values.nfc_monitoring.prometheus_adaptor.labels | nindent 4 }}
-    app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/version: 0.11.1
   name: resource-metrics-auth-reader
   namespace: kube-system

templates/RoleConfig-prometheus.yaml

@@ -3,9 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   labels:
-    app.kubernetes.io/component: prometheus
+    {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 4 }}
-    app.kubernetes.io/instance: k8s
-    app.kubernetes.io/name: prometheus
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}

templates/Secret-alertmanager.yaml

@@ -3,9 +3,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   labels:
-    app.kubernetes.io/component: alert-router
+    {{ toYaml $.Values.nfc_monitoring.alert_manager.labels | nindent 4 }}
-    app.kubernetes.io/instance: main
-    app.kubernetes.io/name: alertmanager
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}

templates/Secret-prometheus-sidecar-thanos.yaml

@@ -3,6 +3,11 @@
 apiVersion: v1
 kind: Secret
 metadata:
+  labels:
+    {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 4 }}
+    app.kubernetes.io/part-of: {{ $.Chart.Name }}
+    app.kubernetes.io/managed-by: {{ $.Release.Service }}
+    app.kubernetes.io/version: {{ $.Chart.Version }}
   name: thanos-sidecar-config
   namespace: monitoring
 type: Opaque

templates/Service-Grafana.yaml

@@ -6,17 +6,13 @@ metadata:
   name: grafana
   namespace: {{ .Values.nfc_monitoring.grafana.namespace }}
   labels:
-    app.kubernetes.io/component: graphing
+    {{ toYaml $.Values.nfc_monitoring.grafana.labels | nindent 4 }}
-    app.kubernetes.io/instance: k8s
-    app.kubernetes.io/name: grafana
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
 spec:
   selector:
-    app.kubernetes.io/component: graphing
+    {{ toYaml $.Values.nfc_monitoring.grafana.labels | nindent 4 }}
-    app.kubernetes.io/instance: k8s
-    app.kubernetes.io/name: grafana
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
   #type: NodePort
   #type: LoadBalancer

templates/Service-GrafanaAgent.yaml

@@ -5,17 +5,13 @@ metadata:
   name: grafana-agent
   namespace: monitoring
   labels:
-    app.kubernetes.io/instance: k8s
+    {{ toYaml $.Values.nfc_monitoring.grafana_agent.labels | nindent 4 }}
-    app.kubernetes.io/component: exporter
-    app.kubernetes.io/name: grafana-agent
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
 spec:
   selector:
-    app.kubernetes.io/instance: k8s
+    {{ toYaml $.Values.nfc_monitoring.grafana_agent.labels | nindent 4 }}
-    app.kubernetes.io/component: exporter
-    app.kubernetes.io/name: grafana-agent
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
   ports:
     - name: grafana-metrics

templates/Service-alertmanager.yaml

@@ -3,9 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    app.kubernetes.io/component: alert-router
+    {{ toYaml $.Values.nfc_monitoring.alert_manager.labels | nindent 4 }}
-    app.kubernetes.io/instance: main
-    app.kubernetes.io/name: alertmanager
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}

templates/Service-prometheus-adapter.yaml

@@ -3,9 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    app.kubernetes.io/component: metrics-adapter
+    {{ toYaml $.Values.nfc_monitoring.prometheus_adaptor.labels | nindent 4 }}
-    app.kubernetes.io/instance: main
-    app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
@@ -17,7 +15,5 @@ spec:
     port: 443
     targetPort: 6443
   selector:
-    app.kubernetes.io/component: metrics-adapter
+    {{ toYaml $.Values.nfc_monitoring.prometheus_adaptor.labels | nindent 4 }}
-    app.kubernetes.io/instance: main
-    app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/part-of: {{ $.Chart.Name }}

templates/Service-prometheus.yaml

@@ -3,9 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    app.kubernetes.io/component: prometheus
+    {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 4 }}
-    app.kubernetes.io/instance: k8s
-    app.kubernetes.io/name: prometheus
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
@@ -20,9 +18,7 @@ spec:
     port: 8080
     targetPort: reloader-web
   selector:
-    app.kubernetes.io/component: prometheus
+    {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 4 }}
-    app.kubernetes.io/instance: k8s
-    app.kubernetes.io/name: prometheus
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
   sessionAffinity: ClientIP
 
@@ -51,9 +47,6 @@ spec:
     port: 10902
     targetPort: 10902
   selector:
-    app.kubernetes.io/component: prometheus
+    {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 4 }}
-    app.kubernetes.io/instance: k8s
-    app.kubernetes.io/name: prometheus
-    app.kubernetes.io/part-of: {{ $.Chart.Name }}
 
 {{ end }}

templates/ServiceAccount-Grafana.yaml

@@ -6,9 +6,7 @@ metadata:
   name: grafana
   namespace: {{ .Values.nfc_monitoring.grafana.namespace }}
   labels:
-    app.kubernetes.io/component: graphing
+    {{ toYaml $.Values.nfc_monitoring.grafana.labels | nindent 4 }}
-    app.kubernetes.io/instance: k8s
-    app.kubernetes.io/name: grafana
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/version: {{ $.Chart.Version }}

templates/ServiceAccount-GrafanaAgent.yaml

@@ -6,9 +6,7 @@ metadata:
   name: grafana-agent
   namespace: monitoring
   labels:
-    app.kubernetes.io/instance: k8s
+    {{ toYaml $.Values.nfc_monitoring.grafana_agent.labels | nindent 4 }}
-    app.kubernetes.io/component: exporter
-    app.kubernetes.io/name: grafana-agent
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/version: {{ $.Chart.Version }}

templates/ServiceAccount-alertmanager.yaml

@@ -4,9 +4,7 @@ automountServiceAccountToken: false
 kind: ServiceAccount
 metadata:
   labels:
-    app.kubernetes.io/component: alert-router
+    {{ toYaml $.Values.nfc_monitoring.alert_manager.labels | nindent 4 }}
-    app.kubernetes.io/instance: main
-    app.kubernetes.io/name: alertmanager
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}

templates/ServiceAccount-prometheus-adapter.yaml

@@ -4,9 +4,7 @@ automountServiceAccountToken: false
 kind: ServiceAccount
 metadata:
   labels:
-    app.kubernetes.io/component: metrics-adapter
+    {{ toYaml $.Values.nfc_monitoring.prometheus_adaptor.labels | nindent 4 }}
-    app.kubernetes.io/instance: main
-    app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}

templates/ServiceAccount-prometheus.yaml

@@ -4,9 +4,7 @@ automountServiceAccountToken: true
 kind: ServiceAccount
 metadata:
   labels:
-    app.kubernetes.io/component: prometheus
+    {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 4 }}
-    app.kubernetes.io/instance: k8s
-    app.kubernetes.io/name: prometheus
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}

templates/ServiceMonitor-Grafana.yaml

@@ -3,9 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   labels:
-    app.kubernetes.io/component: graphing
+    {{ toYaml $.Values.nfc_monitoring.grafana.labels | nindent 4 }}
-    app.kubernetes.io/instance: k8s
-    app.kubernetes.io/name: grafana
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
@@ -31,7 +29,5 @@ spec:
   jobLabel: app.kubernetes.io/name
   selector:
     matchLabels:
-      app.kubernetes.io/component: graphing
+      {{ toYaml $.Values.nfc_monitoring.grafana.labels | nindent 6 }}
-      app.kubernetes.io/instance: k8s
-      app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: {{ $.Chart.Name }}

templates/ServiceMonitor-Node.yaml

@@ -73,7 +73,5 @@ spec:
         regex: '(promtail_).*'
   selector:
     matchLabels:
-      app.kubernetes.io/instance: k8s
+      {{ toYaml $.Values.nfc_monitoring.grafana_agent.labels | nindent 6 }}
-      app.kubernetes.io/component: exporter
-      app.kubernetes.io/name: grafana-agent
       app.kubernetes.io/part-of: {{ $.Chart.Name }}

templates/ServiceMonitor-node-exporter.yaml

@@ -38,7 +38,5 @@ spec:
       insecureSkipVerify: true
   selector:
     matchLabels:
-      app.kubernetes.io/instance: k8s
+      {{ toYaml $.Values.nfc_monitoring.grafana_agent.labels | nindent 6 }}
-      app.kubernetes.io/component: exporter
-      app.kubernetes.io/name: grafana-agent
       app.kubernetes.io/part-of: {{ $.Chart.Name }}

templates/ServiceMonitor-prometheus-adapter.yaml

@@ -3,9 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   labels:
-    app.kubernetes.io/component: metrics-adapter
+    {{ toYaml $.Values.nfc_monitoring.prometheus_adaptor.labels | nindent 4 }}
-    app.kubernetes.io/instance: main
-    app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
@@ -33,7 +31,5 @@ spec:
       insecureSkipVerify: true
   selector:
     matchLabels:
-      app.kubernetes.io/component: metrics-adapter
+      {{ toYaml $.Values.nfc_monitoring.prometheus_adaptor.labels | nindent 6 }}
-      app.kubernetes.io/instance: main
-      app.kubernetes.io/name: prometheus-adapter
       app.kubernetes.io/part-of: {{ $.Chart.Name }}

templates/ServiceMonitor-prometheus.yaml

@@ -3,8 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   labels:
-    app.kubernetes.io/component: prometheus
+    {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 4 }}
-    app.kubernetes.io/name: prometheus
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
@@ -25,9 +24,7 @@ spec:
     port: reloader-web
   selector:
     matchLabels:
-      app.kubernetes.io/component: prometheus
+      {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 6 }}
-      app.kubernetes.io/instance: k8s
-      app.kubernetes.io/name: prometheus
       app.kubernetes.io/part-of: {{ $.Chart.Name }}
 
 {{ if .Values.nfc_monitoring.thanos.sidecar.enabled }}

templates/serviceMonitor-alertmanager.yaml

@@ -3,9 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   labels:
-    app.kubernetes.io/component: alert-router
+    {{ toYaml $.Values.nfc_monitoring.alert_manager.labels | nindent 4 }}
-    app.kubernetes.io/instance: main
-    app.kubernetes.io/name: alertmanager
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
@@ -23,7 +21,5 @@ spec:
     - "{{ .Values.nfc_monitoring.alert_manager.namespace }}"
   selector:
     matchLabels:
-      app.kubernetes.io/component: alert-router
+      {{ toYaml $.Values.nfc_monitoring.alert_manager.labels | nindent 6 }}
-      app.kubernetes.io/instance: main
-      app.kubernetes.io/name: alertmanager
       app.kubernetes.io/part-of: {{ $.Chart.Name }}

values.yaml

@@ -15,6 +15,12 @@ nfc_monitoring:
     image: 
       name: quay.io/prometheus/alertmanager
       tag: 'v0.26.0'
+    
+    labels:
+      app.kubernetes.io/instance: main
+      app.kubernetes.io/component: alert-router
+      app.kubernetes.io/name: alertmanager
+
     namespace: alerting
 
 
@@ -27,6 +33,11 @@ nfc_monitoring:
       name: grafana/grafana
       tag: '10.1.2' # '10.0.5'
 
+    labels:
+      app.kubernetes.io/component: graphing
+      app.kubernetes.io/instance: k8s
+      app.kubernetes.io/name: grafana
+
     namespace: grafana
 
     replicas: 1
@@ -122,6 +133,12 @@ nfc_monitoring:
     image: 
       name: grafana/agent
       tag: 'v0.36.1'
+
+    labels:
+      app.kubernetes.io/instance: k8s
+      app.kubernetes.io/component: exporter
+      app.kubernetes.io/name: grafana-agent
+
     namespace: monitoring
 
 
@@ -169,6 +186,12 @@ nfc_monitoring:
     image:
       name: prom/prometheus
       tag: 'v2.47.0'
+    
+    # These labels are appended to all Prometheus items and are also the selector labels
+    labels:
+      app.kubernetes.io/component: prometheus
+      app.kubernetes.io/instance: k8s
+      app.kubernetes.io/name: prometheus
 
     namespace: monitoring
 
@@ -251,6 +274,11 @@ nfc_monitoring:
       name: registry.k8s.io/prometheus-adapter/prometheus-adapter
       tag: 'v0.11.1'
 
+    labels:
+      app.kubernetes.io/component: metrics-adapter
+      app.kubernetes.io/instance: main
+      app.kubernetes.io/name: prometheus-adapter
+
     namespace: monitoring
 
     affinity: