Update more label names

Signed-off-by: Dustin Hooten <dustinhooten@gmail.com>
pasancario · Mar 26, 2021 · 2d86382 · 2d86382
1 parent e1f4ef7
commit 2d86382
Show file tree

Hide file tree

Showing 14 changed files with 31 additions and 31 deletions.
diff --git a/Documentation/network-policies.md b/Documentation/network-policies.md
@@ -66,7 +66,7 @@ spec:
   podSelector:
     matchLabels:
       alertmanager: main
-      app: alertmanager
+      app.kubernetes.io/name: alertmanager
 ---
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
@@ -93,7 +93,7 @@ spec:
   podSelector:
     matchLabels:
       alertmanager: main
-      app: alertmanager
+      app.kubernetes.io/name: alertmanager
 
 ```
 
@@ -114,7 +114,7 @@ spec:
       protocol: TCP
   podSelector:
     matchLabels:
-      app: grafana
+      app.kubernetes.io/name: grafana
 ```
 
 #### Prometheus
@@ -134,7 +134,7 @@ spec:
       protocol: TCP
   podSelector:
     matchLabels:
-      app: prometheus
+      app.kubernetes.io/name: prometheus
       prometheus: k8s
 ```
 
@@ -166,7 +166,7 @@ spec:
       protocol: TCP
   podSelector:
     matchLabels:
-      app: node-exporter
+      app.kubernetes.io/name: node-exporter
 ```
 
 #### Kube-state-metrics
@@ -197,5 +197,5 @@ spec:
       protocol: TCP
   podSelector:
     matchLabels:
-      app: kube-state-metrics
+      app.kubernetes.io/name: kube-state-metrics
 ```
diff --git a/Documentation/user-guides/monitoring-kubernetes-ingress.md b/Documentation/user-guides/monitoring-kubernetes-ingress.md
@@ -135,7 +135,7 @@ spec:
   routePrefix: /prometheus
   ruleSelector:
     matchLabels:
-      app: prometheus-operator
+      app.kubernetes.io/name: prometheus-operator
   serviceAccountName: prometheus-operator
   serviceMonitorSelector:
     matchLabels:

diff --git a/Documentation/user-guides/storage.md b/Documentation/user-guides/storage.md
@@ -74,7 +74,7 @@ spec:
       spec:
         selector:
           matchLabels:
-            app: my-example-prometheus
+            app.kubernetes.io/name: my-example-prometheus
         resources:
           requests:
             storage: 50Gi

diff --git a/example/networkpolicies/alertmanager.yaml b/example/networkpolicies/alertmanager.yaml
@@ -11,7 +11,7 @@ spec:
   podSelector:
     matchLabels:
       alertmanager: main
-      app: alertmanager
+      app.kubernetes.io/name: alertmanager
 ---
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
@@ -38,5 +38,5 @@ spec:
   podSelector:
     matchLabels:
       alertmanager: main
-      app: alertmanager
+      app.kubernetes.io/name: alertmanager
 
diff --git a/example/networkpolicies/prometheus.yaml b/example/networkpolicies/prometheus.yaml
@@ -9,5 +9,5 @@ spec:
       protocol: TCP
   podSelector:
     matchLabels:
-      app: prometheus
-      prometheus: k8s
+      app.kubernetes.io/name: prometheus
+      prometheus: k8s
diff --git a/example/thanos/prometheus-service.yaml b/example/thanos/prometheus-service.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    app: prometheus
+    app.kubernetes.io/name: prometheus
     prometheus: self
   name: prometheus-self
   namespace: default

diff --git a/example/thanos/prometheus-servicemonitor.yaml b/example/thanos/prometheus-servicemonitor.yaml
@@ -2,7 +2,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   labels:
-    app: prometheus
+    app.kubernetes.io/name: prometheus
     prometheus: self
   name: prometheus-self
   namespace: default
@@ -12,4 +12,4 @@ spec:
     port: web
   selector:
     matchLabels:
-      app: prometheus
+      app.kubernetes.io/name: prometheus
diff --git a/example/thanos/prometheus.yaml b/example/thanos/prometheus.yaml
@@ -13,6 +13,6 @@ spec:
       role: prometheus-rulefiles
   serviceMonitorSelector:
     matchLabels:
-      app: prometheus
+      app.kubernetes.io/name: prometheus
   thanos:
     version: v0.11.2
diff --git a/example/thanos/query-deployment.yaml b/example/thanos/query-deployment.yaml
@@ -2,18 +2,18 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    app: thanos-query
+    app.kubernetes.io/name: thanos-query
   name: thanos-query
   namespace: default
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: thanos-query
+      app.kubernetes.io/name: thanos-query
   template:
     metadata:
       labels:
-        app: thanos-query
+        app.kubernetes.io/name: thanos-query
     spec:
       containers:
       - args:

diff --git a/example/thanos/query-service.yaml b/example/thanos/query-service.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    app: thanos-query
+    app.kubernetes.io/name: thanos-query
   name: thanos-query
   namespace: default
 spec:
@@ -11,4 +11,4 @@ spec:
     port: 10902
     targetPort: http
   selector:
-    app: thanos-query
+    app.kubernetes.io/name: thanos-query
diff --git a/example/thanos/sidecar-service.yaml b/example/thanos/sidecar-service.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    app: thanos-sidecar
+    app.kubernetes.io/name: thanos-sidecar
   name: thanos-sidecar
   namespace: default
 spec:

diff --git a/example/thanos/thanos-ruler-service.yaml b/example/thanos/thanos-ruler-service.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    app: thanos-ruler
+    app.kubernetes.io/name: thanos-ruler
   name: thanos-ruler
   namespace: default
 spec:
@@ -14,4 +14,4 @@ spec:
     port: 10902
     targetPort: web
   selector:
-    app: thanos-ruler
+    app.kubernetes.io/name: thanos-ruler
diff --git a/example/thanos/thanos-ruler.yaml b/example/thanos/thanos-ruler.yaml
@@ -2,7 +2,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ThanosRuler
 metadata:
   labels:
-    app: thanos-ruler
+    app.kubernetes.io/name: thanos-ruler
   name: thanos-ruler
   namespace: default
 spec:

diff --git a/jsonnet/thanos/config.libsonnet b/jsonnet/thanos/config.libsonnet
@@ -32,11 +32,11 @@ local service(name, namespace, labels, selector, ports) = {
       },
       commonLabels: {
         prometheus: 'self',
-        app: 'prometheus',
+        'app.kubernetes.io/name': 'prometheus',
       },
-      queryLabels: { app: 'thanos-query' },
-      sidecarLabels: { app: 'thanos-sidecar' },
-      rulerLabels: { app: 'thanos-ruler' },
+      queryLabels: { 'app.kubernetes.io/name': 'thanos-query' },
+      sidecarLabels: { 'app.kubernetes.io/name': 'thanos-sidecar' },
+      rulerLabels: { 'app.kubernetes.io/name': 'thanos-ruler' },
     },
 
   },
@@ -66,7 +66,7 @@ local service(name, namespace, labels, selector, ports) = {
         replicas: 2,
         serviceMonitorSelector: {
           matchLabels: {
-            app: 'prometheus',
+            'app.kubernetes.io/name': 'prometheus',
           },
         },
         ruleSelector: {
@@ -145,7 +145,7 @@ local service(name, namespace, labels, selector, ports) = {
           ],
           selector: {
             matchLabels: {
-              app: 'prometheus',
+              'app.kubernetes.io/name': 'prometheus',
             },
           },
         },