Merge pull request observatorium#33 from squat/update-labels

jsonnet: update 'app' labels

Author: squat

environments/kubernetes/manifests/thanos-querier-deployment.yaml

@@ -2,18 +2,18 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    app: thanos-querier
+    app.kubernetes.io/name: thanos-querier
   name: thanos-querier
   namespace: observatorium
 spec:
   replicas: 3
   selector:
     matchLabels:
-      app: thanos-querier
+      app.kubernetes.io/name: thanos-querier
   template:
     metadata:
       labels:
-        app: thanos-querier
+        app.kubernetes.io/name: thanos-querier
     spec:
       containers:
       - args:

environments/kubernetes/manifests/thanos-querier-service.yaml

@@ -2,16 +2,16 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    app: thanos-querier
+    app.kubernetes.io/name: thanos-querier
   name: thanos-querier
   namespace: observatorium
 spec:
   ports:
   - name: grpc
     port: 10901
-    targetPort: 10901
+    targetPort: grpc
   - name: http
     port: 9090
-    targetPort: 10902
+    targetPort: http
   selector:
-    app: thanos-querier
+    app.kubernetes.io/name: thanos-querier

environments/kubernetes/manifests/thanos-receive-service.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    app: thanos-receive
+    app.kubernetes.io/name: thanos-receive
   name: thanos-receive
   namespace: observatorium
 spec:
@@ -18,5 +18,5 @@ spec:
     port: 19291
     targetPort: 19291
   selector:
-    app: thanos-receive-default
+    app.kubernetes.io/name: thanos-receive-default
     controller.receive.thanos.io: thanos-receive-controller

environments/kubernetes/manifests/thanos-receive-statefulSet.yaml

@@ -2,21 +2,21 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   labels:
-    app: thanos-receive-default
+    app.kubernetes.io/name: thanos-receive-default
     controller.receive.thanos.io: thanos-receive-controller
   name: thanos-receive-default
   namespace: observatorium
 spec:
   replicas: 3
   selector:
     matchLabels:
-      app: thanos-receive-default
+      app.kubernetes.io/name: thanos-receive-default
       controller.receive.thanos.io: thanos-receive-controller
   serviceName: thanos-receive
   template:
     metadata:
       labels:
-        app: thanos-receive-default
+        app.kubernetes.io/name: thanos-receive-default
         controller.receive.thanos.io: thanos-receive-controller
     spec:
       containers:

environments/kubernetes/manifests/thanos-store-service.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    app: thanos-store
+    app.kubernetes.io/name: thanos-store
   name: thanos-store
   namespace: observatorium
 spec:
@@ -15,4 +15,4 @@ spec:
     port: 10902
     targetPort: 10902
   selector:
-    app: thanos-store
+    app.kubernetes.io/name: thanos-store

environments/kubernetes/manifests/thanos-store-statefulSet.yaml

@@ -2,19 +2,19 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   labels:
-    app: thanos-store
+    app.kubernetes.io/name: thanos-store
   name: thanos-store
   namespace: observatorium
 spec:
   replicas: 3
   selector:
     matchLabels:
-      app: thanos-store
+      app.kubernetes.io/name: thanos-store
   serviceName: thanos-store
   template:
     metadata:
       labels:
-        app: thanos-store
+        app.kubernetes.io/name: thanos-store
     spec:
       containers:
       - args:

environments/openshift/kube-thanos.libsonnet

@@ -54,7 +54,7 @@ local list = import 'telemeter/lib/list.libsonnet';
           session_secret: std.base64($.thanos.variables.proxyConfig.sessionSecret),
         }) +
         secret.mixin.metadata.withNamespace(namespace) +
-        secret.mixin.metadata.withLabels({ app: 'thanos-querier' }),
+        secret.mixin.metadata.withLabels({ 'app.kubernetes.io/name': 'thanos-querier' }),
 
       service+:
         service.mixin.metadata.withNamespace(namespace) +

environments/openshift/manifests/observatorium-template.yaml

@@ -7,18 +7,18 @@ objects:
   kind: Deployment
   metadata:
     labels:
-      app: thanos-querier
+      app.kubernetes.io/name: thanos-querier
     name: thanos-querier
     namespace: ${NAMESPACE}
   spec:
     replicas: ${{THANOS_QUERIER_REPLICAS}}
     selector:
       matchLabels:
-        app: thanos-querier
+        app.kubernetes.io/name: thanos-querier
     template:
       metadata:
         labels:
-          app: thanos-querier
+          app.kubernetes.io/name: thanos-querier
       spec:
         containers:
         - args:
@@ -80,7 +80,7 @@ objects:
   kind: Secret
   metadata:
     labels:
-      app: thanos-querier
+      app.kubernetes.io/name: thanos-querier
     name: querier-proxy
     namespace: ${NAMESPACE}
   type: Opaque
@@ -90,22 +90,22 @@ objects:
     annotations:
       service.alpha.openshift.io/serving-cert-secret-name: querier-tls
     labels:
