Improve resource selectors

templates/fluentbit-logs/daemonset.yaml

@@ -9,13 +9,14 @@ metadata:
 spec:
   selector:
       matchLabels:
-        name: it-monit-logs-collector-fluentbit
+        {{- include "cern-it-monitoring-kubernetes.selectorLabels" . | nindent 6 }}
+        app.kubernetes.io/component: fluentbit-logs
   template:
     metadata:
       name: it-monit-logs-collector-fluentbit
       namespace: {{ .Release.Namespace }}
       labels:
-        name: it-monit-logs-collector-fluentbit
+        {{- include "cern-it-monitoring-kubernetes.labels" . | nindent 8 }}
     spec:
       serviceAccountName: it-monit-logs-collector-fluentbit
       containers:

templates/fluentbit-metrics/service.yaml

@@ -12,5 +12,6 @@ spec:
   - name: http
     port: {{ .Values.metrics.fluentbit.prometheusRemoteWriteInputConfig.port }}
   selector:
-    name: it-monit-metrics-collector-fluentbit
+    {{- include "cern-it-monitoring-kubernetes.selectorLabels" . | nindent 4 }}
+    app.kubernetes.io/component: fluentbit-metrics
 {{- end -}}

templates/fluentbit-metrics/statefulset.yaml

@@ -8,15 +8,17 @@ metadata:
     {{- include "cern-it-monitoring-kubernetes.labels" . | nindent 4 }}
 spec:
   selector:
-      matchLabels:
-        name: it-monit-metrics-collector-fluentbit
+    matchLabels:
+      {{- include "cern-it-monitoring-kubernetes.selectorLabels" . | nindent 6 }}
+      app.kubernetes.io/component: fluentbit-metrics
   replicas: {{ .Values.metrics.fluentbit.replicas }}
   template:
     metadata:
       name: it-monit-metrics-collector-fluentbit
       namespace: {{ .Release.Namespace }}
       labels:
-        name: it-monit-metrics-collector-fluentbit
+        {{- include "cern-it-monitoring-kubernetes.labels" . | nindent 8 }}
+        app.kubernetes.io/component: fluentbit-metrics
     spec:
       containers:
         - name: it-monit-metrics-collector-fluentbit

templates/kube_state/deployment.yaml

@@ -10,11 +10,13 @@ spec:
   replicas: 1
   selector:
     matchLabels:
-      app.kubernetes.io/name: it-monit-metrics-collector-kubestate
+      {{- include "cern-it-monitoring-kubernetes.selectorLabels" . | nindent 6 }}
+      app.kubernetes.io/component: kube-state
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: it-monit-metrics-collector-kubestate
+        {{- include "cern-it-monitoring-kubernetes.labels" . | nindent 8 }}
+        app.kubernetes.io/component: kube-state
     spec:
       automountServiceAccountToken: true
       containers:

templates/kube_state/service.yaml

@@ -6,6 +6,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "cern-it-monitoring-kubernetes.labels" . | nindent 4 }}
+    app.kubernetes.io/component: kube-state
 spec:
   clusterIP: None
   ports:
@@ -16,5 +17,6 @@ spec:
     port: 8081
     targetPort: telemetry
   selector:
-    app.kubernetes.io/name: it-monit-metrics-collector-kubestate
+    {{- include "cern-it-monitoring-kubernetes.selectorLabels" . | nindent 4 }}
+    app.kubernetes.io/component: kube-state
 {{- end -}}

templates/kube_state/servicemonitor.yaml

@@ -26,7 +26,8 @@ spec:
     {{- end }}
   selector:
     matchLabels:
-      app.kubernetes.io/name: "it-monit-metrics-collector-kubestate"
+      {{- include "cern-it-monitoring-kubernetes.labels" . | nindent 6 }}
+      app.kubernetes.io/component: kube-state
   namespaceSelector:
     matchNames:
     - {{ .Release.Namespace }}

templates/node_exporter/daemonset.yaml

@@ -9,13 +9,13 @@ metadata:
 spec:
   selector:
     matchLabels:
-      app.kubernetes.io/component: exporter
-      app.kubernetes.io/name: node-exporter
+      {{- include "cern-it-monitoring-kubernetes.selectorLabels" . | nindent 6 }}
+      app.kubernetes.io/component: node-exporter
   template:
     metadata:
       labels:
-        app.kubernetes.io/component: exporter
-        app.kubernetes.io/name: node-exporter
+        {{- include "cern-it-monitoring-kubernetes.labels" . | nindent 8 }}
+        app.kubernetes.io/component: node-exporter
     spec:
       tolerations:
       - operator: Exists

templates/node_exporter/podmonitor.yaml

@@ -12,7 +12,8 @@ spec:
         - {{ .Release.Namespace }}
   selector:
     matchLabels:
-      app.kubernetes.io/name: node-exporter
+      {{- include "cern-it-monitoring-kubernetes.selectorLabels" . | nindent 6 }}
+      app.kubernetes.io/component: node-exporter
   podMetricsEndpoints:
   - targetPort: 9100
     {{- if .Values.metrics.nodeExporter.scrapeInterval }}

templates/prometheus_operator/deployment.yaml

@@ -10,13 +10,15 @@ spec:
   replicas: 1
   selector:
     matchLabels:
-      app.kubernetes.io/name: it-monit-metrics-operator-prometheus
+      {{- include "cern-it-monitoring-kubernetes.selectorLabels" . | nindent 6 }}
+      app.kubernetes.io/component: prometheus-operator
   template:
     metadata:
       annotations:
         kubectl.kubernetes.io/default-container: it-monit-metrics-operator-prometheus
       labels:
-        app.kubernetes.io/name: it-monit-metrics-operator-prometheus
+        {{- include "cern-it-monitoring-kubernetes.labels" . | nindent 8 }}
+        app.kubernetes.io/component: prometheus-operator
     spec:
       automountServiceAccountToken: true
       containers:

templates/prometheus_operator/service.yaml

@@ -13,6 +13,6 @@ spec:
     port: 8080
     targetPort: http
   selector:
-    app.kubernetes.io/component: controller
-    app.kubernetes.io/name: it-monit-metrics-operator-prometheus
+    {{- include "cern-it-monitoring-kubernetes.selectorLabels" . | nindent 4 }}
+    app.kubernetes.io/component: prometheus-operator
 {{- end -}}

templates/pushgateway/deployment.yaml

@@ -10,11 +10,13 @@ spec:
   replicas: 1
   selector:
     matchLabels:
-      app.kubernetes.io/name: it-monit-metrics-collector-pushgateway
+      {{- include "cern-it-monitoring-kubernetes.labels" . | nindent 6 }}
+      app.kubernetes.io/component: pushgateway
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: it-monit-metrics-collector-pushgateway
+        {{- include "cern-it-monitoring-kubernetes.labels" . | nindent 8 }}
+        app.kubernetes.io/component: pushgateway
     spec:
       containers:
       - image: "{{ .Values.metrics.pushgateway.image.repository }}:{{ .Values.metrics.pushgateway.image.tag }}"

templates/pushgateway/service.yaml

@@ -6,11 +6,13 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "cern-it-monitoring-kubernetes.labels" . | nindent 4 }}
+    app.kubernetes.io/component: pushgateway
 spec:
   clusterIP: None
   ports:
   - name: http
     port: 9091
   selector:
-    app.kubernetes.io/name: it-monit-metrics-collector-pushgateway
+    {{- include "cern-it-monitoring-kubernetes.labels" . | nindent 4 }}
+    app.kubernetes.io/component: pushgateway
 {{- end -}}

templates/pushgateway/servicemonitor.yaml

@@ -14,5 +14,6 @@ spec:
     - {{ .Release.Namespace }}
   selector:
     matchLabels:
-      app.kubernetes.io/name: it-monit-metrics-collector-pushgateway
+      {{- include "cern-it-monitoring-kubernetes.labels" . | nindent 6 }}
+      app.kubernetes.io/component: pushgateway
 {{- end -}}