Skip to content
This repository has been archived by the owner on Feb 22, 2022. It is now read-only.

[incubator/jaeger] Adding agent sidecar for query and OWNERS file, update jaeger to 1.12 #13693

Merged
merged 4 commits into from
May 30, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions incubator/jaeger/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v1
appVersion: 1.11.0
appVersion: 1.12.0
description: A Jaeger Helm chart for Kubernetes
name: jaeger
version: 0.10.2
version: 0.10.3
keywords:
- jaeger
- opentracing
Expand All @@ -17,5 +17,7 @@ maintainers:
email: [email protected]
- name: mikelorant
email: [email protected]
- name: naseemkullah
email: [email protected]
- name: pavelnikolov
email: [email protected]
10 changes: 10 additions & 0 deletions incubator/jaeger/OWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
approvers:
- dvonthenen
- mikelorant
- naseemkullah
- pavelnikolov
reviewers:
- dvonthenen
- mikelorant
- naseemkullah
- pavelnikolov
3 changes: 2 additions & 1 deletion incubator/jaeger/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down Expand Up @@ -216,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.

Expand Down
20 changes: 20 additions & 0 deletions incubator/jaeger/templates/query-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 -}}
4 changes: 3 additions & 1 deletion incubator/jaeger/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ provisionDataStore:
cassandra: true
elasticsearch: false

tag: 1.11.0
tag: 1.12.0

nameOverride: ""
fullnameOverride: ""
Expand Down Expand Up @@ -157,6 +157,8 @@ collector:

query:
enabled: true
agentSidecar:
enabled: true
annotations: {}
image: jaegertracing/jaeger-query
pullPolicy: IfNotPresent
Expand Down