From af0465fd79d33d8f8cd672e616f09f9a01063d75 Mon Sep 17 00:00:00 2001
From: paulfantom <pawel@krupa.net.pl>
Date: Wed, 16 Dec 2020 11:10:15 +0100
Subject: [PATCH] manifests: regenerate
---
manifests/alertmanager-alertmanager.yaml | 10 ++++++++++
manifests/alertmanager-service.yaml | 7 +++++++
manifests/alertmanager-serviceMonitor.yaml | 8 +++++++-
manifests/kube-state-metrics-clusterRole.yaml | 4 +++-
manifests/kube-state-metrics-clusterRoleBinding.yaml | 4 +++-
manifests/kube-state-metrics-deployment.yaml | 10 ++++++++--
manifests/kube-state-metrics-service.yaml | 6 +++++-
manifests/kube-state-metrics-serviceAccount.yaml | 4 +++-
manifests/kube-state-metrics-serviceMonitor.yaml | 4 ++++
manifests/node-exporter-daemonset.yaml | 6 ++++++
manifests/node-exporter-service.yaml | 4 ++++
manifests/node-exporter-serviceMonitor.yaml | 4 ++++
manifests/prometheus-adapter-deployment.yaml | 9 +++++++--
manifests/prometheus-adapter-service.yaml | 9 +++++++--
manifests/prometheus-adapter-serviceMonitor.yaml | 9 +++++++--
manifests/prometheus-prometheus.yaml | 10 ++++++++++
manifests/prometheus-service.yaml | 7 +++++++
manifests/prometheus-serviceMonitor.yaml | 8 +++++++-
manifests/prometheus-serviceMonitorApiserver.yaml | 2 +-
manifests/prometheus-serviceMonitorCoreDNS.yaml | 6 +++---
...prometheus-serviceMonitorKubeControllerManager.yaml | 6 +++---
manifests/prometheus-serviceMonitorKubeScheduler.yaml | 6 +++---
manifests/prometheus-serviceMonitorKubelet.yaml | 6 +++---
23 files changed, 122 insertions(+), 27 deletions(-)
diff --git a/manifests/alertmanager-alertmanager.yaml b/manifests/alertmanager-alertmanager.yaml
index 55b353a8..f873dcc0 100644
--- a/manifests/alertmanager-alertmanager.yaml
+++ b/manifests/alertmanager-alertmanager.yaml
@@ -3,12 +3,22 @@ kind: Alertmanager
metadata:
labels:
alertmanager: main
+ app.kubernetes.io/component: router
+ app.kubernetes.io/name: alertmanager-main
+ app.kubernetes.io/part-of: kube-prometheus
+ app.kubernetes.io/version: v0.21.0
name: main
namespace: monitoring
spec:
image: quay.io/prometheus/alertmanager:v0.21.0
nodeSelector:
kubernetes.io/os: linux
+ podMetadata:
+ labels:
+ app.kubernetes.io/component: router
+ app.kubernetes.io/name: alertmanager-main
+ app.kubernetes.io/part-of: kube-prometheus
+ app.kubernetes.io/version: v0.21.0
replicas: 3
securityContext:
fsGroup: 2000
diff --git a/manifests/alertmanager-service.yaml b/manifests/alertmanager-service.yaml
index df4c9ff5..19125e9e 100644
--- a/manifests/alertmanager-service.yaml
+++ b/manifests/alertmanager-service.yaml
@@ -3,6 +3,10 @@ kind: Service
metadata:
labels:
alertmanager: main
+ app.kubernetes.io/component: router
+ app.kubernetes.io/name: alertmanager-main
+ app.kubernetes.io/part-of: kube-prometheus
+ app.kubernetes.io/version: v0.21.0
name: alertmanager-main
namespace: monitoring
spec:
@@ -13,4 +17,7 @@ spec:
selector:
alertmanager: main
app: alertmanager
+ app.kubernetes.io/component: router
+ app.kubernetes.io/name: alertmanager-main
+ app.kubernetes.io/part-of: kube-prometheus
sessionAffinity: ClientIP
diff --git a/manifests/alertmanager-serviceMonitor.yaml b/manifests/alertmanager-serviceMonitor.yaml
index 548af0d6..ead16269 100644
--- a/manifests/alertmanager-serviceMonitor.yaml
+++ b/manifests/alertmanager-serviceMonitor.yaml
@@ -2,7 +2,10 @@ apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
labels:
- k8s-app: alertmanager
+ app.kubernetes.io/component: router
+ app.kubernetes.io/name: alertmanager-main
+ app.kubernetes.io/part-of: kube-prometheus
+ app.kubernetes.io/version: v0.21.0
name: alertmanager
namespace: monitoring
spec:
@@ -12,3 +15,6 @@ spec:
selector:
matchLabels:
alertmanager: main
+ app.kubernetes.io/component: router
+ app.kubernetes.io/name: alertmanager-main
+ app.kubernetes.io/part-of: kube-prometheus
diff --git a/manifests/kube-state-metrics-clusterRole.yaml b/manifests/kube-state-metrics-clusterRole.yaml
index c04db290..0f0502d2 100644
--- a/manifests/kube-state-metrics-clusterRole.yaml
+++ b/manifests/kube-state-metrics-clusterRole.yaml
@@ -2,8 +2,10 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
+ app.kubernetes.io/component: exporter
app.kubernetes.io/name: kube-state-metrics
- app.kubernetes.io/version: v1.9.7
+ app.kubernetes.io/part-of: kube-prometheus
+ app.kubernetes.io/version: 1.9.7
name: kube-state-metrics
rules:
- apiGroups:
diff --git a/manifests/kube-state-metrics-clusterRoleBinding.yaml b/manifests/kube-state-metrics-clusterRoleBinding.yaml
index c8f9434d..f8e8ad8e 100644
--- a/manifests/kube-state-metrics-clusterRoleBinding.yaml
+++ b/manifests/kube-state-metrics-clusterRoleBinding.yaml
@@ -2,8 +2,10 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
labels:
+ app.kubernetes.io/component: exporter
app.kubernetes.io/name: kube-state-metrics
- app.kubernetes.io/version: v1.9.7
+ app.kubernetes.io/part-of: kube-prometheus
+ app.kubernetes.io/version: 1.9.7
name: kube-state-metrics
roleRef:
apiGroup: rbac.authorization.k8s.io
diff --git a/manifests/kube-state-metrics-deployment.yaml b/manifests/kube-state-metrics-deployment.yaml
index 9bda5c69..ab50e622 100644
--- a/manifests/kube-state-metrics-deployment.yaml
+++ b/manifests/kube-state-metrics-deployment.yaml
@@ -2,20 +2,26 @@ apiVersion: apps/v1
kind: Deployment
metadata:
labels:
+ app.kubernetes.io/component: exporter
app.kubernetes.io/name: kube-state-metrics
- app.kubernetes.io/version: v1.9.7
+ app.kubernetes.io/part-of: kube-prometheus
+ app.kubernetes.io/version: 1.9.7
name: kube-state-metrics
namespace: monitoring
spec:
replicas: 1
selector:
matchLabels:
+ app.kubernetes.io/component: exporter
app.kubernetes.io/name: kube-state-metrics
+ app.kubernetes.io/part-of: kube-prometheus
template:
metadata:
labels:
+ app.kubernetes.io/component: exporter
app.kubernetes.io/name: kube-state-metrics
- app.kubernetes.io/version: v1.9.7
+ app.kubernetes.io/part-of: kube-prometheus
+ app.kubernetes.io/version: 1.9.7
spec:
containers:
- args:
diff --git a/manifests/kube-state-metrics-service.yaml b/manifests/kube-state-metrics-service.yaml
index d734a19b..28abe2b6 100644
--- a/manifests/kube-state-metrics-service.yaml
+++ b/manifests/kube-state-metrics-service.yaml
@@ -2,8 +2,10 @@ apiVersion: v1
kind: Service
metadata:
labels:
+ app.kubernetes.io/component: exporter
app.kubernetes.io/name: kube-state-metrics
- app.kubernetes.io/version: v1.9.7
+ app.kubernetes.io/part-of: kube-prometheus
+ app.kubernetes.io/version: 1.9.7
name: kube-state-metrics
namespace: monitoring
spec:
@@ -16,4 +18,6 @@ spec:
port: 9443
targetPort: https-self
selector:
+ app.kubernetes.io/component: exporter
app.kubernetes.io/name: kube-state-metrics
+ app.kubernetes.io/part-of: kube-prometheus
diff --git a/manifests/kube-state-metrics-serviceAccount.yaml b/manifests/kube-state-metrics-serviceAccount.yaml
index c23b36c1..b1ffdc70 100644
--- a/manifests/kube-state-metrics-serviceAccount.yaml
+++ b/manifests/kube-state-metrics-serviceAccount.yaml
@@ -2,7 +2,9 @@ apiVersion: v1
kind: ServiceAccount
metadata:
labels:
+ app.kubernetes.io/component: exporter
app.kubernetes.io/name: kube-state-metrics
- app.kubernetes.io/version: v1.9.7
+ app.kubernetes.io/part-of: kube-prometheus
+ app.kubernetes.io/version: 1.9.7
name: kube-state-metrics
namespace: monitoring
diff --git a/manifests/kube-state-metrics-serviceMonitor.yaml b/manifests/kube-state-metrics-serviceMonitor.yaml
index b860f4c3..85b30116 100644
--- a/manifests/kube-state-metrics-serviceMonitor.yaml
+++ b/manifests/kube-state-metrics-serviceMonitor.yaml
@@ -2,7 +2,9 @@ apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
labels:
+ app.kubernetes.io/component: exporter
app.kubernetes.io/name: kube-state-metrics
+ app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 1.9.7
name: kube-state-metrics
namespace: monitoring
@@ -28,4 +30,6 @@ spec:
jobLabel: app.kubernetes.io/name
selector:
matchLabels:
+ app.kubernetes.io/component: exporter
app.kubernetes.io/name: kube-state-metrics
+ app.kubernetes.io/part-of: kube-prometheus
diff --git a/manifests/node-exporter-daemonset.yaml b/manifests/node-exporter-daemonset.yaml
index 9a6f163d..936aa737 100644
--- a/manifests/node-exporter-daemonset.yaml
+++ b/manifests/node-exporter-daemonset.yaml
@@ -2,18 +2,24 @@ apiVersion: apps/v1
kind: DaemonSet
metadata:
labels:
+ app.kubernetes.io/component: exporter
app.kubernetes.io/name: node-exporter
+ app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: v1.0.1
name: node-exporter
namespace: monitoring
spec:
selector:
matchLabels:
+ app.kubernetes.io/component: exporter
app.kubernetes.io/name: node-exporter
+ app.kubernetes.io/part-of: kube-prometheus
template:
metadata:
labels:
+ app.kubernetes.io/component: exporter
app.kubernetes.io/name: node-exporter
+ app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: v1.0.1
spec:
containers:
diff --git a/manifests/node-exporter-service.yaml b/manifests/node-exporter-service.yaml
index cb966601..4423c3e8 100644
--- a/manifests/node-exporter-service.yaml
+++ b/manifests/node-exporter-service.yaml
@@ -2,7 +2,9 @@ apiVersion: v1
kind: Service
metadata:
labels:
+ app.kubernetes.io/component: exporter
app.kubernetes.io/name: node-exporter
+ app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: v1.0.1
name: node-exporter
namespace: monitoring
@@ -13,4 +15,6 @@ spec:
port: 9100
targetPort: https
selector:
+ app.kubernetes.io/component: exporter
app.kubernetes.io/name: node-exporter
+ app.kubernetes.io/part-of: kube-prometheus
diff --git a/manifests/node-exporter-serviceMonitor.yaml b/manifests/node-exporter-serviceMonitor.yaml
index 8e5a97c9..65432fd6 100644
--- a/manifests/node-exporter-serviceMonitor.yaml
+++ b/manifests/node-exporter-serviceMonitor.yaml
@@ -2,7 +2,9 @@ apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
labels:
+ app.kubernetes.io/component: exporter
app.kubernetes.io/name: node-exporter
+ app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: v1.0.1
name: node-exporter
namespace: monitoring
@@ -24,4 +26,6 @@ spec:
jobLabel: app.kubernetes.io/name
selector:
matchLabels:
+ app.kubernetes.io/component: exporter
app.kubernetes.io/name: node-exporter
+ app.kubernetes.io/part-of: kube-prometheus
diff --git a/manifests/prometheus-adapter-deployment.yaml b/manifests/prometheus-adapter-deployment.yaml
index bb85e251..53f1ee1d 100644
--- a/manifests/prometheus-adapter-deployment.yaml
+++ b/manifests/prometheus-adapter-deployment.yaml
@@ -7,7 +7,9 @@ spec:
replicas: 1
selector:
matchLabels:
- name: prometheus-adapter
+ app.kubernetes.io/component: metrics-adapter
+ app.kubernetes.io/name: prometheus-adapter
+ app.kubernetes.io/part-of: kube-prometheus
strategy:
rollingUpdate:
maxSurge: 1
@@ -15,7 +17,10 @@ spec:
template:
metadata:
labels:
- name: prometheus-adapter
+ app.kubernetes.io/component: metrics-adapter
+ app.kubernetes.io/name: prometheus-adapter
+ app.kubernetes.io/part-of: kube-prometheus
+ app.kubernetes.io/version: v0.8.2
spec:
containers:
- args:
diff --git a/manifests/prometheus-adapter-service.yaml b/manifests/prometheus-adapter-service.yaml
index e786e01c..41b18f00 100644
--- a/manifests/prometheus-adapter-service.yaml
+++ b/manifests/prometheus-adapter-service.yaml
@@ -2,7 +2,10 @@ apiVersion: v1
kind: Service
metadata:
labels:
- name: prometheus-adapter
+ app.kubernetes.io/component: metrics-adapter
+ app.kubernetes.io/name: prometheus-adapter
+ app.kubernetes.io/part-of: kube-prometheus
+ app.kubernetes.io/version: v0.8.2
name: prometheus-adapter
namespace: monitoring
spec:
@@ -11,4 +14,6 @@ spec:
port: 443
targetPort: 6443
selector:
- name: prometheus-adapter
+ app.kubernetes.io/component: metrics-adapter
+ app.kubernetes.io/name: prometheus-adapter
+ app.kubernetes.io/part-of: kube-prometheus
diff --git a/manifests/prometheus-adapter-serviceMonitor.yaml b/manifests/prometheus-adapter-serviceMonitor.yaml
index 91a8d51a..3291e49d 100644
--- a/manifests/prometheus-adapter-serviceMonitor.yaml
+++ b/manifests/prometheus-adapter-serviceMonitor.yaml
@@ -2,7 +2,10 @@ apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
labels:
- name: prometheus-adapter
+ app.kubernetes.io/component: metrics-adapter
+ app.kubernetes.io/name: prometheus-adapter
+ app.kubernetes.io/part-of: kube-prometheus
+ app.kubernetes.io/version: v0.8.2
name: prometheus-adapter
namespace: monitoring
spec:
@@ -15,4 +18,6 @@ spec:
insecureSkipVerify: true
selector:
matchLabels:
- name: prometheus-adapter
+ app.kubernetes.io/component: metrics-adapter
+ app.kubernetes.io/name: prometheus-adapter
+ app.kubernetes.io/part-of: kube-prometheus
diff --git a/manifests/prometheus-prometheus.yaml b/manifests/prometheus-prometheus.yaml
index e50cc9bf..0548a955 100644
--- a/manifests/prometheus-prometheus.yaml
+++ b/manifests/prometheus-prometheus.yaml
@@ -2,6 +2,10 @@ apiVersion: monitoring.coreos.com/v1
kind: Prometheus
metadata:
labels:
+ app.kubernetes.io/component: prometheus
+ app.kubernetes.io/name: prometheus-k8s
+ app.kubernetes.io/part-of: kube-prometheus
+ app.kubernetes.io/version: v2.22.1
prometheus: k8s
name: k8s
namespace: monitoring
@@ -14,6 +18,12 @@ spec:
image: quay.io/prometheus/prometheus:v2.22.1
nodeSelector:
kubernetes.io/os: linux
+ podMetadata:
+ labels:
+ app.kubernetes.io/component: prometheus
+ app.kubernetes.io/name: prometheus-k8s
+ app.kubernetes.io/part-of: kube-prometheus
+ app.kubernetes.io/version: v2.22.1
podMonitorNamespaceSelector: {}
podMonitorSelector: {}
probeNamespaceSelector: {}
diff --git a/manifests/prometheus-service.yaml b/manifests/prometheus-service.yaml
index 4f61e88a..b2e6dcf4 100644
--- a/manifests/prometheus-service.yaml
+++ b/manifests/prometheus-service.yaml
@@ -2,6 +2,10 @@ apiVersion: v1
kind: Service
metadata:
labels:
+ app.kubernetes.io/component: prometheus
+ app.kubernetes.io/name: prometheus-k8s
+ app.kubernetes.io/part-of: kube-prometheus
+ app.kubernetes.io/version: v2.22.1
prometheus: k8s
name: prometheus-k8s
namespace: monitoring
@@ -12,5 +16,8 @@ spec:
targetPort: web
selector:
app: prometheus
+ app.kubernetes.io/component: prometheus
+ app.kubernetes.io/name: prometheus-k8s
+ app.kubernetes.io/part-of: kube-prometheus
prometheus: k8s
sessionAffinity: ClientIP
diff --git a/manifests/prometheus-serviceMonitor.yaml b/manifests/prometheus-serviceMonitor.yaml
index b7605dbe..c8a74e96 100644
--- a/manifests/prometheus-serviceMonitor.yaml
+++ b/manifests/prometheus-serviceMonitor.yaml
@@ -2,7 +2,10 @@ apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
labels:
- k8s-app: prometheus
+ app.kubernetes.io/component: prometheus
+ app.kubernetes.io/name: prometheus-k8s
+ app.kubernetes.io/part-of: kube-prometheus
+ app.kubernetes.io/version: v2.22.1
name: prometheus
namespace: monitoring
spec:
@@ -11,4 +14,7 @@ spec:
port: web
selector:
matchLabels:
+ app.kubernetes.io/component: prometheus
+ app.kubernetes.io/name: prometheus-k8s
+ app.kubernetes.io/part-of: kube-prometheus
prometheus: k8s
diff --git a/manifests/prometheus-serviceMonitorApiserver.yaml b/manifests/prometheus-serviceMonitorApiserver.yaml
index 1ff61fe9..cc6f079c 100644
--- a/manifests/prometheus-serviceMonitorApiserver.yaml
+++ b/manifests/prometheus-serviceMonitorApiserver.yaml
@@ -2,7 +2,7 @@ apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
labels:
- k8s-app: apiserver
+ app.kubernetes.io/name: apiserver
name: kube-apiserver
namespace: monitoring
spec:
diff --git a/manifests/prometheus-serviceMonitorCoreDNS.yaml b/manifests/prometheus-serviceMonitorCoreDNS.yaml
index 633aa18c..c4b37433 100644
--- a/manifests/prometheus-serviceMonitorCoreDNS.yaml
+++ b/manifests/prometheus-serviceMonitorCoreDNS.yaml
@@ -2,7 +2,7 @@ apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
labels:
- k8s-app: coredns
+ app.kubernetes.io/name: coredns
name: coredns
namespace: monitoring
spec:
@@ -10,10 +10,10 @@ spec:
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
interval: 15s
port: metrics
- jobLabel: k8s-app
+ jobLabel: app.kubernetes.io/name
namespaceSelector:
matchNames:
- kube-system
selector:
matchLabels:
- k8s-app: kube-dns
+ app.kubernetes.io/name: kube-dns
diff --git a/manifests/prometheus-serviceMonitorKubeControllerManager.yaml b/manifests/prometheus-serviceMonitorKubeControllerManager.yaml
index 0f23d84d..fd9eddbf 100644
--- a/manifests/prometheus-serviceMonitorKubeControllerManager.yaml
+++ b/manifests/prometheus-serviceMonitorKubeControllerManager.yaml
@@ -2,7 +2,7 @@ apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
labels:
- k8s-app: kube-controller-manager
+ app.kubernetes.io/name: kube-controller-manager
name: kube-controller-manager
namespace: monitoring
spec:
@@ -50,10 +50,10 @@ spec:
scheme: https
tlsConfig:
insecureSkipVerify: true
- jobLabel: k8s-app
+ jobLabel: app.kubernetes.io/name
namespaceSelector:
matchNames:
- kube-system
selector:
matchLabels:
- k8s-app: kube-controller-manager
+ app.kubernetes.io/name: kube-controller-manager
diff --git a/manifests/prometheus-serviceMonitorKubeScheduler.yaml b/manifests/prometheus-serviceMonitorKubeScheduler.yaml
index 8073eaca..ca30352e 100644
--- a/manifests/prometheus-serviceMonitorKubeScheduler.yaml
+++ b/manifests/prometheus-serviceMonitorKubeScheduler.yaml
@@ -2,7 +2,7 @@ apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
labels:
- k8s-app: kube-scheduler
+ app.kubernetes.io/name: kube-scheduler
name: kube-scheduler
namespace: monitoring
spec:
@@ -13,10 +13,10 @@ spec:
scheme: https
tlsConfig:
insecureSkipVerify: true
- jobLabel: k8s-app
+ jobLabel: app.kubernetes.io/name
namespaceSelector:
matchNames:
- kube-system
selector:
matchLabels:
- k8s-app: kube-scheduler
+ app.kubernetes.io/name: kube-scheduler
diff --git a/manifests/prometheus-serviceMonitorKubelet.yaml b/manifests/prometheus-serviceMonitorKubelet.yaml
index 7db47ef0..dc329395 100644
--- a/manifests/prometheus-serviceMonitorKubelet.yaml
+++ b/manifests/prometheus-serviceMonitorKubelet.yaml
@@ -2,7 +2,7 @@ apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
labels:
- k8s-app: kubelet
+ app.kubernetes.io/name: kubelet
name: kubelet
namespace: monitoring
spec:
@@ -81,10 +81,10 @@ spec:
scheme: https
tlsConfig:
insecureSkipVerify: true
- jobLabel: k8s-app
+ jobLabel: app.kubernetes.io/name
namespaceSelector:
matchNames:
- kube-system
selector:
matchLabels:
- k8s-app: kubelet
+ app.kubernetes.io/name: kubelet
--
GitLab