diff --git a/incubator/jaeger/Chart.yaml b/incubator/jaeger/Chart.yaml index e71f3792abd2..962e8cd5a3f4 100644 --- a/incubator/jaeger/Chart.yaml +++ b/incubator/jaeger/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: 1.8.2 description: A Jaeger Helm chart for Kubernetes name: jaeger -version: 0.8.0 +version: 0.8.1 keywords: - jaeger - opentracing diff --git a/incubator/jaeger/README.md b/incubator/jaeger/README.md index 56e1567a2a1b..1413f3758de7 100644 --- a/incubator/jaeger/README.md +++ b/incubator/jaeger/README.md @@ -190,6 +190,7 @@ The following table lists the configurable parameters of the Jaeger chart and th | `query.service.queryPort` | External accessible port | 80 | | `query.service.targetPort` | Internal Query UI port | 16686 | | `query.service.type` | Service type | ClusterIP | +| `query.basePath` | Base path of Query UI | / | | `schema.annotations` | Annotations for the schema job | nil | | `schema.image` | Image to setup cassandra schema | jaegertracing/jaeger-cassandra-schema | | `schema.mode` | Schema mode (prod or test) | prod | diff --git a/incubator/jaeger/templates/common-cm.yaml b/incubator/jaeger/templates/common-cm.yaml index dc4bfc4325bb..62bc38d5115c 100644 --- a/incubator/jaeger/templates/common-cm.yaml +++ b/incubator/jaeger/templates/common-cm.yaml @@ -27,6 +27,7 @@ data: span-storage.type: {{ .Values.storage.type | quote }} query.health-check-http-port: {{ .Values.query.healthCheckPort | quote }} query.port: {{ .Values.query.service.targetPort | quote }} + query.base-path: {{ .Values.query.basePath | quote }} # Not implemented # cassandra.archive.connections-per-host: # cassandra.archive.keyspace: diff --git a/incubator/jaeger/templates/query-deploy.yaml b/incubator/jaeger/templates/query-deploy.yaml index e2c538b6e170..49ab0640a312 100644 --- a/incubator/jaeger/templates/query-deploy.yaml +++ b/incubator/jaeger/templates/query-deploy.yaml @@ -93,6 +93,11 @@ spec: configMapKeyRef: name: {{ template "jaeger.fullname" . }} key: query.health-check-http-port + - name: QUERY_BASE_PATH + valueFrom: + configMapKeyRef: + name: {{ template "jaeger.fullname" . }} + key: query.base-path ports: - containerPort: {{ .Values.query.service.targetPort }} protocol: TCP diff --git a/incubator/jaeger/values.yaml b/incubator/jaeger/values.yaml index 35b11d310f70..860798778229 100644 --- a/incubator/jaeger/values.yaml +++ b/incubator/jaeger/values.yaml @@ -160,6 +160,7 @@ query: dnsPolicy: ClusterFirst cmdlineParams: {} healthCheckPort: 16687 + basePath: / replicaCount: 1 service: annotations: {}