From 720c599132282fe3459134d24ec4ac4e6bb1798f Mon Sep 17 00:00:00 2001 From: Naseem Ullah Date: Thu, 7 Feb 2019 20:34:19 -0500 Subject: [PATCH 1/2] Use recommended labels Signed-off-by: Naseem Ullah --- README.md | 4 +- all-in-one/jaeger-all-in-one-template.yml | 38 +++++++++------- jaeger-production-template.yml | 53 ++++++++++++---------- production-elasticsearch/configmap.yml | 3 +- production-elasticsearch/elasticsearch.yml | 19 +++++--- production/cassandra.yml | 25 ++++++---- production/configmap.yml | 3 +- 7 files changed, 80 insertions(+), 65 deletions(-) diff --git a/README.md b/README.md index 2b915bc..0a71a0b 100644 --- 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 index d96cc84..1548f49 100644 --- a/all-in-one/jaeger-all-in-one-template.yml +++ b/all-in-one/jaeger-all-in-one-template.yml @@ -18,10 +18,10 @@ 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: @@ -29,8 +29,8 @@ items: template: 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" @@ -64,8 +64,8 @@ items: metadata: 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 @@ -73,15 +73,16 @@ items: 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 +98,16 @@ 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 +128,15 @@ 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 +145,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 index 5622384..4f82b0b 100644 --- a/jaeger-production-template.yml +++ b/jaeger-production-template.yml @@ -20,8 +20,8 @@ items: metadata: name: jaeger-collector labels: - app: jaeger - jaeger-infra: collector-deployment + app.kubernetes.io/name: jaeger + app.kubernetes.io/component: collector spec: replicas: 1 strategy: @@ -29,14 +29,14 @@ items: template: 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: @@ -71,8 +71,8 @@ items: 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 @@ -88,15 +88,16 @@ 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 @@ -104,15 +105,16 @@ items: 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: @@ -120,14 +122,14 @@ items: template: 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: @@ -158,8 +160,8 @@ items: metadata: 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 @@ -167,28 +169,29 @@ items: 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 index f431855..6549011 100644 --- a/production-elasticsearch/configmap.yml +++ b/production-elasticsearch/configmap.yml @@ -17,8 +17,7 @@ kind: ConfigMap 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 index fdac90f..9863c90 100644 --- a/production-elasticsearch/elasticsearch.yml +++ b/production-elasticsearch/elasticsearch.yml @@ -20,16 +20,18 @@ items: metadata: name: elasticsearch labels: - app: jaeger - jaeger-infra: elasticsearch-statefulset + 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.kubernetes.io/name: elasticsearch + app.kubernetes.io/component: storage-backend + app.kubernetes.io/part-of: jaeger spec: containers: - name: elasticsearch @@ -65,12 +67,15 @@ items: metadata: name: elasticsearch labels: - app: jaeger - jaeger-infra: elasticsearch-service + 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 index cba491c..20ba824 100644 --- a/production/cassandra.yml +++ b/production/cassandra.yml @@ -20,9 +20,9 @@ items: metadata: name: cassandra labels: - app: jaeger - name: jaeger-cassandra-service - jaeger-infra: cassandra-service + app.kubernetes.io/name: cassandra + app.kubernetes.io/component: storage-backend + app.kubernetes.io/part-of: jaeger spec: ports: - port: 7000 @@ -37,22 +37,26 @@ 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.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 +114,9 @@ items: metadata: name: jaeger-cassandra-schema-job labels: - app: jaeger - jaeger-infra: cassandra-schema-job + 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 index 76183b9..d9f9282 100644 --- a/production/configmap.yml +++ b/production/configmap.yml @@ -17,8 +17,7 @@ kind: ConfigMap metadata: name: jaeger-configuration labels: - app: jaeger - jaeger-infra: configuration + app.kubernetes.io/name: jaeger data: span-storage-type: cassandra collector: | From 86fdf2a5cf24aa9c707728dfc327ccf29e0f9a86 Mon Sep 17 00:00:00 2001 From: Naseem Ullah Date: Fri, 8 Feb 2019 14:32:36 -0500 Subject: [PATCH 2/2] Adding back app label Signed-off-by: Naseem Ullah --- all-in-one/jaeger-all-in-one-template.yml | 6 ++++++ jaeger-production-template.yml | 9 +++++++++ production-elasticsearch/configmap.yml | 1 + production-elasticsearch/elasticsearch.yml | 3 +++ production/cassandra.yml | 4 ++++ production/configmap.yml | 1 + 6 files changed, 24 insertions(+) diff --git a/all-in-one/jaeger-all-in-one-template.yml b/all-in-one/jaeger-all-in-one-template.yml index 1548f49..7fb47f2 100644 --- a/all-in-one/jaeger-all-in-one-template.yml +++ b/all-in-one/jaeger-all-in-one-template.yml @@ -20,6 +20,7 @@ items: metadata: name: jaeger labels: + app: jaeger app.kubernetes.io/name: jaeger app.kubernetes.io/component: all-in-one spec: @@ -29,6 +30,7 @@ items: template: metadata: labels: + app: jaeger app.kubernetes.io/name: jaeger app.kubernetes.io/component: all-in-one annotations: @@ -64,6 +66,7 @@ items: metadata: name: jaeger-query labels: + app: jaeger app.kubernetes.io/name: jaeger app.kubernetes.io/component: query spec: @@ -81,6 +84,7 @@ items: metadata: name: jaeger-collector labels: + app: jaeger app.kubernetes.io/name: jaeger app.kubernetes.io/component: collector spec: @@ -106,6 +110,7 @@ items: metadata: name: jaeger-agent labels: + app: jaeger app.kubernetes.io/name: jaeger app.kubernetes.io/component: agent spec: @@ -135,6 +140,7 @@ items: metadata: name: zipkin labels: + app: jaeger app.kubernetes.io/name: jaeger app.kubernetes.io/component: zipkin spec: diff --git a/jaeger-production-template.yml b/jaeger-production-template.yml index 4f82b0b..fe0dae7 100644 --- a/jaeger-production-template.yml +++ b/jaeger-production-template.yml @@ -20,6 +20,7 @@ items: metadata: name: jaeger-collector labels: + app: jaeger app.kubernetes.io/name: jaeger app.kubernetes.io/component: collector spec: @@ -29,6 +30,7 @@ items: template: metadata: labels: + app: jaeger app.kubernetes.io/name: jaeger app.kubernetes.io/component: collector annotations: @@ -71,6 +73,7 @@ items: metadata: name: jaeger-collector labels: + app: jaeger app.kubernetes.io/name: jaeger app.kubernetes.io/component: collector spec: @@ -96,6 +99,7 @@ items: metadata: name: zipkin labels: + app: jaeger app.kubernetes.io/name: jaeger app.kubernetes.io/component: zipkin spec: @@ -113,6 +117,7 @@ items: metadata: name: jaeger-query labels: + app: jaeger app.kubernetes.io/name: jaeger app.kubernetes.io/component: query spec: @@ -122,6 +127,7 @@ items: template: metadata: labels: + app: jaeger app.kubernetes.io/name: jaeger app.kubernetes.io/component: query annotations: @@ -160,6 +166,7 @@ items: metadata: name: jaeger-query labels: + app: jaeger app.kubernetes.io/name: jaeger app.kubernetes.io/component: query spec: @@ -177,12 +184,14 @@ items: metadata: name: jaeger-agent labels: + app: jaeger app.kubernetes.io/name: jaeger app.kubernetes.io/component: agent spec: template: metadata: labels: + app: jaeger app.kubernetes.io/name: jaeger app.kubernetes.io/component: agent annotations: diff --git a/production-elasticsearch/configmap.yml b/production-elasticsearch/configmap.yml index 6549011..cf40dc3 100644 --- a/production-elasticsearch/configmap.yml +++ b/production-elasticsearch/configmap.yml @@ -17,6 +17,7 @@ kind: ConfigMap metadata: name: jaeger-configuration labels: + app: jaeger app.kubernetes.io/name: jaeger data: span-storage-type: elasticsearch diff --git a/production-elasticsearch/elasticsearch.yml b/production-elasticsearch/elasticsearch.yml index 9863c90..06cc4bf 100644 --- a/production-elasticsearch/elasticsearch.yml +++ b/production-elasticsearch/elasticsearch.yml @@ -20,6 +20,7 @@ items: metadata: name: elasticsearch labels: + app: elasticsearch app.kubernetes.io/name: elasticsearch app.kubernetes.io/component: storage-backend app.kubernetes.io/part-of: jaeger @@ -29,6 +30,7 @@ items: template: metadata: labels: + app: elasticsearch app.kubernetes.io/name: elasticsearch app.kubernetes.io/component: storage-backend app.kubernetes.io/part-of: jaeger @@ -67,6 +69,7 @@ items: metadata: name: elasticsearch labels: + app: elasticsearch app.kubernetes.io/name: elasticsearch app.kubernetes.io/component: storage-backend app.kubernetes.io/part-of: jaeger diff --git a/production/cassandra.yml b/production/cassandra.yml index 20ba824..248cd2e 100644 --- a/production/cassandra.yml +++ b/production/cassandra.yml @@ -20,6 +20,7 @@ items: metadata: name: cassandra labels: + app: cassandra app.kubernetes.io/name: cassandra app.kubernetes.io/component: storage-backend app.kubernetes.io/part-of: jaeger @@ -45,6 +46,7 @@ items: metadata: name: cassandra labels: + app: cassandra app.kubernetes.io/name: cassandra app.kubernetes.io/component: storage-backend app.kubernetes.io/part-of: jaeger @@ -54,6 +56,7 @@ items: template: metadata: labels: + app: cassandra app.kubernetes.io/name: cassandra app.kubernetes.io/component: storage-backend app.kubernetes.io/part-of: jaeger @@ -114,6 +117,7 @@ items: metadata: name: jaeger-cassandra-schema-job labels: + app: cassandra-schema app.kubernetes.io/name: cassandra-schema app.kubernetes.io/component: storage-backend app.kubernetes.io/part-of: jaeger diff --git a/production/configmap.yml b/production/configmap.yml index d9f9282..7ce3f67 100644 --- a/production/configmap.yml +++ b/production/configmap.yml @@ -17,6 +17,7 @@ kind: ConfigMap metadata: name: jaeger-configuration labels: + app: jaeger app.kubernetes.io/name: jaeger data: span-storage-type: cassandra