From 9b9626e0e4f1e96efd0ff9e1561354aa369e8bc9 Mon Sep 17 00:00:00 2001 From: Naseem Date: Fri, 10 May 2019 16:57:37 -0400 Subject: [PATCH 1/4] Add optional agent sidecar to query Signed-off-by: Naseem --- incubator/jaeger/templates/query-deploy.yaml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/incubator/jaeger/templates/query-deploy.yaml b/incubator/jaeger/templates/query-deploy.yaml index 8211b12ba984..8a7d0a4634ab 100644 --- a/incubator/jaeger/templates/query-deploy.yaml +++ b/incubator/jaeger/templates/query-deploy.yaml @@ -124,6 +124,26 @@ spec: httpGet: path: / port: {{ .Values.query.healthCheckPort }} +{{- if .Values.query.agentSidecar.enabled }} + - name: {{ template "jaeger.agent.name" . }}-sidecar + image: {{ .Values.agent.image }}:{{ .Values.tag }} + imagePullPolicy: {{ .Values.agent.pullPolicy }} + env: + - name: COLLECTOR_HOST_PORT + valueFrom: + configMapKeyRef: + name: {{ template "jaeger.fullname" . }} + key: collector.host-port + ports: + - containerPort: {{ .Values.agent.service.zipkinThriftPort }} + protocol: UDP + - containerPort: {{ .Values.agent.service.compactPort }} + protocol: UDP + - containerPort: {{ .Values.agent.service.binaryPort }} + protocol: UDP + - containerPort: {{ .Values.agent.service.samplingPort }} + protocol: TCP +{{- end }} dnsPolicy: {{ .Values.query.dnsPolicy }} restartPolicy: Always {{- end -}} From 974788e6c17a6dc3936ffbd44d34ff38553eece0 Mon Sep 17 00:00:00 2001 From: Naseem Date: Fri, 10 May 2019 17:10:53 -0400 Subject: [PATCH 2/4] Adding OWNERS file and various Signed-off-by: Naseem --- incubator/jaeger/Chart.yaml | 2 +- incubator/jaeger/OWNERS | 10 ++++++++++ incubator/jaeger/README.md | 1 + incubator/jaeger/values.yaml | 2 ++ 4 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 incubator/jaeger/OWNERS diff --git a/incubator/jaeger/Chart.yaml b/incubator/jaeger/Chart.yaml index 11c20f4a4209..057fa3056ac9 100644 --- a/incubator/jaeger/Chart.yaml +++ b/incubator/jaeger/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: 1.11.0 description: A Jaeger Helm chart for Kubernetes name: jaeger -version: 0.10.2 +version: 0.10.3 keywords: - jaeger - opentracing diff --git a/incubator/jaeger/OWNERS b/incubator/jaeger/OWNERS new file mode 100644 index 000000000000..49eb268baba1 --- /dev/null +++ b/incubator/jaeger/OWNERS @@ -0,0 +1,10 @@ +approvers: +- dvonthenen +- mikelorant +- naseemkullah +- pavelnikolov +reviewers: +- dvonthenen +- mikelorant +- naseemkullah +- pavelnikolov diff --git a/incubator/jaeger/README.md b/incubator/jaeger/README.md index 03095d9a31db..e4609938a251 100644 --- a/incubator/jaeger/README.md +++ b/incubator/jaeger/README.md @@ -181,6 +181,7 @@ The following table lists the configurable parameters of the Jaeger chart and th | `nameOverride` | Override name | `nil` | | `provisionDataStore.cassandra` | Provision Cassandra Data Store | true | | `provisionDataStore.elasticsearch` | Provision Elasticsearch Data Store | false | +| `query.agentSidecar.enabled` | Enable agent sidecare for query deployment | true | | `query.service.annotations` | Annotations for Query SVC | nil | | `query.cmdlineParams` | Additional command line parameters | nil | | `query.image` | Image for Jaeger Query UI | jaegertracing/jaeger-query | diff --git a/incubator/jaeger/values.yaml b/incubator/jaeger/values.yaml index 7ec7f65e5cdd..4edde44291db 100644 --- a/incubator/jaeger/values.yaml +++ b/incubator/jaeger/values.yaml @@ -157,6 +157,8 @@ collector: query: enabled: true + agentSidecar: + enabled: true annotations: {} image: jaegertracing/jaeger-query pullPolicy: IfNotPresent From 48a7026f9f766bd0539993048f660d54edb42e10 Mon Sep 17 00:00:00 2001 From: Naseem Date: Sat, 25 May 2019 14:06:35 -0400 Subject: [PATCH 3/4] Update to 1.12.0 Signed-off-by: Naseem --- incubator/jaeger/Chart.yaml | 2 +- incubator/jaeger/README.md | 2 +- incubator/jaeger/values.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/incubator/jaeger/Chart.yaml b/incubator/jaeger/Chart.yaml index 057fa3056ac9..d6311386c248 100644 --- a/incubator/jaeger/Chart.yaml +++ b/incubator/jaeger/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: 1.11.0 +appVersion: 1.12.0 description: A Jaeger Helm chart for Kubernetes name: jaeger version: 0.10.3 diff --git a/incubator/jaeger/README.md b/incubator/jaeger/README.md index e4609938a251..ca631260d007 100644 --- a/incubator/jaeger/README.md +++ b/incubator/jaeger/README.md @@ -217,7 +217,7 @@ The following table lists the configurable parameters of the Jaeger chart and th | `storage.elasticsearch.user` | Provisioned elasticsearch user | elastic | | `storage.elasticsearch.nodesWanOnly` | Only access specified es host | false | | `storage.type` | Storage type (ES or Cassandra) | cassandra | -| `tag` | Image tag/version | 1.11.0 | +| `tag` | Image tag/version | 1.12.0 | For more information about some of the tunable parameters that Cassandra provides, please visit the helm chart for [cassandra](https://github.com/kubernetes/charts/tree/master/incubator/cassandra) and the official [website](http://cassandra.apache.org/) at apache.org. diff --git a/incubator/jaeger/values.yaml b/incubator/jaeger/values.yaml index 4edde44291db..30dbc8aee140 100644 --- a/incubator/jaeger/values.yaml +++ b/incubator/jaeger/values.yaml @@ -6,7 +6,7 @@ provisionDataStore: cassandra: true elasticsearch: false -tag: 1.11.0 +tag: 1.12.0 nameOverride: "" fullnameOverride: "" From 745dd812a4191f0c38dcc873eca45c4b7cbe1d16 Mon Sep 17 00:00:00 2001 From: Naseem Date: Thu, 30 May 2019 06:48:18 -0400 Subject: [PATCH 4/4] Add myself to Chart.yaml Signed-off-by: Naseem --- incubator/jaeger/Chart.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/incubator/jaeger/Chart.yaml b/incubator/jaeger/Chart.yaml index d6311386c248..3839946fccad 100644 --- a/incubator/jaeger/Chart.yaml +++ b/incubator/jaeger/Chart.yaml @@ -17,5 +17,7 @@ maintainers: email: david.vonthenen@dell.com - name: mikelorant email: michael.lorant@fairfaxmedia.com.au + - name: naseemkullah + email: naseem@transit.app - name: pavelnikolov email: pavel.nikolov@fairfaxmedia.com.au