loki: clean up labels

BitGo · Jun 23, 2021 · 5f66fdb · 5f66fdb
1 parent 8b7e87b
commit 5f66fdb
Show file tree

Hide file tree

Showing 24 changed files with 164 additions and 126 deletions.
diff --git a/loki/alerting-rules.yaml b/loki/alerting-rules.yaml
@@ -2,6 +2,8 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: loki-alerting-rules
+  labels:
+    app.kubernetes.io/name: loki
 spec:
   groups:
     - name: loki.alerts

diff --git a/loki/apps-v1.Deployment-distributor.yaml b/loki/apps-v1.Deployment-distributor.yaml
@@ -3,29 +3,29 @@ kind: Deployment
 metadata:
   name: distributor
   labels:
-    app.kubernetes.io/name: distributor
-    app.kubernetes.io/part-of: loki
+    app.kubernetes.io/name: loki
+    app.kubernetes.io/component: distributor
 spec:
   minReadySeconds: 10
   replicas: 3
   revisionHistoryLimit: 10
   selector:
     matchLabels:
-      app.kubernetes.io/name: distributor
-      app.kubernetes.io/part-of: loki
+      app.kubernetes.io/name: loki
+      app.kubernetes.io/component: distributor
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: distributor
-        app.kubernetes.io/part-of: loki
+        app.kubernetes.io/name: loki
+        app.kubernetes.io/component: distributor
     spec:
       affinity:
         podAntiAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
           - labelSelector:
               matchLabels:
-                app.kubernetes.io/name: distributor
-                app.kubernetes.io/part-of: loki
+                app.kubernetes.io/name: loki
+                app.kubernetes.io/component: distributor
             topologyKey: kubernetes.io/hostname
       containers:
       - name: distributor

diff --git a/loki/apps-v1.Deployment-query-frontend.yaml b/loki/apps-v1.Deployment-query-frontend.yaml
@@ -3,29 +3,29 @@ kind: Deployment
 metadata:
   name: query-frontend
   labels:
-    app.kubernetes.io/name: query-frontend
-    app.kubernetes.io/part-of: loki
+    app.kubernetes.io/name: loki
+    app.kubernetes.io/component: query-frontend
 spec:
   minReadySeconds: 10
   replicas: 2
   revisionHistoryLimit: 10
   selector:
     matchLabels:
-      app.kubernetes.io/name: query-frontend
-      app.kubernetes.io/part-of: loki
+      app.kubernetes.io/name: loki
+      app.kubernetes.io/component: query-frontend
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: query-frontend
-        app.kubernetes.io/part-of: loki
+        app.kubernetes.io/name: loki
+        app.kubernetes.io/component: query-frontend
     spec:
       affinity:
         podAntiAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
           - labelSelector:
               matchLabels:
-                app.kubernetes.io/name: query-frontend
-                app.kubernetes.io/part-of: loki
+                app.kubernetes.io/name: loki
+                app.kubernetes.io/component: query-frontend
             topologyKey: kubernetes.io/hostname
       containers:
       - name: query-frontend

diff --git a/loki/apps-v1.StatefulSet-compactor.yaml b/loki/apps-v1.StatefulSet-compactor.yaml
@@ -3,20 +3,20 @@ kind: StatefulSet
 metadata:
   name: compactor
   labels:
-    app.kubernetes.io/name: compactor
-    app.kubernetes.io/part-of: loki
+    app.kubernetes.io/name: loki
+    app.kubernetes.io/component: compactor
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app.kubernetes.io/name: compactor
-      app.kubernetes.io/part-of: loki
+      app.kubernetes.io/name: loki
+      app.kubernetes.io/component: compactor
   serviceName: compactor
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: compactor
-        app.kubernetes.io/part-of: loki
+        app.kubernetes.io/name: loki
+        app.kubernetes.io/component: compactor
     spec:
       containers:
       - name: compactor

diff --git a/loki/apps-v1.StatefulSet-ingester.yaml b/loki/apps-v1.StatefulSet-ingester.yaml
@@ -3,28 +3,28 @@ kind: StatefulSet
 metadata:
   name: ingester
   labels:
-    app.kubernetes.io/name: ingester
-    app.kubernetes.io/part-of: loki
+    app.kubernetes.io/name: loki
+    app.kubernetes.io/component: ingester
 spec:
   replicas: 3
   selector:
     matchLabels:
-      app.kubernetes.io/name: ingester
-      app.kubernetes.io/part-of: loki
+      app.kubernetes.io/name: loki
+      app.kubernetes.io/component: ingester
   serviceName: ingester
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: ingester
-        app.kubernetes.io/part-of: loki
+        app.kubernetes.io/name: loki
+        app.kubernetes.io/component: ingester
     spec:
       affinity:
         podAntiAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
           - labelSelector:
               matchLabels:
-                app.kubernetes.io/name: ingester
-                app.kubernetes.io/part-of: loki
+                app.kubernetes.io/name: loki
+                app.kubernetes.io/component: ingester
             topologyKey: kubernetes.io/hostname
       containers:
       - name: ingester

diff --git a/loki/apps-v1.StatefulSet-memcached-frontend.yaml b/loki/apps-v1.StatefulSet-memcached-frontend.yaml
@@ -3,28 +3,28 @@ kind: StatefulSet
 metadata:
   name: memcached-frontend
   labels:
-    app.kubernetes.io/name: memcached-frontend
-    app.kubernetes.io/part-of: loki
+    app.kubernetes.io/name: loki
+    app.kubernetes.io/component: memcached-frontend
 spec:
   replicas: 3
   selector:
     matchLabels:
-      app.kubernetes.io/name: memcached-frontend
-      app.kubernetes.io/part-of: loki
+      app.kubernetes.io/name: loki
+      app.kubernetes.io/component: memcached-frontend
   serviceName: memcached-frontend
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: memcached-frontend
-        app.kubernetes.io/part-of: loki
+        app.kubernetes.io/name: loki
+        app.kubernetes.io/component: memcached-frontend
     spec:
       affinity:
         podAntiAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
           - labelSelector:
               matchLabels:
-                app.kubernetes.io/name: memcached-frontend
-                app.kubernetes.io/part-of: loki
+                app.kubernetes.io/name: loki
+                app.kubernetes.io/component: memcached-frontend
             topologyKey: kubernetes.io/hostname
       containers:
       - name: memcached

diff --git a/loki/apps-v1.StatefulSet-memcached-index-queries.yaml b/loki/apps-v1.StatefulSet-memcached-index-queries.yaml
@@ -3,28 +3,28 @@ kind: StatefulSet
 metadata:
   name: memcached-index-queries
   labels:
-    app.kubernetes.io/name: memcached-index-queries
-    app.kubernetes.io/part-of: loki
+    app.kubernetes.io/name: loki
+    app.kubernetes.io/component: memcached-index-queries
 spec:
   replicas: 3
   selector:
     matchLabels:
-      app.kubernetes.io/name: memcached-index-queries
-      app.kubernetes.io/part-of: loki
+      app.kubernetes.io/name: loki
+      app.kubernetes.io/component: memcached-index-queries
   serviceName: memcached-index-queries
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: memcached-index-queries
-        app.kubernetes.io/part-of: loki
+        app.kubernetes.io/name: loki
+        app.kubernetes.io/component: memcached-index-queries
     spec:
       affinity:
         podAntiAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
           - labelSelector:
               matchLabels:
-                app.kubernetes.io/name: memcached-index-queries
-                app.kubernetes.io/part-of: loki
+                app.kubernetes.io/name: loki
+                app.kubernetes.io/component: memcached-index-queries
             topologyKey: kubernetes.io/hostname
       containers:
       - name: memcached

diff --git a/loki/apps-v1.StatefulSet-memcached.yaml b/loki/apps-v1.StatefulSet-memcached.yaml
@@ -3,28 +3,28 @@ kind: StatefulSet
 metadata:
   name: memcached
   labels:
-    app.kubernetes.io/name: memcached
-    app.kubernetes.io/part-of: loki
+    app.kubernetes.io/name: loki
+    app.kubernetes.io/component: memcached
 spec:
   replicas: 3
   selector:
     matchLabels:
