diff --git a/incubator/jaeger/Chart.yaml b/incubator/jaeger/Chart.yaml index dc0e70c465..3953ee3b49 100644 --- a/incubator/jaeger/Chart.yaml +++ b/incubator/jaeger/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: 1.12.0 description: A Jaeger Helm chart for Kubernetes name: jaeger -version: 0.10.5 +version: 0.11.0 keywords: - jaeger - opentracing diff --git a/incubator/jaeger/README.md b/incubator/jaeger/README.md index 30180d8da7..53fdabe9dc 100644 --- a/incubator/jaeger/README.md +++ b/incubator/jaeger/README.md @@ -193,8 +193,7 @@ The following table lists the configurable parameters of the Jaeger chart and th | `query.pullPolicy` | Query UI image pullPolicy | IfNotPresent | | `query.tolerations` | Node Tolerations | `[]` | | `query.service.loadBalancerSourceRanges` | list of IP CIDRs allowed access to load balancer (if supported) | `[]` | -| `query.service.queryPort` | External accessible port | 80 | -| `query.service.targetPort` | Internal Query UI port | 16686 | +| `query.service.port` | External accessible port | 80 | | `query.service.type` | Service type | ClusterIP | | `query.basePath` | Base path of Query UI, used for ingress as well (if it is enabled) | / | | `schema.annotations` | Annotations for the schema job | nil | diff --git a/incubator/jaeger/templates/agent-ds.yaml b/incubator/jaeger/templates/agent-ds.yaml index bf69fb1963..60366520b9 100644 --- a/incubator/jaeger/templates/agent-ds.yaml +++ b/incubator/jaeger/templates/agent-ds.yaml @@ -49,35 +49,47 @@ spec: imagePullPolicy: {{ .Values.agent.pullPolicy }} env: - name: REPORTER_GRPC_HOST_PORT - valueFrom: - configMapKeyRef: - name: {{ include "jaeger.fullname" . }} - key: reporter.grpc.host-port + value: {{ include "jaeger.collector.name" . }}:{{ .Values.collector.service.grpcPort }} {{- range $key, $value := .Values.agent.cmdlineParams }} - name: {{ $key | replace "." "_" | replace "-" "_" | upper | quote }} value: {{ $value }} {{- end }} ports: - - containerPort: {{ .Values.agent.service.zipkinThriftPort }} + - name: zipkin-compact + containerPort: {{ .Values.agent.service.zipkinThriftPort }} protocol: UDP {{- if .Values.agent.daemonset.useHostPort }} hostPort: {{ .Values.agent.service.zipkinThriftPort }} {{- end }} - - containerPort: {{ .Values.agent.service.compactPort }} + - name: jaeger-compact + containerPort: {{ .Values.agent.service.compactPort }} protocol: UDP {{- if .Values.agent.daemonset.useHostPort }} hostPort: {{ .Values.agent.service.compactPort }} {{- end }} - - containerPort: {{ .Values.agent.service.binaryPort }} + - name: jaeger-binary + containerPort: {{ .Values.agent.service.binaryPort }} protocol: UDP {{- if .Values.agent.daemonset.useHostPort }} hostPort: {{ .Values.agent.service.binaryPort }} {{- end }} - - containerPort: {{ .Values.agent.service.samplingPort }} + - name: http + containerPort: {{ .Values.agent.service.samplingPort }} protocol: TCP {{- if .Values.agent.daemonset.useHostPort }} hostPort: {{ .Values.agent.service.samplingPort }} {{- end }} + - name: admin + containerPort: 14271 + protocol: TCP + livenessProbe: + httpGet: + path: / + port: admin + readinessProbe: + httpGet: + path: / + port: admin resources: {{ toYaml .Values.agent.resources | indent 10 }} {{- end -}} diff --git a/incubator/jaeger/templates/agent-svc.yaml b/incubator/jaeger/templates/agent-svc.yaml index e98c8e7b7d..113b8d93b7 100644 --- a/incubator/jaeger/templates/agent-svc.yaml +++ b/incubator/jaeger/templates/agent-svc.yaml @@ -15,22 +15,22 @@ metadata: {{- end }} spec: ports: - - name: agent-zipkin-thrift + - name: zipkin-compact port: {{ .Values.agent.service.zipkinThriftPort }} protocol: UDP - targetPort: {{ .Values.agent.service.zipkinThriftPort }} - - name: agent-compact + targetPort: zipkin-compact + - name: jaeger-compact port: {{ .Values.agent.service.compactPort }} protocol: UDP - targetPort: {{ .Values.agent.service.compactPort }} - - name: agent-binary + targetPort: jaeger-compact + - name: jaeger-binary port: {{ .Values.agent.service.binaryPort }} protocol: UDP - targetPort: {{ .Values.agent.service.binaryPort }} - - name: agent-sampling + targetPort: jaeger-binary + - name: http port: {{ .Values.agent.service.samplingPort }} protocol: TCP - targetPort: {{ .Values.agent.service.samplingPort }} + targetPort: http type: {{ .Values.agent.service.type }} selector: app.kubernetes.io/name: {{ include "jaeger.name" . }} diff --git a/incubator/jaeger/templates/collector-deploy.yaml b/incubator/jaeger/templates/collector-deploy.yaml index cd8afba845..865670eacf 100644 --- a/incubator/jaeger/templates/collector-deploy.yaml +++ b/incubator/jaeger/templates/collector-deploy.yaml @@ -52,10 +52,7 @@ spec: value: {{ $value }} {{- end }} - name: SPAN_STORAGE_TYPE - valueFrom: - configMapKeyRef: - name: {{ include "jaeger.fullname" . }} - key: span-storage.type + value: {{ .Values.storage.type }} {{- if eq .Values.storage.type "cassandra" }} - name: CASSANDRA_SERVERS valueFrom: @@ -110,20 +107,20 @@ spec: - containerPort: {{ .Values.collector.service.httpPort }} name: http protocol: TCP - - containerPort: {{ .Values.collector.service.healthCheckPort }} - name: healthcheck + - containerPort: 14269 + name: admin protocol: TCP - containerPort: {{ .Values.collector.service.zipkinPort }} name: zipkin protocol: TCP readinessProbe: httpGet: - port: healthcheck - initialDelaySeconds: 10 + path: / + port: admin livenessProbe: httpGet: - port: healthcheck - initialDelaySeconds: 10 + path: / + port: admin resources: {{ toYaml .Values.collector.resources | indent 10 }} dnsPolicy: {{ .Values.collector.dnsPolicy }} diff --git a/incubator/jaeger/templates/collector-svc.yaml b/incubator/jaeger/templates/collector-svc.yaml index 1ca7b80dc1..04c2f8d296 100644 --- a/incubator/jaeger/templates/collector-svc.yaml +++ b/incubator/jaeger/templates/collector-svc.yaml @@ -15,38 +15,22 @@ metadata: {{- end }} spec: ports: - - name: jaeger-collector-grpc + - name: grpc port: {{ .Values.collector.service.grpcPort }} protocol: TCP - {{- if eq .Values.collector.service.type "NodePort" }} - nodePort: {{ .Values.collector.service.grpcPort }} - {{- else }} targetPort: grpc - {{- end }} - - name: jaeger-collector-tchannel + - name: tchannel port: {{ .Values.collector.service.tchannelPort }} protocol: TCP - {{- if eq .Values.collector.service.type "NodePort" }} - nodePort: {{ .Values.collector.service.tchannelPort }} - {{- else }} targetPort: tchannel - {{- end }} - - name: jaeger-collector-http + - name: http port: {{ .Values.collector.service.httpPort }} protocol: TCP - {{- if eq .Values.collector.service.type "NodePort" }} - nodePort: {{ .Values.collector.service.httpPort }} - {{- else }} targetPort: http - {{- end }} - - name: jaeger-collector-zipkin + - name: zipkin port: {{ .Values.collector.service.zipkinPort }} protocol: TCP - {{- if eq .Values.collector.service.type "NodePort" }} - nodePort: {{ .Values.collector.service.zipkinPort }} - {{- else }} targetPort: zipkin - {{- end }} selector: app.kubernetes.io/name: {{ include "jaeger.name" . }} app.kubernetes.io/component: collector diff --git a/incubator/jaeger/templates/common-cm.yaml b/incubator/jaeger/templates/common-cm.yaml index 9fa94dff30..75b2074067 100644 --- a/incubator/jaeger/templates/common-cm.yaml +++ b/incubator/jaeger/templates/common-cm.yaml @@ -16,69 +16,7 @@ data: cassandra.schema.mode: {{ .Values.schema.mode | quote }} cassandra.servers: {{ template "cassandra.host" . }} cassandra.username: {{ .Values.storage.cassandra.user }} - reporter.tchannel.host-port: {{ include "jaeger.collector.name" . }}:{{ .Values.collector.service.tchannelPort }} - reporter.grpc.host-port: {{ include "jaeger.collector.name" . }}:{{ .Values.collector.service.grpcPort }} - collector.http-port: {{ .Values.collector.service.httpPort | quote }} - collector.zipkin.http-port: {{ .Values.collector.service.zipkinPort | quote }} es.password: {{ .Values.storage.elasticsearch.password }} es.server-urls: {{ template "elasticsearch.client.url" . }} es.username: {{ .Values.storage.elasticsearch.user }} es.nodes-wan-only: {{ .Values.storage.elasticsearch.nodesWanOnly | quote }} - hotrod.agent-host: {{ template "jaeger.hotrod.tracing.host" . }} - hotrod.agent-port: {{ .Values.hotrod.tracing.port | quote }} - 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: - # cassandra.archive.max-retry-attempts: - # cassandra.archive.password: - # cassandra.archive.port: - # cassandra.archive.proto-version: - # cassandra.archive.servers: - # cassandra.archive.socket-keep-alive: - # cassandra.archive.timeout: - # cassandra.archive.username: - # cassandra.connections-per-host: - # cassandra.max-retry-attempts: - # cassandra.proto-version: - # cassandra.socket-keep-alive: - # cassandra.timeout: - # collector.health-check-http-port: - # collector.num-workers: - # collector.queue-size: - # collector.write-cache-ttl: - # dependency-storage.data-frequency: - # discovery.min-peers: - # es.archive.max-span-age: - # es.archive.num-replicas: - # es.archive.num-shards: - # es.archive.password: - # es.archive.server-urls: - # es.archive.sniffer: - # es.archive.username: - # es.max-span-age: - # es.num-replicas: - # es.num-shards: - # es.sniffer: - # http-server.host-port: - # log-level: - # metrics-backend: - # metrics-http-route: - # processor.jaeger-binary.server-host-port: - # processor.jaeger-binary.server-max-packet-size: - # processor.jaeger-binary.server-queue-size: - # processor.jaeger-binary.workers: - # processor.jaeger-compact.server-host-port: - # processor.jaeger-compact.server-max-packet-size: - # processor.jaeger-compact.server-queue-size: - # processor.jaeger-compact.workers: - # processor.zipkin-compact.server-host-port: - # processor.zipkin-compact.server-max-packet-size: - # processor.zipkin-compact.server-queue-size: - # processor.zipkin-compact.workers: - # query.prefix: - # query.static-files: - # query.ui-config: diff --git a/incubator/jaeger/templates/hotrod-deploy.yaml b/incubator/jaeger/templates/hotrod-deploy.yaml index b6df28c1ad..2dfa471a28 100644 --- a/incubator/jaeger/templates/hotrod-deploy.yaml +++ b/incubator/jaeger/templates/hotrod-deploy.yaml @@ -26,29 +26,25 @@ spec: spec: containers: - name: {{ include "jaeger.fullname" . }}-hotrod - image: {{ .Values.hotrod.image.repository }}:{{ .Values.hotrod.image.tag }} + image: {{ .Values.hotrod.image.repository }}:{{ .Values.tag }} imagePullPolicy: {{ .Values.hotrod.image.pullPolicy }} env: - name: JAEGER_AGENT_HOST - valueFrom: - configMapKeyRef: - name: {{ include "jaeger.fullname" . }} - key: hotrod.agent-host + value: {{ template "jaeger.hotrod.tracing.host" . }} - name: JAEGER_AGENT_PORT - valueFrom: - configMapKeyRef: - name: {{ include "jaeger.fullname" . }} - key: hotrod.agent-port + value: {{ .Values.hotrod.tracing.port | quote }} ports: - - containerPort: {{ .Values.hotrod.service.internalPort }} + - name: http + containerPort: 8080 + protocol: TCP livenessProbe: httpGet: path: / - port: {{ .Values.hotrod.service.internalPort }} + port: http readinessProbe: httpGet: path: / - port: {{ .Values.hotrod.service.internalPort }} + port: http resources: {{ toYaml .Values.hotrod.resources | indent 12 }} {{- if .Values.hotrod.nodeSelector }} diff --git a/incubator/jaeger/templates/hotrod-ing.yaml b/incubator/jaeger/templates/hotrod-ing.yaml index a2a2e8c2df..84767f9d14 100644 --- a/incubator/jaeger/templates/hotrod-ing.yaml +++ b/incubator/jaeger/templates/hotrod-ing.yaml @@ -1,7 +1,7 @@ {{- if .Values.hotrod.enabled -}} {{- if .Values.hotrod.ingress.enabled -}} {{- $serviceName := include "jaeger.fullname" . -}} -{{- $servicePort := .Values.hotrod.service.externalPort -}} +{{- $servicePort := .Values.hotrod.service.port -}} apiVersion: extensions/v1beta1 kind: Ingress metadata: diff --git a/incubator/jaeger/templates/hotrod-svc.yaml b/incubator/jaeger/templates/hotrod-svc.yaml index 1b26850fc9..99c39129b5 100644 --- a/incubator/jaeger/templates/hotrod-svc.yaml +++ b/incubator/jaeger/templates/hotrod-svc.yaml @@ -16,10 +16,10 @@ metadata: spec: type: {{ .Values.hotrod.service.type }} ports: - - name: {{ .Values.hotrod.service.name }} - port: {{ .Values.hotrod.service.externalPort }} + - name: http + port: {{ .Values.hotrod.service.port }} protocol: TCP - targetPort: {{ .Values.hotrod.service.internalPort }} + targetPort: http selector: app.kubernetes.io/name: {{ include "jaeger.name" . }} app.kubernetes.io/component: hotrod diff --git a/incubator/jaeger/templates/query-deploy.yaml b/incubator/jaeger/templates/query-deploy.yaml index 2038316934..41f585c14c 100644 --- a/incubator/jaeger/templates/query-deploy.yaml +++ b/incubator/jaeger/templates/query-deploy.yaml @@ -52,10 +52,7 @@ spec: value: {{ $value }} {{- end }} - name: SPAN_STORAGE_TYPE - valueFrom: - configMapKeyRef: - name: {{ include "jaeger.fullname" . }} - key: span-storage.type + value: {{ .Values.storage.type }} {{- if eq .Values.storage.type "cassandra" }} - name: CASSANDRA_SERVERS valueFrom: @@ -100,49 +97,44 @@ spec: name: {{ include "jaeger.fullname" . }} key: es.username {{- end }} - - name: QUERY_PORT - valueFrom: - configMapKeyRef: - name: {{ include "jaeger.fullname" . }} - key: query.port - - name: QUERY_HEALTH_CHECK_HTTP_PORT - valueFrom: - configMapKeyRef: - name: {{ include "jaeger.fullname" . }} - key: query.health-check-http-port - name: QUERY_BASE_PATH - valueFrom: - configMapKeyRef: - name: {{ include "jaeger.fullname" . }} - key: query.base-path + value: {{ .Values.query.basePath | quote }} ports: - - containerPort: {{ .Values.query.service.targetPort }} + - name: query + containerPort: 16686 + protocol: TCP + - name: admin + containerPort: 16687 protocol: TCP resources: {{ toYaml .Values.query.resources | indent 10 }} + livenessProbe: + httpGet: + path: / + port: admin readinessProbe: httpGet: path: / - port: {{ .Values.query.healthCheckPort }} + port: admin {{- if .Values.query.agentSidecar.enabled }} - name: {{ template "jaeger.agent.name" . }}-sidecar image: {{ .Values.agent.image }}:{{ .Values.tag }} imagePullPolicy: {{ .Values.agent.pullPolicy }} env: - name: REPORTER_GRPC_HOST_PORT - valueFrom: - configMapKeyRef: - name: {{ include "jaeger.fullname" . }} - key: reporter.grpc.host-port + value: {{ include "jaeger.collector.name" . }}:{{ .Values.collector.service.grpcPort }} 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 }} + - name: admin + containerPort: 14271 protocol: TCP + livenessProbe: + httpGet: + path: / + port: admin + readinessProbe: + httpGet: + path: / + port: admin {{- end }} dnsPolicy: {{ .Values.query.dnsPolicy }} restartPolicy: Always diff --git a/incubator/jaeger/templates/query-ing.yaml b/incubator/jaeger/templates/query-ing.yaml index 3eeeb6da71..4c3903ff38 100644 --- a/incubator/jaeger/templates/query-ing.yaml +++ b/incubator/jaeger/templates/query-ing.yaml @@ -1,5 +1,5 @@ {{- if .Values.query.ingress.enabled -}} -{{- $servicePort := .Values.query.service.queryPort -}} +{{- $servicePort := .Values.query.service.port -}} {{- $basePath := .Values.query.basePath -}} apiVersion: extensions/v1beta1 kind: Ingress diff --git a/incubator/jaeger/templates/query-svc.yaml b/incubator/jaeger/templates/query-svc.yaml index 7761f28ff9..d60e6b608d 100644 --- a/incubator/jaeger/templates/query-svc.yaml +++ b/incubator/jaeger/templates/query-svc.yaml @@ -15,10 +15,10 @@ metadata: {{- end }} spec: ports: - - name: jaeger-query - port: {{ .Values.query.service.queryPort }} + - name: query + port: {{ .Values.query.service.port }} protocol: TCP - targetPort: {{ .Values.query.service.targetPort }} + targetPort: query selector: app.kubernetes.io/name: {{ include "jaeger.name" . }} app.kubernetes.io/component: query diff --git a/incubator/jaeger/templates/spark-cronjob.yaml b/incubator/jaeger/templates/spark-cronjob.yaml index fec5d7b3ea..eeb9f9c152 100644 --- a/incubator/jaeger/templates/spark-cronjob.yaml +++ b/incubator/jaeger/templates/spark-cronjob.yaml @@ -41,10 +41,7 @@ spec: imagePullPolicy: {{ .Values.spark.pullPolicy }} env: - name: STORAGE - valueFrom: - configMapKeyRef: - name: {{ include "jaeger.fullname" . }} - key: span-storage.type + value: {{ .Values.storage.type }} {{- if eq .Values.storage.type "cassandra" }} - name: CASSANDRA_CONTACT_POINTS valueFrom: diff --git a/incubator/jaeger/values.yaml b/incubator/jaeger/values.yaml index c31c69ae05..2d58730186 100644 --- a/incubator/jaeger/values.yaml +++ b/incubator/jaeger/values.yaml @@ -139,7 +139,6 @@ collector: httpPort: 14268 # can accept Zipkin spans in JSON or Thrift zipkinPort: 9411 - healthCheckPort: 14269 resources: {} # limits: # cpu: 1 @@ -165,18 +164,13 @@ query: pullPolicy: IfNotPresent dnsPolicy: ClusterFirst cmdlineParams: {} - healthCheckPort: 16687 - basePath: / replicaCount: 1 service: annotations: {} type: ClusterIP # List of IP ranges that are allowed to access the load balancer (if supported) loadBalancerSourceRanges: [] - # queryPort: externally accessible port for UI and API - queryPort: 80 - # targetPort: the internal port the UI and API are exposed on - targetPort: 16686 + port: 80 ingress: enabled: false annotations: {} @@ -237,7 +231,6 @@ hotrod: replicaCount: 1 image: repository: jaegertracing/example-hotrod - tag: latest pullPolicy: Always service: annotations: {} @@ -245,8 +238,7 @@ hotrod: type: ClusterIP # List of IP ranges that are allowed to access the load balancer (if supported) loadBalancerSourceRanges: [] - externalPort: 80 - internalPort: 8080 + port: 80 ingress: enabled: false # Used to create Ingress record (should be used with service.type: ClusterIP).