[incubator/jaeger] Recommended labels, update dependencies (#11344)

* Recommended labels, update dependencies

Signed-off-by: Naseem Ullah <naseemkullah@gmail.com>

* adding selector.matchLabels to deployments and ds

Signed-off-by: Naseem Ullah <naseemkullah@gmail.com>

* Add upgrading section in readme

Signed-off-by: Naseem Ullah <naseemkullah@gmail.com>

* update jaeger image

Signed-off-by: Naseem Ullah <naseemkullah@gmail.com>

incubator/jaeger/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v1
-appVersion: 1.9.0
+appVersion: 1.10.0
 description: A Jaeger Helm chart for Kubernetes
 name: jaeger
-version: 0.8.3
+version: 0.9.0
 keywords:
   - jaeger
   - opentracing

incubator/jaeger/README.md

@@ -175,8 +175,10 @@ The following table lists the configurable parameters of the Jaeger chart and th
 | `elasticsearch.data.persistence.enabled` | To enable storage persistence       |  false (Highly recommended to enable)  |
 | `elasticsearch.image.tag`                | Elasticsearch image tag             |  "5.4"                                 |
 | `elasticsearch.rbac.create`              | To enable RBAC                      |  false                                 |
+| `fullnameOverride`                       | Override full name                  |  `nil`                                 |
 | `hotrod.enabled`                         | Enables the Hotrod demo app         |  false                                 |
 | `hotrod.service.loadBalancerSourceRanges` | list of IP CIDRs allowed access to load balancer (if supported) | `[]`      |
+| `nameOverride`                           | Override name                       | `nil`                                  |
 | `provisionDataStore.cassandra`           | Provision Cassandra Data Store      |  true                                  |
 | `provisionDataStore.elasticsearch`       | Provision Elasticsearch Data Store  |  false                                 |
 | `query.service.annotations`              | Annotations for Query SVC           |  nil                                   |
@@ -214,7 +216,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.9.0                                 |
+| `tag`                                    | Image tag/version                   |  1.10.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.
 
@@ -251,3 +253,9 @@ Jaeger offers a multitude of [tags](https://hub.docker.com/u/jaegertracing/) for
 - [x] Fix hard-coded replica count
 - [x] Collector service works both as `NodePort` and `ClusterIP` service types
 - [ ] Sidecar deployment support
+
+## Upgrading
+
+### From < 0.9.0 to >= 0.9.0
+
+Version `0.9.0` introduces recommended labels. The approch to upgrading is to delete and reinstall the release.

incubator/jaeger/requirements.yaml

@@ -1,9 +1,9 @@
 dependencies:
   - name: cassandra
-    version: ^0.9.4
+    version: ^0.10.4
     repository: https://kubernetes-charts-incubator.storage.googleapis.com/
     condition: provisionDataStore.cassandra
   - name: elasticsearch
-    version: ^0.4.1
-    repository: https://kubernetes-charts-incubator.storage.googleapis.com/
+    version: ^1.19.1
+    repository: https://kubernetes-charts.storage.googleapis.com/
     condition: provisionDataStore.elasticsearch

incubator/jaeger/templates/_helpers.tpl

@@ -1,16 +1,4 @@
 {{/* vim: set filetype=mustache: */}}
-
-{{/*
-Return the appropriate apiVersion for cronjob APIs.
-*/}}
-{{- define "cronjob.apiVersion" -}}
-{{- if .Capabilities.APIVersions.Has "batch/v1beta1" -}}
-"batch/v1beta1"
-{{- else -}}
-"batch/v2alpha1"
-{{- end -}}
-{{- end -}}
-
 {{/*
 Expand the name of the chart.
 */}}
@@ -20,7 +8,7 @@ Expand the name of the chart.
 
 {{/*
 Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec)
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 If release name contains chart name it will be used as a full name.
 */}}
 {{- define "jaeger.fullname" -}}
@@ -36,6 +24,13 @@ If release name contains chart name it will be used as a full name.
 {{- end -}}
 {{- end -}}
 
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "jaeger.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
 {{/*
 Create a fully qualified query name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).

incubator/jaeger/templates/agent-ds.yaml

@@ -1,20 +1,24 @@
 {{- if .Values.agent.enabled -}}
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: {{ template "jaeger.agent.name" . }}
   labels:
-    app: {{ template "jaeger.name" . }}
-    jaeger-infra: agent-daemonset
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    component: agent
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
+    app.kubernetes.io/name: {{ include "jaeger.name" . }}
+    helm.sh/chart: {{ include "jaeger.chart" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/component: agent
 {{- if .Values.agent.annotations }}
   annotations:
 {{ toYaml .Values.agent.annotations | indent 4 }}
 {{- end }}
 spec:
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: {{ include "jaeger.name" . }}
+      app.kubernetes.io/instance: {{ .Release.Name }}
+      app.kubernetes.io/component: agent
   template:
     metadata:
 {{- if .Values.agent.podAnnotations }}
@@ -22,10 +26,9 @@ spec:
 {{ toYaml .Values.agent.podAnnotations | indent 8 }}
 {{- end }}
       labels:
-        app: {{ template "jaeger.name" . }}
-        component: agent
-        release: {{ .Release.Name }}
-        jaeger-infra: agent-instance
+        app.kubernetes.io/name: {{ include "jaeger.name" . }}
+        app.kubernetes.io/instance: {{ .Release.Name }}
+        app.kubernetes.io/component: agent
 {{- if .Values.agent.podLabels }}
 {{ toYaml .Values.agent.podLabels | indent 8 }}
 {{- end }}

incubator/jaeger/templates/agent-svc.yaml

@@ -4,12 +4,11 @@ kind: Service
 metadata:
   name: {{ template "jaeger.agent.name" . }}
   labels:
-    app: {{ template "jaeger.name" . }}
-    jaeger-infra: agent-service
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    component: agent
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
+    app.kubernetes.io/name: {{ include "jaeger.name" . }}
+    helm.sh/chart: {{ include "jaeger.chart" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/component: agent
 {{- if .Values.agent.service.annotations }}
   annotations:
 {{ toYaml .Values.agent.service.annotations | indent 4 }}
@@ -34,9 +33,8 @@ spec:
     targetPort: {{ .Values.agent.service.samplingPort }}
   type: {{ .Values.agent.service.type }}
   selector:
-    app: {{ template "jaeger.name" . }}
-    component: agent
-    release: {{ .Release.Name }}
-    jaeger-infra: agent-instance
+    app.kubernetes.io/name: {{ template "jaeger.name" . }}
+    app.kubernetes.io/component: agent
+    app.kubernetes.io/instance: {{ .Release.Name }}
 {{- template "loadBalancerSourceRanges" .Values.agent }}
 {{- end -}}

incubator/jaeger/templates/cassandra-schema-job.yaml

@@ -5,12 +5,11 @@ kind: Job
 metadata:
   name: {{ template "jaeger.fullname" . }}-cassandra-schema
   labels:
-    app: {{ template "jaeger.name" . }}
-    jaeger-infra: cassandra-schema-job
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    component: cassandra-schema
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
+    app.kubernetes.io/name: {{ template "jaeger.name" . }}
+    helm.sh/chart: {{ include "jaeger.chart" . }}
+    app.kubernetes.io/component: cassandra-schema
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
 {{- if .Values.schema.annotations }}
   annotations:
 {{ toYaml .Values.schema.annotations | indent 4 }}

incubator/jaeger/templates/collector-deploy.yaml

@@ -1,21 +1,25 @@
 {{- if .Values.collector.enabled -}}
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "jaeger.collector.name" . }}
   labels:
-    app: {{ template "jaeger.name" . }}
-    jaeger-infra: collector-deployment
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    component: collector
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
+    app.kubernetes.io/name: {{ template "jaeger.name" . }}
+    helm.sh/chart: {{ include "jaeger.chart" . }}
+    app.kubernetes.io/component: collector
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
 {{- if .Values.collector.annotations }}
   annotations:
 {{ toYaml .Values.collector.annotations | indent 4 }}
 {{- end }}
 spec:
   replicas: {{ .Values.collector.replicaCount }}
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: {{ template "jaeger.name" . }}
+      app.kubernetes.io/component: collector
+      app.kubernetes.io/instance: {{ .Release.Name }}
   strategy:
     type: Recreate
   template:
@@ -25,10 +29,9 @@ spec:
 {{ toYaml .Values.collector.podAnnotations | indent 8 }}
 {{- end }}
       labels:
-        app: {{ template "jaeger.name" . }}
-        component: collector
-        release: {{ .Release.Name }}
-        jaeger-infra: collector-pod
+        app.kubernetes.io/name: {{ template "jaeger.name" . }}
+        app.kubernetes.io/component: collector
+        app.kubernetes.io/instance: {{ .Release.Name }}
 {{- if .Values.collector.podLabels }}
 {{ toYaml .Values.collector.podLabels | indent 8 }}
 {{- end }}

incubator/jaeger/templates/collector-svc.yaml

@@ -4,12 +4,11 @@ kind: Service
 metadata:
   name: {{ template "jaeger.collector.name" . }}
   labels:
-    app: {{ template "jaeger.name" . }}
-    jaeger-infra: collector-service
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    component: collector
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
+    app.kubernetes.io/name: {{ template "jaeger.name" . }}
+    helm.sh/chart: {{ include "jaeger.chart" . }}
+    app.kubernetes.io/component: collector
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
 {{- if .Values.collector.service.annotations }}
   annotations:
 {{ toYaml .Values.collector.service.annotations | indent 4 }}
@@ -41,10 +40,9 @@ spec:
     targetPort: zipkin
     {{- end }}
   selector:
-    app: {{ template "jaeger.name" . }}
-    component: collector
-    release: {{ .Release.Name }}
-    jaeger-infra: collector-pod
+    app.kubernetes.io/name: {{ template "jaeger.name" . }}
+    app.kubernetes.io/component: collector
+    app.kubernetes.io/instance: {{ .Release.Name }}
   type: {{ .Values.collector.service.type }}
 {{- template "loadBalancerSourceRanges" .Values.collector }}
 {{- end -}}

incubator/jaeger/templates/common-cm.yaml

@@ -3,11 +3,10 @@ kind: ConfigMap
 metadata:
   name: {{ template "jaeger.fullname" . }}
   labels:
-    app: {{ template "jaeger.name" . }}
-    jaeger-infra: common-configmap
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
+    app.kubernetes.io/name: {{ template "jaeger.name" . }}
+    helm.sh/chart: {{ include "jaeger.chart" . }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
 data:
   cassandra.contact-points: {{ template "cassandra.contact_points" . }}
   cassandra.datacenter.name: {{ .Values.cassandra.config.dc_name | quote }}

incubator/jaeger/templates/hotrod-deploy.yaml

@@ -1,24 +1,28 @@
 {{- if .Values.hotrod.enabled -}}
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "jaeger.fullname" . }}-hotrod
   labels:
-    app: {{ template "jaeger.name" . }}
+    app.kubernetes.io/name: {{ template "jaeger.name" . }}
     jaeger-infra: hotrod-deployment
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    component: hotrod
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
+    helm.sh/chart: {{ include "jaeger.chart" . }}
+    app.kubernetes.io/component: hotrod
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
   replicas: {{ .Values.hotrod.replicaCount }}
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: {{ template "jaeger.name" . }}
+      app.kubernetes.io/component: hotrod
+      app.kubernetes.io/instance: {{ .Release.Name }}
   template:
     metadata:
       labels:
-        app: {{ template "jaeger.name" . }}
-        component: hotrod
-        release: {{ .Release.Name }}
-        jaeger-infra: hotrod-instance
+        app.kubernetes.io/name: {{ template "jaeger.name" . }}
+        app.kubernetes.io/component: hotrod
+        app.kubernetes.io/instance: {{ .Release.Name }}
     spec:
       containers:
         - name: {{ template "jaeger.fullname" . }}-hotrod

incubator/jaeger/templates/hotrod-ing.yaml

@@ -7,12 +7,11 @@ kind: Ingress
 metadata:
   name: {{ template "jaeger.fullname" . }}-hotrod
   labels:
-    app: {{ template "jaeger.name" . }}
-    jaeger-infra: hotrod-ingress
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    component: hotrod
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
+    app.kubernetes.io/name: {{ template "jaeger.name" . }}
+    helm.sh/chart: {{ include "jaeger.chart" . }}
+    app.kubernetes.io/component: hotrod
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- if .Values.hotrod.ingress.annotations }}
   annotations:
 {{ toYaml .Values.hotrod.ingress.annotations | indent 4 }}

incubator/jaeger/templates/hotrod-svc.yaml

@@ -4,12 +4,11 @@ kind: Service
 metadata:
   name: {{ template "jaeger.fullname" . }}-hotrod
   labels:
-    app: {{ template "jaeger.name" . }}
-    jaeger-infra: hotrod-service
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    component: hotrod
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
+    app.kubernetes.io/name: {{ template "jaeger.name" . }}
+    helm.sh/chart: {{ include "jaeger.chart" . }}
+    app.kubernetes.io/component: hotrod
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- if .Values.hotrod.service.annotations }}
   annotations:
 {{ toYaml .Values.hotrod.service.annotations | indent 4 }}
@@ -22,9 +21,8 @@ spec:
       protocol: TCP
       targetPort: {{ .Values.hotrod.service.internalPort }}
   selector:
-    app: {{ template "jaeger.name" . }}
-    component: hotrod
-    release: {{ .Release.Name }}
-    jaeger-infra: hotrod-instance
+    app.kubernetes.io/name: {{ template "jaeger.name" . }}
+    app.kubernetes.io/component: hotrod
+    app.kubernetes.io/instance: {{ .Release.Name }}
 {{- template "loadBalancerSourceRanges" .Values.hotrod }}
 {{- end -}}

incubator/jaeger/templates/query-deploy.yaml

@@ -1,21 +1,25 @@
 {{- if .Values.query.enabled -}}
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "jaeger.query.name" . }}
   labels:
-    app: {{ template "jaeger.name" . }}
-    jaeger-infra: query-deployment
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    component: query
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
+    app.kubernetes.io/name: {{ template "jaeger.name" . }}
+    helm.sh/chart: {{ include "jaeger.chart" . }}
+    app.kubernetes.io/component: query
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
 {{- if .Values.query.annotations }}
   annotations:
 {{ toYaml .Values.query.annotations | indent 4 }}
 {{- end }}
 spec:
   replicas: {{ .Values.query.replicaCount }}
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: {{ template "jaeger.name" . }}
+      app.kubernetes.io/component: query
+      app.kubernetes.io/instance: {{ .Release.Name }}
   strategy:
     type: Recreate
   template:
@@ -25,10 +29,9 @@ spec:
 {{ toYaml .Values.query.podAnnotations | indent 8 }}
 {{- end }}
       labels:
-        app: {{ template "jaeger.name" . }}
-        component: query
-        release: {{ .Release.Name }}
-        jaeger-infra: query-pod
+        app.kubernetes.io/name: {{ template "jaeger.name" . }}
+        app.kubernetes.io/component: query
+        app.kubernetes.io/instance: {{ .Release.Name }}
 {{- if .Values.query.podLabels }}
 {{ toYaml .Values.query.podLabels | indent 8 }}
 {{- end }}

incubator/jaeger/templates/query-ing.yaml

@@ -5,12 +5,11 @@ kind: Ingress
 metadata:
   name: {{ template "jaeger.query.name" . }}
   labels:
-    app: {{ template "jaeger.name" . }}
-    jaeger-infra: query-ingress
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    component: query
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
+    app.kubernetes.io/name: {{ template "jaeger.name" . }}
+    helm.sh/chart: {{ include "jaeger.chart" . }}
+    app.kubernetes.io/component: query
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
   {{- if .Values.query.ingress.annotations }}
   annotations:
 {{ toYaml .Values.query.ingress.annotations | indent 4 }}

incubator/jaeger/templates/query-svc.yaml

@@ -4,12 +4,11 @@ kind: Service
 metadata:
   name: {{ template "jaeger.query.name" . }}
   labels:
-    app: {{ template "jaeger.name" . }}
-    jaeger-infra: query-service
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    component: query
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
+    app.kubernetes.io/name: {{ template "jaeger.name" . }}
+    helm.sh/chart: {{ include "jaeger.chart" . }}
+    app.kubernetes.io/component: query
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
 {{- if .Values.query.service.annotations }}
   annotations:
 {{ toYaml .Values.query.service.annotations | indent 4 }}
@@ -21,10 +20,9 @@ spec:
     protocol: TCP
     targetPort: {{ .Values.query.service.targetPort }}
   selector:
-    app: {{ template "jaeger.name" . }}
-    component: query
-    release: {{ .Release.Name }}
-    jaeger-infra: query-pod
+    app.kubernetes.io/name: {{ template "jaeger.name" . }}
+    app.kubernetes.io/component: query
+    app.kubernetes.io/instance: {{ .Release.Name }}
   type: {{ .Values.query.service.type }}
 {{- template "loadBalancerSourceRanges" .Values.query }}
 {{- end -}}

incubator/jaeger/templates/spark-cronjob.yaml

@@ -1,16 +1,14 @@
 {{- if .Values.spark.enabled -}}
-{{- if or (.Capabilities.APIVersions.Has "batch/v1beta1") (.Capabilities.APIVersions.Has "batch/v2alpha1") -}}
-apiVersion: {{ template "cronjob.apiVersion" $ }}
+apiVersion: batch/v1beta1
 kind: CronJob
 metadata:
   name: {{ template "jaeger.fullname" . }}-spark
   labels:
-    app: {{ template "jaeger.name" . }}
-    jaeger-infra: spark-cronjob
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    component: spark
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
+    app.kubernetes.io/name: {{ template "jaeger.name" . }}
+    helm.sh/chart: {{ include "jaeger.chart" . }}
+    app.kubernetes.io/component: spark
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
 {{- if .Values.spark.annotations }}
   annotations:
 {{ toYaml .Values.spark.annotations | indent 4 }}
@@ -24,10 +22,9 @@ spec:
       template:
         metadata:
           labels:
-            app: {{ template "jaeger.name" . }}
-            component: spark
-            release: {{ .Release.Name }}
-            jaeger-infra: spark-instance
+            app.kubernetes.io/name: {{ template "jaeger.name" . }}
+            app.kubernetes.io/component: spark
+            app.kubernetes.io/instance: {{ .Release.Name }}
             {{- if .Values.spark.podLabels }}
 {{ toYaml .Values.spark.podLabels | indent 12 }}
             {{- end }}
@@ -86,4 +83,3 @@ spec:
 {{ toYaml .Values.spark.resources | indent 14 }}
           restartPolicy: OnFailure
 {{- end -}}
-{{- end -}}

incubator/jaeger/values.yaml

@@ -6,7 +6,10 @@ provisionDataStore:
   cassandra: true
   elasticsearch: false
 
-tag: 1.9.0
+tag: 1.10.0
+
+nameOverride: ""
+fullnameOverride: ""
 
 storage:
   # allowed values (cassandra, elasticsearch)
@@ -65,7 +68,7 @@ schema:
 # Begin: Override values on the Elasticsearch subchart to customize for Jaeger
 elasticsearch:
   image:
-    tag: "5.4"
+    tag: "6.6"
   cluster:
     name: "tracing"
   data: