Merge pull request #1471 from paulfantom/metadata-management

jsonnet: unify metadata management

manifests/alertmanager-alertmanager.yaml

@@ -15,6 +15,7 @@ spec:
     kubernetes.io/os: linux
   podMetadata:
     labels:
+      alertmanager: main
       app.kubernetes.io/component: alert-router
       app.kubernetes.io/name: alertmanager
       app.kubernetes.io/part-of: kube-prometheus

manifests/alertmanager-serviceMonitor.yaml

@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/name: alertmanager
     app.kubernetes.io/part-of: kube-prometheus
     app.kubernetes.io/version: 0.23.0
-  name: alertmanager
+  name: alertmanager-main
   namespace: monitoring
 spec:
   endpoints:

manifests/blackbox-exporter-clusterRoleBinding.yaml

@@ -1,7 +1,13 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
+  labels:
+    app.kubernetes.io/component: exporter
+    app.kubernetes.io/name: blackbox-exporter
+    app.kubernetes.io/part-of: kube-prometheus
+    app.kubernetes.io/version: 0.19.0
   name: blackbox-exporter
+  namespace: monitoring
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole

manifests/blackbox-exporter-serviceAccount.yaml

@@ -1,5 +1,10 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
+  labels:
+    app.kubernetes.io/component: exporter
+    app.kubernetes.io/name: blackbox-exporter
+    app.kubernetes.io/part-of: kube-prometheus
+    app.kubernetes.io/version: 0.19.0
   name: blackbox-exporter
   namespace: monitoring

manifests/kubernetes-serviceMonitorApiserver.yaml

@@ -3,6 +3,7 @@ kind: ServiceMonitor
 metadata:
   labels:
     app.kubernetes.io/name: apiserver
+    app.kubernetes.io/part-of: kube-prometheus
   name: kube-apiserver
   namespace: monitoring
 spec:

manifests/kubernetes-serviceMonitorCoreDNS.yaml

@@ -3,6 +3,7 @@ kind: ServiceMonitor
 metadata:
   labels:
     app.kubernetes.io/name: coredns
+    app.kubernetes.io/part-of: kube-prometheus
   name: coredns
   namespace: monitoring
 spec:

manifests/kubernetes-serviceMonitorKubeControllerManager.yaml

@@ -3,6 +3,7 @@ kind: ServiceMonitor
 metadata:
   labels:
     app.kubernetes.io/name: kube-controller-manager
+    app.kubernetes.io/part-of: kube-prometheus
   name: kube-controller-manager
   namespace: monitoring
 spec:

manifests/kubernetes-serviceMonitorKubeScheduler.yaml

@@ -3,6 +3,7 @@ kind: ServiceMonitor
 metadata:
   labels:
     app.kubernetes.io/name: kube-scheduler
+    app.kubernetes.io/part-of: kube-prometheus
   name: kube-scheduler
   namespace: monitoring
 spec:

manifests/kubernetes-serviceMonitorKubelet.yaml

@@ -3,6 +3,7 @@ kind: ServiceMonitor
 metadata:
   labels:
     app.kubernetes.io/name: kubelet
+    app.kubernetes.io/part-of: kube-prometheus
   name: kubelet
   namespace: monitoring
 spec:

manifests/node-exporter-clusterRole.yaml

@@ -7,6 +7,7 @@ metadata:
     app.kubernetes.io/part-of: kube-prometheus
     app.kubernetes.io/version: 1.2.2
   name: node-exporter
+  namespace: monitoring
 rules:
 - apiGroups:
   - authentication.k8s.io

manifests/node-exporter-clusterRoleBinding.yaml

@@ -7,6 +7,7 @@ metadata:
     app.kubernetes.io/part-of: kube-prometheus
     app.kubernetes.io/version: 1.2.2
   name: node-exporter
+  namespace: monitoring
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole

manifests/prometheus-adapter-clusterRole.yaml

@@ -7,6 +7,7 @@ metadata:
     app.kubernetes.io/part-of: kube-prometheus
     app.kubernetes.io/version: 0.9.1
   name: prometheus-adapter
+  namespace: monitoring
 rules:
 - apiGroups:
   - ""

manifests/prometheus-adapter-clusterRoleAggregatedMetricsReader.yaml

@@ -10,6 +10,7 @@ metadata:
     rbac.authorization.k8s.io/aggregate-to-edit: "true"
     rbac.authorization.k8s.io/aggregate-to-view: "true"
   name: system:aggregated-metrics-reader
+  namespace: monitoring
 rules:
 - apiGroups:
   - metrics.k8s.io

manifests/prometheus-adapter-clusterRoleBinding.yaml

@@ -7,6 +7,7 @@ metadata:
     app.kubernetes.io/part-of: kube-prometheus
     app.kubernetes.io/version: 0.9.1
   name: prometheus-adapter
+  namespace: monitoring
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole

manifests/prometheus-adapter-clusterRoleBindingDelegator.yaml

@@ -7,6 +7,7 @@ metadata:
     app.kubernetes.io/part-of: kube-prometheus
     app.kubernetes.io/version: 0.9.1
   name: resource-metrics:system:auth-delegator
+  namespace: monitoring
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole

manifests/prometheus-adapter-clusterRoleServerResources.yaml

@@ -7,6 +7,7 @@ metadata:
     app.kubernetes.io/part-of: kube-prometheus
     app.kubernetes.io/version: 0.9.1
   name: resource-metrics-server-resources
+  namespace: monitoring
 rules:
 - apiGroups:
   - metrics.k8s.io

manifests/prometheus-clusterRole.yaml

@@ -7,6 +7,7 @@ metadata:
     app.kubernetes.io/part-of: kube-prometheus
     app.kubernetes.io/version: 2.30.3
   name: prometheus-k8s
+  namespace: monitoring
 rules:
 - apiGroups:
   - ""

manifests/prometheus-clusterRoleBinding.yaml

@@ -7,6 +7,7 @@ metadata:
     app.kubernetes.io/part-of: kube-prometheus
     app.kubernetes.io/version: 2.30.3
   name: prometheus-k8s
+  namespace: monitoring
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole

manifests/prometheus-prometheus.yaml

@@ -27,6 +27,7 @@ spec:
       app.kubernetes.io/name: prometheus
       app.kubernetes.io/part-of: kube-prometheus
       app.kubernetes.io/version: 2.30.3
+      prometheus: k8s
   podMonitorNamespaceSelector: {}
   podMonitorSelector: {}
   probeNamespaceSelector: {}