-      app.kubernetes.io/name: memcached
-      app.kubernetes.io/part-of: loki
+      app.kubernetes.io/name: loki
+      app.kubernetes.io/component: memcached
   serviceName: memcached
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: memcached
-        app.kubernetes.io/part-of: loki
+        app.kubernetes.io/name: loki
+        app.kubernetes.io/component: memcached
     spec:
       affinity:
         podAntiAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
           - labelSelector:
               matchLabels:
-                app.kubernetes.io/name: memcached
-                app.kubernetes.io/part-of: loki
+                app.kubernetes.io/name: loki
+                app.kubernetes.io/component: memcached
             topologyKey: kubernetes.io/hostname
       containers:
       - name: memcached

diff --git a/loki/apps-v1.StatefulSet-querier.yaml b/loki/apps-v1.StatefulSet-querier.yaml
@@ -3,28 +3,28 @@ kind: StatefulSet
 metadata:
   name: querier
   labels:
-    app.kubernetes.io/name: querier
-    app.kubernetes.io/part-of: loki
+    app.kubernetes.io/name: loki
+    app.kubernetes.io/component: querier
 spec:
   replicas: 3
   selector:
     matchLabels:
-      app.kubernetes.io/name: querier
-      app.kubernetes.io/part-of: loki
+      app.kubernetes.io/name: loki
+      app.kubernetes.io/component: querier
   serviceName: querier
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: querier
-        app.kubernetes.io/part-of: loki
+        app.kubernetes.io/name: loki
+        app.kubernetes.io/component: querier
     spec:
       affinity:
         podAntiAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
           - labelSelector:
               matchLabels:
-                app.kubernetes.io/name: querier
-                app.kubernetes.io/part-of: loki
+                app.kubernetes.io/name: loki
+                app.kubernetes.io/component: querier
             topologyKey: kubernetes.io/hostname
       containers:
       - name: querier

diff --git a/loki/apps-v1.StatefulSet-ruler.yaml b/loki/apps-v1.StatefulSet-ruler.yaml
@@ -3,28 +3,28 @@ kind: StatefulSet
 metadata:
   name: ruler
   labels:
-    app.kubernetes.io/name: ruler
-    app.kubernetes.io/part-of: loki
+    app.kubernetes.io/name: loki
+    app.kubernetes.io/component: ruler
 spec:
   replicas: 2
   selector:
     matchLabels:
-      app.kubernetes.io/name: ruler
-      app.kubernetes.io/part-of: loki
+      app.kubernetes.io/name: loki
+      app.kubernetes.io/component: ruler
   serviceName: ruler
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: ruler
-        app.kubernetes.io/part-of: loki
+        app.kubernetes.io/name: loki
+        app.kubernetes.io/component: ruler
     spec:
       affinity:
         podAntiAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
           - labelSelector:
               matchLabels:
-                app.kubernetes.io/name: ruler
-                app.kubernetes.io/part-of: loki
+                app.kubernetes.io/name: loki
+                app.kubernetes.io/component: ruler
             topologyKey: kubernetes.io/hostname
       containers:
       - name: ruler

diff --git a/loki/kustomization.yaml b/loki/kustomization.yaml
@@ -28,6 +28,9 @@ components:
   - ./ruler-sidecar
 configMapGenerator:
   - name: loki
+    options:
+      labels:
+        app.kubernetes.io/name: loki
     files:
       - files/config.yaml
   - name: loki-operational-dashboard

diff --git a/loki/policy-v1beta1.PodDisruptionBudget-loki-ingester-pdb.yaml b/loki/policy-v1beta1.PodDisruptionBudget-loki-ingester-pdb.yaml
@@ -3,9 +3,11 @@ kind: PodDisruptionBudget
 metadata:
   name: loki-ingester-pdb
   labels:
-    name: loki-ingester-pdb
+    app.kubernetes.io/name: loki
+    app.kubernetes.io/component: ingester
 spec:
   maxUnavailable: 1
   selector:
     matchLabels:
-      name: ingester
+      app.kubernetes.io/name: loki
+      app.kubernetes.io/component: ingester
diff --git a/loki/recording-rules.yaml b/loki/recording-rules.yaml
@@ -2,6 +2,8 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: loki-recording-rules
+  labels:
+    app.kubernetes.io/name: loki
 spec:
   groups:
   - name: loki.rules