diff --git a/incubator/jaeger/Chart.yaml b/incubator/jaeger/Chart.yaml index 11c20f4a4209..3839946fccad 100644 --- a/incubator/jaeger/Chart.yaml +++ b/incubator/jaeger/Chart.yaml @@ -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 @@ -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 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..ca631260d007 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 | @@ -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. 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 -}} diff --git a/incubator/jaeger/values.yaml b/incubator/jaeger/values.yaml index 7ec7f65e5cdd..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: "" @@ -157,6 +157,8 @@ collector: query: enabled: true + agentSidecar: + enabled: true annotations: {} image: jaegertracing/jaeger-query pullPolicy: IfNotPresent