Use recommended labels (#113)

Use recommended labels Signed-off-by: Naseem Ullah <[email protected]>
jaegertracing · Feb 22, 2019 · 39dc136 · 39dc136
1 parent 14f375e
commit 39dc136
Show file tree

Hide file tree

Showing 7 changed files with 86 additions and 47 deletions.
diff --git a/README.md b/README.md
@@ -100,11 +100,11 @@ Assuming that your application is named `myapp` and the image is for it is `myna
   spec:
     selector:
       matchLabels:
-        app: myapp
+        app.kubernetes.io/name: myapp
     template:
       metadata:
         labels:
-          app: myapp
+          app.kubernetes.io/name: myapp
       spec:
         containers:
         - image: mynamespace/hello-myimage

diff --git a/all-in-one/jaeger-all-in-one-template.yml b/all-in-one/jaeger-all-in-one-template.yml
@@ -18,10 +18,11 @@ items:
 - apiVersion: extensions/v1beta1
   kind: Deployment
   metadata:
-    name: jaeger-deployment
+    name: jaeger
     labels:
       app: jaeger
-      jaeger-infra: jaeger-deployment
+      app.kubernetes.io/name: jaeger
+      app.kubernetes.io/component: all-in-one
   spec:
     replicas: 1
     strategy:
@@ -30,7 +31,8 @@ items:
       metadata:
         labels:
           app: jaeger
-          jaeger-infra: jaeger-pod
+          app.kubernetes.io/name: jaeger
+          app.kubernetes.io/component: all-in-one
         annotations:
           prometheus.io/scrape: "true"
           prometheus.io/port: "16686"
@@ -65,23 +67,26 @@ items:
     name: jaeger-query
     labels:
       app: jaeger
-      jaeger-infra: jaeger-service
+      app.kubernetes.io/name: jaeger
+      app.kubernetes.io/component: query
   spec:
     ports:
       - name: query-http
         port: 80
         protocol: TCP
         targetPort: 16686
     selector:
-      jaeger-infra: jaeger-pod
+      app.kubernetes.io/name: jaeger
+      app.kubernetes.io/component: all-in-one
     type: LoadBalancer
 - apiVersion: v1
   kind: Service
   metadata:
     name: jaeger-collector
     labels:
       app: jaeger
-      jaeger-infra: collector-service
+      app.kubernetes.io/name: jaeger
+      app.kubernetes.io/component: collector
   spec:
     ports:
     - name: jaeger-collector-tchannel
@@ -97,15 +102,17 @@ items:
       protocol: TCP
       targetPort: 9411
     selector:
-      jaeger-infra: jaeger-pod
+      app.kubernetes.io/name: jaeger
+      app.kubernetes.io/component: all-in-one
     type: ClusterIP
 - apiVersion: v1
   kind: Service
   metadata:
     name: jaeger-agent
     labels:
       app: jaeger
-      jaeger-infra: agent-service
+      app.kubernetes.io/name: jaeger
+      app.kubernetes.io/component: agent
   spec:
     ports:
     - name: agent-zipkin-thrift
@@ -126,14 +133,16 @@ items:
       targetPort: 5778
     clusterIP: None
     selector:
-      jaeger-infra: jaeger-pod
+      app.kubernetes.io/name: jaeger
+      app.kubernetes.io/component: all-in-one
 - apiVersion: v1
   kind: Service
   metadata:
     name: zipkin
     labels:
       app: jaeger
-      jaeger-infra: zipkin-service
+      app.kubernetes.io/name: jaeger
+      app.kubernetes.io/component: zipkin
   spec:
     ports:
     - name: jaeger-collector-zipkin
@@ -142,5 +151,6 @@ items:
       targetPort: 9411
     clusterIP: None
     selector:
-      jaeger-infra: jaeger-pod
+      app.kubernetes.io/name: jaeger
+      app.kubernetes.io/component: all-in-one
 
diff --git a/jaeger-production-template.yml b/jaeger-production-template.yml
@@ -21,7 +21,8 @@ items:
     name: jaeger-collector
     labels:
       app: jaeger
-      jaeger-infra: collector-deployment
+      app.kubernetes.io/name: jaeger
+      app.kubernetes.io/component: collector
   spec:
     replicas: 1
     strategy:
@@ -30,13 +31,14 @@ items:
       metadata:
         labels:
           app: jaeger
-          jaeger-infra: collector-pod
+          app.kubernetes.io/name: jaeger
+          app.kubernetes.io/component: collector
         annotations:
           prometheus.io/scrape: "true"
           prometheus.io/port: "14268"
       spec:
         containers:
-        - image: jaegertracing/jaeger-collector:1.7.0
+        - image: jaegertracing/jaeger-collector:1.9.0
           name: jaeger-collector
           args: ["--config-file=/conf/collector.yaml"]
           ports:
@@ -72,7 +74,8 @@ items:
     name: jaeger-collector
     labels:
       app: jaeger
-      jaeger-infra: collector-service
+      app.kubernetes.io/name: jaeger
+      app.kubernetes.io/component: collector
   spec:
     ports:
     - name: jaeger-collector-tchannel
@@ -88,31 +91,35 @@ items:
       protocol: TCP
       targetPort: 9411
     selector:
-      jaeger-infra: collector-pod
+      app.kubernetes.io/name: jaeger
+      app.kubernetes.io/component: collector
     type: ClusterIP
 - apiVersion: v1
   kind: Service
   metadata:
     name: zipkin
     labels:
       app: jaeger
-      jaeger-infra: zipkin-service
+      app.kubernetes.io/name: jaeger
+      app.kubernetes.io/component: zipkin
   spec:
     ports:
     - name: jaeger-collector-zipkin
       port: 9411
       protocol: TCP
       targetPort: 9411
     selector:
-      jaeger-infra: collector-pod
+      app.kubernetes.io/name: jaeger
+      app.kubernetes.io/component: collector
     type: ClusterIP
 - apiVersion: extensions/v1beta1
   kind: Deployment
   metadata:
     name: jaeger-query
     labels:
       app: jaeger
-      jaeger-infra: query-deployment
+      app.kubernetes.io/name: jaeger
+      app.kubernetes.io/component: query
   spec:
     replicas: 1
     strategy:
@@ -121,13 +128,14 @@ items:
       metadata:
         labels:
           app: jaeger
-          jaeger-infra: query-pod
+          app.kubernetes.io/name: jaeger
+          app.kubernetes.io/component: query
         annotations:
           prometheus.io/scrape: "true"
           prometheus.io/port: "16686"
       spec:
         containers:
-        - image: jaegertracing/jaeger-query:1.7.0
+        - image: jaegertracing/jaeger-query:1.9.0
           name: jaeger-query
           args: ["--config-file=/conf/query.yaml"]
           ports:
@@ -159,36 +167,40 @@ items:
     name: jaeger-query
     labels:
       app: jaeger
-      jaeger-infra: query-service
+      app.kubernetes.io/name: jaeger
+      app.kubernetes.io/component: query
   spec:
     ports:
     - name: jaeger-query
       port: 80
       protocol: TCP
       targetPort: 16686
     selector:
-      jaeger-infra: query-pod
+      app.kubernetes.io/name: jaeger
+      app.kubernetes.io/component: query
     type: LoadBalancer
 - apiVersion: extensions/v1beta1
   kind: DaemonSet
   metadata:
     name: jaeger-agent
     labels:
       app: jaeger
-      jaeger-infra: agent-daemonset
+      app.kubernetes.io/name: jaeger
+      app.kubernetes.io/component: agent
   spec:
     template:
       metadata:
         labels:
           app: jaeger
-          jaeger-infra: agent-instance
+          app.kubernetes.io/name: jaeger
+          app.kubernetes.io/component: agent
         annotations:
           prometheus.io/scrape: "true"
           prometheus.io/port: "5778"
       spec:
         containers:
-        - name: agent-instance
-          image: jaegertracing/jaeger-agent:1.7.0
+        - name: jaeger-agent
+          image: jaegertracing/jaeger-agent:1.9.0
           args: ["--config-file=/conf/agent.yaml"]
           volumeMounts:
           - name: jaeger-configuration-volume

diff --git a/production-elasticsearch/configmap.yml b/production-elasticsearch/configmap.yml
@@ -18,7 +18,7 @@ metadata:
   name: jaeger-configuration
   labels:
     app: jaeger
-    jaeger-infra: configuration
+    app.kubernetes.io/name: jaeger
 data:
   span-storage-type: elasticsearch
   collector: |

diff --git a/production-elasticsearch/elasticsearch.yml b/production-elasticsearch/elasticsearch.yml
@@ -20,16 +20,20 @@ items:
   metadata:
     name: elasticsearch
     labels:
-      app: jaeger
-      jaeger-infra: elasticsearch-statefulset
+      app: elasticsearch
+      app.kubernetes.io/name: elasticsearch
+      app.kubernetes.io/component: storage-backend
+      app.kubernetes.io/part-of: jaeger
   spec:
     serviceName: elasticsearch
     replicas: 1
     template:
       metadata:
         labels:
-          app: jaeger-elasticsearch
-          jaeger-infra: elasticsearch-replica
+          app: elasticsearch
+          app.kubernetes.io/name: elasticsearch
+          app.kubernetes.io/component: storage-backend
+          app.kubernetes.io/part-of: jaeger
       spec:
         containers:
           - name: elasticsearch
@@ -65,12 +69,16 @@ items:
   metadata:
     name: elasticsearch
     labels:
-      app: jaeger
-      jaeger-infra: elasticsearch-service
+      app: elasticsearch
+      app.kubernetes.io/name: elasticsearch
+      app.kubernetes.io/component: storage-backend
+      app.kubernetes.io/part-of: jaeger
   spec:
     clusterIP: None
     selector:
-      app: jaeger-elasticsearch
+      app.kubernetes.io/name: elasticsearch
+      app.kubernetes.io/component: storage-backend
+      app.kubernetes.io/part-of: jaeger
     ports:
     - port: 9200
       name: elasticsearch

diff --git a/production/cassandra.yml b/production/cassandra.yml
@@ -20,9 +20,10 @@ items:
   metadata:
     name: cassandra
     labels:
-      app: jaeger
-      name: jaeger-cassandra-service
-      jaeger-infra: cassandra-service
+      app: cassandra
+      app.kubernetes.io/name: cassandra
+      app.kubernetes.io/component: storage-backend
+      app.kubernetes.io/part-of: jaeger
   spec:
     ports:
     - port: 7000
@@ -37,22 +38,28 @@ items:
       name: thrift
     clusterIP: None
     selector:
-      app: cassandra
+      app.kubernetes.io/name: cassandra
+      app.kubernetes.io/component: storage-backend
+      app.kubernetes.io/part-of: jaeger
 - apiVersion: "apps/v1beta1"
   kind: StatefulSet
   metadata:
     name: cassandra
     labels:
-      app: jaeger
-      jaeger-infra: cassandra-statefulset
+      app: cassandra
+      app.kubernetes.io/name: cassandra
+      app.kubernetes.io/component: storage-backend
+      app.kubernetes.io/part-of: jaeger
   spec:
     serviceName: cassandra
     replicas: 3
     template:
       metadata:
         labels:
           app: cassandra
-          jaeger-infra: cassandra-replica
+          app.kubernetes.io/name: cassandra
+          app.kubernetes.io/component: storage-backend
+          app.kubernetes.io/part-of: jaeger
       spec:
         terminationGracePeriodSeconds: 1800
         containers:
@@ -110,8 +117,10 @@ items:
   metadata:
     name: jaeger-cassandra-schema-job
     labels:
-      app: jaeger
-      jaeger-infra: cassandra-schema-job
+      app: cassandra-schema
+      app.kubernetes.io/name: cassandra-schema
+      app.kubernetes.io/component: storage-backend
+      app.kubernetes.io/part-of: jaeger
   spec:
     activeDeadlineSeconds: 120
     template:

diff --git a/production/configmap.yml b/production/configmap.yml
@@ -18,7 +18,7 @@ metadata:
   name: jaeger-configuration
   labels:
     app: jaeger
-    jaeger-infra: configuration
+    app.kubernetes.io/name: jaeger
 data:
   span-storage-type: cassandra
   collector: |