-      app: thanos-querier
+      app.kubernetes.io/name: thanos-querier
     name: thanos-querier
     namespace: ${NAMESPACE}
   spec:
     ports:
     - name: grpc
       port: 10901
-      targetPort: 10901
+      targetPort: grpc
     - name: http
       port: 9090
-      targetPort: 10902
+      targetPort: http
     - name: https
       port: 9091
       targetPort: https
     selector:
-      app: thanos-querier
+      app.kubernetes.io/name: thanos-querier
 - apiVersion: v1
   data:
     hashrings.json: |-
@@ -212,7 +212,7 @@ objects:
   kind: Service
   metadata:
     labels:
-      app: thanos-receive
+      app.kubernetes.io/name: thanos-receive
     name: thanos-receive
     namespace: ${NAMESPACE}
   spec:
@@ -228,27 +228,27 @@ objects:
       port: 19291
       targetPort: 19291
     selector:
-      app: thanos-receive-default
+      app.kubernetes.io/name: thanos-receive-default
       controller.receive.thanos.io: thanos-receive-controller
 - apiVersion: apps/v1
   kind: StatefulSet
   metadata:
     labels:
-      app: thanos-receive-default
+      app.kubernetes.io/name: thanos-receive-default
       controller.receive.thanos.io: thanos-receive-controller
     name: thanos-receive-default
     namespace: ${NAMESPACE}
   spec:
     replicas: ${{THANOS_RECEIVE_REPLICAS}}
     selector:
       matchLabels:
-        app: thanos-receive-default
+        app.kubernetes.io/name: thanos-receive-default
         controller.receive.thanos.io: thanos-receive-controller
     serviceName: thanos-receive
     template:
       metadata:
         labels:
-          app: thanos-receive-default
+          app.kubernetes.io/name: thanos-receive-default
           controller.receive.thanos.io: thanos-receive-controller
       spec:
         containers:
@@ -313,7 +313,7 @@ objects:
   kind: Service
   metadata:
     labels:
-      app: thanos-store
+      app.kubernetes.io/name: thanos-store
     name: thanos-store
     namespace: ${NAMESPACE}
   spec:
@@ -326,24 +326,24 @@ objects:
       port: 10902
       targetPort: 10902
     selector:
-      app: thanos-store
+      app.kubernetes.io/name: thanos-store
 - apiVersion: apps/v1
   kind: StatefulSet
   metadata:
     labels:
-      app: thanos-store
+      app.kubernetes.io/name: thanos-store
     name: thanos-store
     namespace: ${NAMESPACE}
   spec:
     replicas: ${{THANOS_STORE_REPLICAS}}
     selector:
       matchLabels:
-        app: thanos-store
+        app.kubernetes.io/name: thanos-store
     serviceName: thanos-store
     template:
       metadata:
         labels:
-          app: thanos-store
+          app.kubernetes.io/name: thanos-store
       spec:
         containers:
         - args:

environments/sre/servicemonitors.jsonnet

@@ -10,7 +10,7 @@ local sm =
           },
           spec+: {
             selector+: {
-              matchLabels: { app: 'thanos-querier' },
+              matchLabels: { 'app.kubernetes.io/name': 'thanos-querier' },
             },
             namespaceSelector: {
               matchNames: ['telemeter-stage'],
@@ -26,7 +26,7 @@ local sm =
           },
           spec+: {
             selector+: {
-              matchLabels: { app: 'thanos-store' },
+              matchLabels: { 'app.kubernetes.io/name': 'thanos-store' },
             },
             namespaceSelector: {
               matchNames: ['telemeter-stage'],
@@ -42,7 +42,7 @@ local sm =
           },
           spec+: {
             selector+: {
-              matchLabels: { app: 'thanos-receive' },
+              matchLabels: { 'app.kubernetes.io/name': 'thanos-receive' },
             },
             namespaceSelector: {
               matchNames: ['telemeter-stage'],

environments/sre/servicemonitors/observatorium-thanos-querier-serviceMonitor.yaml

@@ -12,4 +12,4 @@ spec:
     - telemeter-stage
   selector:
     matchLabels:
-      app: thanos-querier
+      app.kubernetes.io/name: thanos-querier

environments/sre/servicemonitors/observatorium-thanos-receive-serviceMonitor.yaml

@@ -12,4 +12,4 @@ spec:
     - telemeter-stage
   selector:
     matchLabels:
-      app: thanos-receive
+      app.kubernetes.io/name: thanos-receive

environments/sre/servicemonitors/observatorium-thanos-store-serviceMonitor.yaml

@@ -12,4 +12,4 @@ spec:
     - telemeter-stage
   selector:
     matchLabels:
-      app: thanos-store
+      app.kubernetes.io/name: thanos-store

jsonnetfile.lock.json

@@ -8,7 +8,7 @@
                     "subdir": "jsonnet/kube-thanos"
                 }
             },
-            "version": "d0d2e5f62a922bc39d29eae4ee386cca4d0f15b6"
+            "version": "4c9aec2115ddab814aaae08b0c694af0d9b756ec"
         },
         {
             "name": "ksonnet",