From ee553a708dbc80686e29647256198a6f381dcb76 Mon Sep 17 00:00:00 2001
From: paulfantom <pawel@krupa.net.pl>
Date: Wed, 16 Dec 2020 11:07:29 +0100
Subject: [PATCH] jsonnet: replace all k8s-app labels with
app.kubernetes.io/name
---
.../kube-prometheus-bootkube.libsonnet | 14 +++++-----
.../kube-prometheus-eks.libsonnet | 10 +++----
.../kube-prometheus-kops-coredns.libsonnet | 4 +--
.../kube-prometheus-kops.libsonnet | 12 ++++----
.../kube-prometheus-kube-aws.libsonnet | 8 +++---
.../kube-prometheus-kubeadm.libsonnet | 4 +--
.../kube-prometheus-kubespray.libsonnet | 12 ++++----
.../kube-prometheus-static-etcd.libsonnet | 10 +++----
.../kube-prometheus-thanos-sidecar.libsonnet | 2 +-
.../kube-prometheus-weave-net.libsonnet | 8 +++---
.../prometheus/prometheus.libsonnet | 28 +++++++++----------
11 files changed, 56 insertions(+), 56 deletions(-)
diff --git a/jsonnet/kube-prometheus/kube-prometheus-bootkube.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-bootkube.libsonnet
index 284544c1..8e73509d 100644
--- a/jsonnet/kube-prometheus/kube-prometheus-bootkube.libsonnet
+++ b/jsonnet/kube-prometheus/kube-prometheus-bootkube.libsonnet
@@ -18,24 +18,24 @@ local service(name, namespace, labels, selector, ports) = {
kubeControllerManagerPrometheusDiscoveryService: service(
'kube-controller-manager-prometheus-discovery',
'kube-system',
- { 'k8s-app': 'kube-controller-manager' },
- { 'k8s-app': 'kube-controller-manager' },
+ { 'app.kubernetes.io/name': 'kube-controller-manager' },
+ { 'app.kubernetes.io/name': 'kube-controller-manager' },
[{ name: 'https-metrics', port: 10257, targetPort: 10257 }]
),
kubeSchedulerPrometheusDiscoveryService: service(
'kube-scheduler-prometheus-discovery',
'kube-system',
- { 'k8s-app': 'kube-scheduler' },
- { 'k8s-app': 'kube-scheduler' },
+ { 'app.kubernetes.io/name': 'kube-scheduler' },
+ { 'app.kubernetes.io/name': 'kube-scheduler' },
[{ name: 'https-metrics', port: 10259, targetPort: 10259 }]
),
kubeDnsPrometheusDiscoveryService: service(
'kube-dns-prometheus-discovery',
- 'kube-syste',
- { 'k8s-app': 'kube-dns' },
- { 'k8s-app': 'kube-dns' },
+ 'kube-system',
+ { 'app.kubernetes.io/name': 'kube-dns' },
+ { 'app.kubernetes.io/name': 'kube-dns' },
[{ name: 'http-metrics-skydns', port: 10055, targetPort: 10055 }, { name: 'http-metrics-dnsmasq', port: 10054, targetPort: 10054 }]
),
},
diff --git a/jsonnet/kube-prometheus/kube-prometheus-eks.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-eks.libsonnet
index d4dd9652..3f6ab80d 100644
--- a/jsonnet/kube-prometheus/kube-prometheus-eks.libsonnet
+++ b/jsonnet/kube-prometheus/kube-prometheus-eks.libsonnet
@@ -23,13 +23,13 @@
metadata: {
name: 'aws-node',
namespace: 'kube-system',
- labels: { 'k8s-app': 'aws-node' },
+ labels: { 'app.kubernetes.io/name': 'aws-node' },
},
spec: {
ports: [
{ name: 'cni-metrics-port', port: 61678, targetPort: 61678 },
],
- selector: { 'k8s-app': 'aws-node' },
+ selector: { 'app.kubernetes.io/name': 'aws-node' },
clusterIP: 'None',
},
},
@@ -41,14 +41,14 @@
name: 'awsekscni',
namespace: $._config.namespace,
labels: {
- 'k8s-app': 'eks-cni',
+ 'app.kubernetes.io/name': 'eks-cni',
},
},
spec: {
- jobLabel: 'k8s-app',
+ jobLabel: 'app.kubernetes.io/name',
selector: {
matchLabels: {
- 'k8s-app': 'aws-node',
+ 'app.kubernetes.io/name': 'aws-node',
},
},
namespaceSelector: {
diff --git a/jsonnet/kube-prometheus/kube-prometheus-kops-coredns.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-kops-coredns.libsonnet
index a003fc75..749e937c 100644
--- a/jsonnet/kube-prometheus/kube-prometheus-kops-coredns.libsonnet
+++ b/jsonnet/kube-prometheus/kube-prometheus-kops-coredns.libsonnet
@@ -6,13 +6,13 @@
metadata: {
name: 'kube-dns-prometheus-discovery',
namespace: 'kube-system',
- labels: { 'k8s-app': 'kube-dns' },
+ labels: { 'app.kubernetes.io/name': 'kube-dns' },
},
spec: {
ports: [
{ name: 'metrics', port: 9153, targetPort: 9153 },
],
- selector: { 'k8s-app': 'kube-dns' },
+ selector: { 'app.kubernetes.io/name': 'kube-dns' },
clusterIP: 'None',
},
},
diff --git a/jsonnet/kube-prometheus/kube-prometheus-kops.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-kops.libsonnet
index 8db8c299..5615ae20 100644
--- a/jsonnet/kube-prometheus/kube-prometheus-kops.libsonnet
+++ b/jsonnet/kube-prometheus/kube-prometheus-kops.libsonnet
@@ -18,22 +18,22 @@ local service(name, namespace, labels, selector, ports) = {
kubeControllerManagerPrometheusDiscoveryService: service(
'kube-controller-manager-prometheus-discovery',
'kube-system',
- { 'k8s-app': 'kube-controller-manager' },
- { 'k8s-app': 'kube-controller-manager' },
+ { 'app.kubernetes.io/name': 'kube-controller-manager' },
+ { 'app.kubernetes.io/name': 'kube-controller-manager' },
[{ name: 'https-metrics', port: 10257, targetPort: 10257 }]
),
kubeSchedulerPrometheusDiscoveryService: service(
'kube-controller-manager-prometheus-discovery',
'kube-system',
- { 'k8s-app': 'kube-scheduler' },
- { 'k8s-app': 'kube-scheduler' },
+ { 'app.kubernetes.io/name': 'kube-scheduler' },
+ { 'app.kubernetes.io/name': 'kube-scheduler' },
[{ name: 'https-metrics', port: 10259, targetPort: 10259 }]
),
kubeDnsPrometheusDiscoveryService: service(
'kube-controller-manager-prometheus-discovery',
'kube-system',
- { 'k8s-app': 'kube-dns' },
- { 'k8s-app': 'kube-dns' },
+ { 'app.kubernetes.io/name': 'kube-dns' },
+ { 'app.kubernetes.io/name': 'kube-dns' },
[{ name: 'metrics', port: 10055, targetPort: 10055 }, { name: 'http-metrics-dnsmasq', port: 10054, targetPort: 10054 }]
),
},
diff --git a/jsonnet/kube-prometheus/kube-prometheus-kube-aws.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-kube-aws.libsonnet
index ae8d364d..04d67d00 100644
--- a/jsonnet/kube-prometheus/kube-prometheus-kube-aws.libsonnet
+++ b/jsonnet/kube-prometheus/kube-prometheus-kube-aws.libsonnet
@@ -18,15 +18,15 @@ local service(name, namespace, labels, selector, ports) = {
kubeControllerManagerPrometheusDiscoveryService: service(
'kube-controller-manager-prometheus-discovery',
'kube-system',
- { 'k8s-app': 'kube-controller-manager' },
- { 'k8s-app': 'kube-controller-manager' },
+ { 'app.kubernetes.io/name': 'kube-controller-manager' },
+ { 'app.kubernetes.io/name': 'kube-controller-manager' },
[{ name: 'https-metrics', port: 10257, targetPort: 10257 }],
),
kubeSchedulerPrometheusDiscoveryService: service(
'kube-scheduler-prometheus-discovery',
'kube-system',
- { 'k8s-app': 'kube-scheduler' },
- { 'k8s-app': 'kube-scheduler' },
+ { 'app.kubernetes.io/name': 'kube-scheduler' },
+ { 'app.kubernetes.io/name': 'kube-scheduler' },
[{ name: 'https-metrics', port: 10259, targetPort: 10259 }],
),
},
diff --git a/jsonnet/kube-prometheus/kube-prometheus-kubeadm.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-kubeadm.libsonnet
index 543e0cea..3621c2aa 100644
--- a/jsonnet/kube-prometheus/kube-prometheus-kubeadm.libsonnet
+++ b/jsonnet/kube-prometheus/kube-prometheus-kubeadm.libsonnet
@@ -18,14 +18,14 @@ local service(name, namespace, labels, selector, ports) = {
kubeControllerManagerPrometheusDiscoveryService: service(
'kube-controller-manager-prometheus-discovery',
'kube-system',
- { 'k8s-app': 'kube-controller-manager' },
+ { 'app.kubernetes.io/name': 'kube-controller-manager' },
{ component: 'kube-controller-manager' },
[{ name: 'https-metrics', port: 10257, targetPort: 10257 }]
),
kubeSchedulerPrometheusDiscoveryService: service(
'kube-scheduler-prometheus-discovery',
'kube-system',
- { 'k8s-app': 'kube-scheduler' },
+ { 'app.kubernetes.io/name': 'kube-scheduler' },
{ component: 'kube-scheduler' },
[{ name: 'https-metrics', port: 10259, targetPort: 10259 }],
),
diff --git a/jsonnet/kube-prometheus/kube-prometheus-kubespray.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-kubespray.libsonnet
index c1e7682d..f34cab67 100644
--- a/jsonnet/kube-prometheus/kube-prometheus-kubespray.libsonnet
+++ b/jsonnet/kube-prometheus/kube-prometheus-kubespray.libsonnet
@@ -19,16 +19,16 @@ local service(name, namespace, labels, selector, ports) = {
kubeControllerManagerPrometheusDiscoveryService: service(
'kube-controller-manager-prometheus-discovery',
'kube-system',
- { 'k8s-app': 'kube-controller-manager' },
- { 'k8s-app': 'kube-controller-manager' },
+ { 'app.kubernetes.io/name': 'kube-controller-manager' },
+ { 'app.kubernetes.io/name': 'kube-controller-manager' },
[{ name: 'https-metrics', port: 10257, targetPort: 10257 }]
),
kubeSchedulerPrometheusDiscoveryService: service(
'kube-scheduler-prometheus-discovery',
'kube-system',
- { 'k8s-app': 'kube-scheduler' },
- { 'k8s-app': 'kube-scheduler' },
+ { 'app.kubernetes.io/name': 'kube-scheduler' },
+ { 'app.kubernetes.io/name': 'kube-scheduler' },
[{ name: 'https-metrics', port: 10259, targetPort: 10259 }],
),
@@ -36,7 +36,7 @@ local service(name, namespace, labels, selector, ports) = {
spec+: {
selector+: {
matchLabels: {
- 'k8s-app': 'kube-scheduler',
+ 'app.kubernetes.io/name': 'kube-scheduler',
},
},
},
@@ -46,7 +46,7 @@ local service(name, namespace, labels, selector, ports) = {
spec+: {
selector+: {
matchLabels: {
- 'k8s-app': 'kube-controller-manager',
+ 'app.kubernetes.io/name': 'kube-controller-manager',
},
},
},
diff --git a/jsonnet/kube-prometheus/kube-prometheus-static-etcd.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-static-etcd.libsonnet
index 2994023d..e4c3a14d 100644
--- a/jsonnet/kube-prometheus/kube-prometheus-static-etcd.libsonnet
+++ b/jsonnet/kube-prometheus/kube-prometheus-static-etcd.libsonnet
@@ -16,7 +16,7 @@
metadata: {
name: 'etcd',
namespace: 'kube-system',
- labels: { 'k8s-app': 'etcd' },
+ labels: { 'app.kubernetes.io/name': 'etcd' },
},
spec: {
ports: [
@@ -31,7 +31,7 @@
metadata: {
name: 'etcd',
namespace: 'kube-system',
- labels: { 'k8s-app': 'etcd' },
+ labels: { 'app.kubernetes.io/name': 'etcd' },
},
subsets: [{
addresses: [
@@ -50,11 +50,11 @@
name: 'etcd',
namespace: 'kube-system',
labels: {
- 'k8s-app': 'etcd',
+ 'app.kubernetes.io/name': 'etcd',
},
},
spec: {
- jobLabel: 'k8s-app',
+ jobLabel: 'app.kubernetes.io/name',
endpoints: [
{
port: 'metrics',
@@ -72,7 +72,7 @@
],
selector: {
matchLabels: {
- 'k8s-app': 'etcd',
+ 'app.kubernetes.io/name': 'etcd',
},
},
},
diff --git a/jsonnet/kube-prometheus/kube-prometheus-thanos-sidecar.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-thanos-sidecar.libsonnet
index 0f762eb8..01620d4a 100644
--- a/jsonnet/kube-prometheus/kube-prometheus-thanos-sidecar.libsonnet
+++ b/jsonnet/kube-prometheus/kube-prometheus-thanos-sidecar.libsonnet
@@ -56,7 +56,7 @@
name: 'thanos-sidecar',
namespace: p.namespace,
labels: {
- 'k8s-app': 'prometheus',
+ 'app.kubernetes.io/name': 'prometheus',
},
},
spec: {
diff --git a/jsonnet/kube-prometheus/kube-prometheus-weave-net.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-weave-net.libsonnet
index 19e7b934..0755e60c 100644
--- a/jsonnet/kube-prometheus/kube-prometheus-weave-net.libsonnet
+++ b/jsonnet/kube-prometheus/kube-prometheus-weave-net.libsonnet
@@ -6,7 +6,7 @@
metadata: {
name: 'weave-net',
namespace: 'kube-system',
- labels: { 'k8s-app': 'weave-net' },
+ labels: { 'app.kubernetes.io/name': 'weave-net' },
},
spec: {
ports: [
@@ -22,12 +22,12 @@
metadata: {
name: 'weave-net',
labels: {
- 'k8s-app': 'weave-net',
+ 'app.kubernetes.io/name': 'weave-net',
},
namespace: 'monitoring',
},
spec: {
- jobLabel: 'k8s-app',
+ jobLabel: 'app.kubernetes.io/name',
endpoints: [
{
port: 'weave-net-metrics',
@@ -42,7 +42,7 @@
},
selector: {
matchLabels: {
- 'k8s-app': 'weave-net',
+ 'app.kubernetes.io/name': 'weave-net',
},
},
},
diff --git a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet
index 3e7e4e96..1a666e1d 100644
--- a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet
+++ b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet
@@ -250,7 +250,7 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli
metadata: {
name: 'prometheus',
namespace: p.namespace,
- labels: { 'k8s-app': 'prometheus' } + $._config.prometheus.labels,
+ labels: $._config.prometheus.labels,
},
spec: {
selector: {
@@ -269,10 +269,10 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli
metadata: {
name: 'kube-scheduler',
namespace: p.namespace,
- labels: { 'k8s-app': 'kube-scheduler' },
+ labels: { 'app.kubernetes.io/name': 'kube-scheduler' },
},
spec: {
- jobLabel: 'k8s-app',
+ jobLabel: 'app.kubernetes.io/name',
endpoints: [{
port: 'https-metrics',
interval: '30s',
@@ -281,7 +281,7 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli
tlsConfig: { insecureSkipVerify: true },
}],
selector: {
- matchLabels: { 'k8s-app': 'kube-scheduler' },
+ matchLabels: { 'app.kubernetes.io/name': 'kube-scheduler' },
},
namespaceSelector: {
matchNames: ['kube-system'],
@@ -295,10 +295,10 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli
metadata: {
name: 'kubelet',
namespace: p.namespace,
- labels: { 'k8s-app': 'kubelet' },
+ labels: { 'app.kubernetes.io/name': 'kubelet' },
},
spec: {
- jobLabel: 'k8s-app',
+ jobLabel: 'app.kubernetes.io/name',
endpoints: [
{
port: 'https-metrics',
@@ -353,7 +353,7 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli
},
],
selector: {
- matchLabels: { 'k8s-app': 'kubelet' },
+ matchLabels: { 'app.kubernetes.io/name': 'kubelet' },
},
namespaceSelector: {
matchNames: ['kube-system'],
@@ -367,10 +367,10 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli
metadata: {
name: 'kube-controller-manager',
namespace: p.namespace,
- labels: { 'k8s-app': 'kube-controller-manager' },
+ labels: { 'app.kubernetes.io/name': 'kube-controller-manager' },
},
spec: {
- jobLabel: 'k8s-app',
+ jobLabel: 'app.kubernetes.io/name',
endpoints: [{
port: 'https-metrics',
interval: '30s',
@@ -388,7 +388,7 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli
],
}],
selector: {
- matchLabels: { 'k8s-app': 'kube-controller-manager' },
+ matchLabels: { 'app.kubernetes.io/name': 'kube-controller-manager' },
},
namespaceSelector: {
matchNames: ['kube-system'],
@@ -402,7 +402,7 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli
metadata: {
name: 'kube-apiserver',
namespace: p.namespace,
- labels: { 'k8s-app': 'apiserver' },
+ labels: { 'app.kubernetes.io/name': 'apiserver' },
},
spec: {
jobLabel: 'component',
@@ -456,12 +456,12 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli
metadata: {
name: 'coredns',
namespace: p.namespace,
- labels: { 'k8s-app': 'coredns' },
+ labels: { 'app.kubernetes.io/name': 'coredns' },
},
spec: {
- jobLabel: 'k8s-app',
+ jobLabel: 'app.kubernetes.io/name',
selector: {
- matchLabels: { 'k8s-app': 'kube-dns' },
+ matchLabels: { 'app.kubernetes.io/name': 'kube-dns' },
},
namespaceSelector: {
matchNames: ['kube-system'],
--
GitLab