bump python version (#648 )

Point to v2 chart
Signed-off-by: Yuri Shkuro <yurishkuro@users.noreply.github.com>
2025-07-19 17:02:17 -04:00 · 2025-06-26 21:05:49 -04:00 · 2025-03-21 09:04:22 +11:00 · 2025-01-25 02:53:10 +11:00 · 2025-01-16 11:29:15 +11:00 · 2025-01-16 09:45:34 +11:00
86 changed files with 18888 additions and 809 deletions
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@ -0,0 +1,4 @@
+# https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners
+
+/charts/jaeger/ @dvonthenen @mikelorant @naseemkullah @pavelnikolov
+/charts/jaeger-operator/ @batazor @cpanato
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@ -0,0 +1,16 @@
+#### What this PR does
+
+#### Which issue this PR fixes
+
+*(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format,
+will close that issue when PR gets merged)*
+
+- fixes #
+
+#### Checklist
+
+- [ ] [DCO](https://github.com/jaegertracing/helm-charts/blob/main/CONTRIBUTING.md#sign-off-your-work) signed
+- [ ] Commits are [GPG signed](https://docs.github.com/en/github/authenticating-to-github/about-commit-signature-verification)
+- [ ] Chart Version bumped
+- [ ] Title of the PR starts with chart name (`[jaeger]` or `[jaeger-operator]`)
+- [ ] README.md has been updated to match version/contain new values
--- a/.github/actions/prepare-k8s/action.yaml
+++ b/.github/actions/prepare-k8s/action.yaml
@ -0,0 +1,51 @@
+name: Prepare K8s for Helm tests
+runs:
+  using: "composite"
+  steps:
+    - name: Set up Helm
+      uses: azure/setup-helm@v4
+      with:
+        version: v3.14.4
+
+    # Python is required because `ct lint` runs Yamale (https://github.com/23andMe/Yamale) and
+    # yamllint (https://github.com/adrienverge/yamllint) which require Python
+    - name: Set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.11'
+
+    - name: Set up chart-testing
+      uses: helm/chart-testing-action@v2.6.1
+      with:
+        version: v3.10.1
+
+    - name: Create kind cluster
+      uses: helm/kind-action@v1.9.0
+
+    - name: Install kubectl
+      uses: azure/setup-kubectl@v4.0.0
+      with:
+        version: 'v1.28.8'
+      id: install
+
+    - name: Set up cert-manager
+      shell: bash
+      run: |
+        kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/main/deploy/static/provider/kind/deploy.yaml --namespace ingress-nginx
+        kubectl label node --all ingress-ready=true
+        kubectl describe pod --selector=app.kubernetes.io/component=controller -n ingress-nginx
+        kubectl wait --namespace ingress-nginx --for=condition=ready pod --selector=app.kubernetes.io/component=controller --timeout=5m
+        kubectl apply --validate=false -f https://github.com/jetstack/cert-manager/releases/download/v1.6.1/cert-manager.yaml
+
+    - name: Set up cmctl
+      shell: bash
+      run: |
+        curl -sSL -o cmctl.tar.gz https://github.com/cert-manager/cert-manager/releases/download/v1.6.1/cmctl-linux-amd64.tar.gz
+        tar xzf cmctl.tar.gz
+        sudo mv cmctl /usr/local/bin
+        cmctl version
+
+    - name: Check if cert-manager is up
+      shell: bash
+      run: |
+        cmctl check api --wait=5m
--- a/.github/workflows/lint-test.yaml
+++ b/.github/workflows/lint-test.yaml
@ -3,26 +3,87 @@ name: Lint and Test Charts
 on: pull_request

 jobs:
-  lint-test:
+  lint:
    runs-on: ubuntu-latest
    steps:
-      - name: Checkout
-        uses: actions/checkout@v1
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Set up Helm
+        uses: azure/setup-helm@v4
+        with:
+          version: v3.14.4
+
+      # Python is required because `ct lint` runs Yamale (https://github.com/23andMe/Yamale) and
+      # yamllint (https://github.com/adrienverge/yamllint) which require Python
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.11'
+
+      - name: Set up chart-testing
+        uses: helm/chart-testing-action@v2.6.1
+        with:
+          version: v3.10.1
+
+      - name: Run chart-testing (list-changed)
+        id: list-changed
+        run: |
+          changed=$(ct list-changed --config ct.yaml)
+          if [[ -n "$changed" ]]; then
+            echo "::set-output name=changed::true"
+          fi

      - name: Run chart-testing (lint)
-        id: lint
-        uses: helm/chart-testing-action@v1.0.0-alpha.3
-        with:
-          command: lint
+        run: ct lint --config ct.yaml

-      - name: Create kind cluster
-        uses: helm/kind-action@v1.0.0-alpha.3
+  test-with-cassandra:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
        with:
-          installLocalPathProvisioner: true
-        # Only build a kind cluster if there are chart changes to test.
-        if: steps.lint.outputs.changed == 'true'
+          fetch-depth: 0

-      - name: Run chart-testing (install)
-        uses: helm/chart-testing-action@v1.0.0-alpha.3
+      - uses: ./.github/actions/prepare-k8s
+
+      - name: Run cassandra-chart-testing (install)
+        run: ct install --config ct.yaml
+  test-with-allInOne:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
        with:
-          command: install
+          fetch-depth: 0
+
+      - uses: ./.github/actions/prepare-k8s
+
+      - name: Run allInOne-chart-testing (install)
+        run: |
+          ct install --config ct.yaml --helm-extra-set-args "
+            --set provisionDataStore.cassandra=false
+            --set storage.type=memory
+            --set allInOne.enabled=true
+            --set agent.enabled=false
+            --set collector.enabled=false
+            --set query.enabled=false"
+  test-with-elasticsearch:
+    runs-on: ubuntu-latest
+    steps:
+        - uses: actions/checkout@v2
+          with:
+            fetch-depth: 0
+
+        - uses: ./.github/actions/prepare-k8s
+
+        - name: Run elasticsearch-chart-testing (install)
+          run: |
+            ct install --config ct.yaml --helm-extra-set-args "
+              --set provisionDataStore.cassandra=false
+              --set provisionDataStore.elasticsearch=true
+              --set storage.type=elasticsearch
+              --set elasticsearch.master.masterOnly=false
+              --set elasticsearch.master.replicaCount=1
+              --set elasticsearch.data.replicaCount=0
+              --set elasticsearch.coordinating.replicaCount=0
+              --set elasticsearch.ingest.replicaCount=0"
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@ -3,35 +3,34 @@ name: Release Charts
 on:
  push:
    branches:
-      - master
+      - main

 jobs:
  release:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0

      - name: Configure Git
        run: |
          git config user.name "$GITHUB_ACTOR"
          git config user.email "$GITHUB_ACTOR@users.noreply.github.com"

-      # See https://github.com/helm/chart-releaser-action/issues/6
      - name: Install Helm
-        run: |
-          curl -sSLo get_helm.sh https://raw.githubusercontent.com/helm/helm/master/scripts/get
-          chmod 700 get_helm.sh
-          ./get_helm.sh
-          helm init --client-only
+        uses: azure/setup-helm@v1
+        with:
+          version: v3.4.1

      - name: Add dependency chart repos
        run: |
-          helm repo add stable https://kubernetes-charts.storage.googleapis.com/
-          helm repo add incubator https://kubernetes-charts-incubator.storage.googleapis.com/
+          helm repo add incubator https://charts.helm.sh/incubator
          helm repo add elastic https://helm.elastic.co
+          helm repo add bitnami https://charts.bitnami.com/bitnami

      - name: Run chart-releaser
-        uses: helm/chart-releaser-action@v1.0.0-alpha.2
+        uses: helm/chart-releaser-action@v1.1.0
        env:
-          CR_TOKEN: "${{ secrets.CR_TOKEN }}"
+          CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,4 @@
 # Helm chart automated files
 /charts/*/charts
 /charts/*/requirements.lock
+/charts/*/*.tgz
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@ -1,3 +1,3 @@
 ## Community Code of Conduct

-Jaeger follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md).
+Jaeger follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/main/code-of-conduct.md).
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -36,7 +36,7 @@ See `git help commit`:
 * Must pass [DCO check](#sign-off-your-work)
 * Must follow [Charts best practices](https://helm.sh/docs/topics/chart_best_practices/)
 * Must pass CI jobs for linting and installing changed charts with the [chart-testing](https://github.com/helm/chart-testing) tool
-* Any change to a chart requires a version bump following [semver](https://semver.org/) principles. See [Immutability(#immutability) and [Versioning](#versioning) below
+* Any change to a chart requires a version bump following [semver](https://semver.org/) principles. See [Immutability](#immutability) and [Versioning](#versioning) below

 Once changes have been merged, the release job will automatically run to package and release changed charts.

--- a/README.md
+++ b/README.md
@ -1,10 +1,15 @@
-# Kubernetes Helm Charts for Jaeger backend
+# Jaeger Helm Charts

 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
-[![](https://github.com/jaegertracing/helm-charts/workflows/Release%20Charts/badge.svg?branch=master)](https://github.com/jaegertracing/helm-charts/actions)
+[![](https://github.com/jaegertracing/helm-charts/workflows/Release%20Charts/badge.svg?branch=main)](https://github.com/jaegertracing/helm-charts/actions)

 This functionality is in beta and is subject to change. The code is provided as-is with no warranties. Beta features are not subject to the support SLA of official GA features.

+# 🛑 If you are looking for Helm Chart for Jaeger-v2
+
+it is located in the [v2 branch](https://github.com/jaegertracing/helm-charts/blob/v2/charts/jaeger/README-v2.md).
+
+
 ## Usage

 [Helm](https://helm.sh) must be installed to use the charts.
@ -18,6 +23,10 @@ $ helm repo add jaegertracing https://jaegertracing.github.io/helm-charts

 You can then run `helm search repo jaegertracing` to see the charts.

+See additional documentation:
+  * [Jaeger chart](./charts/jaeger)
+  * [Jaeger Operator chart](./charts/jaeger-operator)
+
 ## Contributing

 We'd love to have you contribute! Please refer to our [contribution guidelines](CONTRIBUTING.md) for details.
--- a/charts/jaeger-operator/COMPATIBILITY.md
+++ b/charts/jaeger-operator/COMPATIBILITY.md
@ -0,0 +1,37 @@
+The following table shows the compatibility of `Jaeger Operator helm chart` with different components, in this particular case we shows Jaeger Operator, Kubernetes and Strimzi operator compatibility. Cert-manager installed or certificate for webhook service in a secret is required in version 2.29.0+ of the helm chart.
+
+| Chart version             | Jaeger Operator | Kubernetes      | Strimzi Operator   | Cert-Manager |
+|---------------------------|-----------------|-----------------|--------------------|--------------|
+| 2.57.0                    | v1.61.x         | v1.19 to v1.29  | v0.32              | v1.6.1+      |
+| 2.54.0                    | v1.57.x         | v1.19 to v1.29  | v0.32              | v1.6.1+      |
+| 2.50.0                    | v1.52.x         | v1.19 to v1.28  | v0.32              | v1.6.1+      |
+| 2.49.0                    | v1.49.x         | v1.19 to v1.28  | v0.32              | v1.6.1+      |
+| 2.47.0                    | v1.47.x         | v1.19 to v1.26  | v0.23              | v1.6.1+      |
+| 2.46.0                    | v1.46.x         | v1.19 to v1.26  | v0.23              | v1.6.1+      |
+| 2.45.0                    | v1.45.x         | v1.19 to v1.26  | v0.23              | v1.6.1+      |
+| 2.42.0                    | v1.43.x         | v1.19 to v1.26  | v0.23              | v1.6.1+      |
+| 2.41.0                    | v1.42.x         | v1.19 to v1.24  | v0.23              | v1.6.1+      |
+| (Missing)                 |                 | v1.19 to v1.23  | v0.23              | v1.6.1+      |
+| (Missing)                 | v1.41.x         | v1.19 to v1.23  | v0.23              | v1.6.1+      |
+| (Missing)                 | v1.40.x         | v1.19 to v1.23  | v0.23              | v1.6.1+      |
+| 2.37.0                    | v1.39.x         | v1.19 to v1.24  | v0.23              | v1.6.1+      |
+| 2.36.0                    | v1.38.x         | v1.19 to v1.24  | v0.23              | v1.6.1+      |
+| 2.35.0                    | v1.37.x         | v1.19 to v1.24  | v0.23              | v1.6.1+      |
+| 2.34.0                    | v1.36.x         | v1.19 to v1.24  | v0.23              | v1.6.1+      |
+| 2.33.0                    | v1.35.x         | v1.19 to v1.24  | v0.23              | v1.6.1+      |
+| 2.32.0(C), 2.32.1, 2.32.2 | v1.34.x         | v1.19 to v1.24  | v0.23              | v1.6.1+      |
+| (Missing)                 | v1.33.x         | v1.19 to v1.23  | v0.23              | v1.6.1+      |
+| 2.30.0(C), 2.31.0(C)      | v1.32.x         | v1.19 to v1.21  | v0.23              | v1.6.1+      |
+| 2.29.0(C)                 | v1.31.x         | v1.19 to v1.21  | v0.23              | v1.6.1+      |
+| 2.28.0                    | v1.30.x         | v1.19 to v1.21  | v0.23              |              |
+| 2.27.1                    | v1.29.x         | v1.19 to v1.21  | v0.23              |              |
+| 2.27.0                    | v1.28.x         | v1.19 to v1.21  | v0.23              |              |
+| 2.26.0                    | v1.27.x         | v1.19 to v1.21  | v0.23              |              |
+| (Missing)                 | v1.26.x         | v1.19 to v1.21  | v0.23              |              |
+| (Missing)                 | v1.25.x         | v1.19 to v1.21  | v0.23              |              |
+| 2.23.0, 2.24.0, 2.25.0    | v1.24.x         | v1.19 to v1.21  | v0.23              |              |
+| (Missing)                 | v1.23.x         | v1.19 to v1.21  | v0.19, v0.20       |              |
+| 2.21.*                    | v1.22.x         | v1.18 to v1.20  | v0.19              |              |
+Legend:
+- `(C)` Chart is corrupted. Please do not use it, see [link](https://github.com/jaegertracing/helm-charts/issues/351) and [link](https://github.com/jaegertracing/helm-charts/issues/373)
+- `(Missing)` Missing chart version for specified Jaeger Operator version
--- a/charts/jaeger-operator/Chart.yaml
+++ b/charts/jaeger-operator/Chart.yaml
@ -1,11 +1,12 @@
 apiVersion: v1
 description: jaeger-operator Helm chart for Kubernetes
 name: jaeger-operator
-version: 2.14.0
-appVersion: 1.17.0
+version: 2.57.0
+appVersion: 1.61.0
 home: https://www.jaegertracing.io/
 icon: https://www.jaegertracing.io/img/jaeger-icon-reverse-color.svg
-source: https://github.com/jaegertracing/jaeger-operator
+sources:
+  - https://github.com/jaegertracing/jaeger-operator
 maintainers:
  - email: ctadeu@gmail.com
    name: cpanato
--- a/charts/jaeger-operator/OWNERS
+++ b/charts/jaeger-operator/OWNERS
@ -1,6 +0,0 @@
-approvers:
- cpanato
- batazor
-reviewers:
- cpanato
- batazor
--- a/charts/jaeger-operator/README.md
+++ b/charts/jaeger-operator/README.md
@ -14,7 +14,13 @@ This chart bootstraps a jaeger-operator deployment on a [Kubernetes](http://kube

 ## Prerequisites

- Kubernetes 1.8+ with Beta APIs enabled
+- Kubernetes 1.19+
+- Helm 3
+- cert-manager 1.6.1+ installed, or certificate for webhook service in a secret
+
+## Check compability matrix
+
+See the compatibility matrix [here](./COMPATIBILITY.md).

 ## Installing the Chart

@ -24,10 +30,10 @@ Add the Jaeger Tracing Helm repository:
 $ helm repo add jaegertracing https://jaegertracing.github.io/helm-charts
 ```

-To install the chart with the release name `my-release`:
+To install the chart with the release name `my-release` in `observability` namespace:

 ```console
-$ helm install --name my-release jaegertracing/jaeger-operator
+$ helm install my-release jaegertracing/jaeger-operator -n observability
 ```

 The command deploys jaeger-operator on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation.
@ -49,23 +55,30 @@ The command removes all the Kubernetes components associated with the chart and
 The following table lists the configurable parameters of the jaeger-operator chart and their default values.

 | Parameter                  | Description                                                                                                 | Default                         |
-| :---------------------- | :---------------------------------------------------------------------------------------------------------- | :------------------------------ |
+| :-------------------------- | :---------------------------------------------------------------------------------------------------------- |:--------------------------------|
+| `serviceExtraLabels`        | Additional labels to jaeger-operator service                                                                | `{}`                            |
+| `extraLabels`               | Additional labels to jaeger-operator deployment                                                             | `{}`                            |
 | `image.repository`          | Controller container image repository                                                                       | `jaegertracing/jaeger-operator` |
-| `image.tag`             | Controller container image tag                                                                              | `1.17.0`                        |
+| `image.tag`                 | Controller container image tag                                                                              | `1.61.0`                        |
 | `image.pullPolicy`          | Controller container image pull policy                                                                      | `IfNotPresent`                  |
 | `jaeger.create`             | Jaeger instance will be created                                                                             | `false`                         |
 | `jaeger.spec`               | Jaeger instance specification                                                                               | `{}`                            |
-| `crd.install`           | CustomResourceDefinition will be installed                                                                  | `true`                          |
 | `rbac.create`               | All required roles and rolebindings will be created                                                         | `true`                          |
 | `serviceAccount.create`     | Service account to use                                                                                      | `true`                          |
 | `rbac.pspEnabled`           | Pod security policy for pod will be created and included in rbac role                                       | `false`                         |
 | `rbac.clusterRole`          | ClusterRole will be used by operator ServiceAccount                                                         | `false`                         |
 | `serviceAccount.name`       | Service account name to use. If not set and create is true, a name is generated using the fullname template | `nil`                           |
+| `extraArgs`                 | Additional command line arguments arguments passed to the operator                                          | `{}`                            |
+| `extraEnv`                  | Additional environment variables passed to the operator. For example: name: LOG-LEVEL value: debug          | `[]`                            |
+| `replicaCount`              | Desired number of operator pods                                                                             | `1`                             |
 | `resources`                 | K8s pod resources                                                                                           | `None`                          |
 | `nodeSelector`              | Node labels for pod assignment                                                                              | `{}`                            |
 | `tolerations`               | Toleration labels for pod assignment                                                                        | `[]`                            |
+| `topologySpreadConstraints` | Topology Spread Constraints for pod assignment                                                              | `[]`                            |
 | `affinity`                  | Affinity settings for pod assignment                                                                        | `{}`                            |
 | `securityContext`           | Security context for pod                                                                                    | `{}`                            |
+| `containerSecurityContext`  | Security context for the container                                                                          | `{}`                            |
+| `priorityClassName`         | Priority class name for the pod                                                                             | `None`                          |

 Specify each parameter you'd like to override using a YAML file as described above in the [installation](#installing-the-chart) section.

@ -76,6 +89,13 @@ $ helm install jaegertracing/jaeger-operator --name my-release \
    --set rbac.create=false
 ```

+To install the chart without creating the CRDs (any files under `chart/crds`) make use of the `--skip-crds` flag. For example,
+
+```console
+$ helm install jaegertracing/jaeger-operator --name my-release \
+    --skip-crds
+```
+
 ## After the Helm Installation

 ### Creating a new Jaeger instance
--- a/charts/jaeger-operator/crds/crd.yaml
+++ b/charts/jaeger-operator/crds/crd.yaml
--- a/charts/jaeger-operator/templates/_helpers.tpl
+++ b/charts/jaeger-operator/templates/_helpers.tpl
@ -45,4 +45,5 @@ Create chart name and version as used by the chart label.
 {{/* Generate basic labels */}}
 {{- define "jaeger-operator.labels" }}
 app.kubernetes.io/name: {{ include "jaeger-operator.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
--- a/charts/jaeger-operator/templates/certificate.yaml
+++ b/charts/jaeger-operator/templates/certificate.yaml
@ -0,0 +1,22 @@
+{{- if .Values.certs.certificate.create }}
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: {{ default "jaeger-operator-service-cert" .Values.certs.certificate.secretName }}
+  namespace: {{ .Release.Namespace }}
+spec:
+  dnsNames:
+  - "{{ default "jaeger-operator-webhook-service" .Values.webhooks.service.name }}.{{ .Release.Namespace }}.svc"
+  - "{{ default "jaeger-operator-webhook-service" .Values.webhooks.service.name }}.{{ .Release.Namespace }}.svc.cluster.local"
+  issuerRef:
+    {{- if .Values.certs.issuer.create }}
+    kind: Issuer
+    {{- else }}
+    kind: {{ .Values.certs.certificate.issuerKind }}
+    {{- end }}
+    name: {{ default "selfsigned-issuer" .Values.certs.issuer.name }}
+  secretName: {{ default "jaeger-operator-service-cert" .Values.certs.certificate.secretName }}
+  subject:
+    organizationalUnits:
+      - "{{ include "jaeger-operator.name" . }}"
+{{- end }}
--- a/charts/jaeger-operator/templates/crds.yaml
+++ b/charts/jaeger-operator/templates/crds.yaml
@ -1,6 +0,0 @@
-{{- if .Values.crd.install }}
-{{- range $path, $bytes := .Files.Glob "crds/*.yaml" }}
-{{ $.Files.Get $path }}
---
-{{- end }}
-{{- end }}
--- a/charts/jaeger-operator/templates/deployment.yaml
+++ b/charts/jaeger-operator/templates/deployment.yaml
@ -2,10 +2,14 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
  name: {{ include "jaeger-operator.fullname" . }}
+  namespace: {{ .Release.Namespace }}
  labels:
 {{ include "jaeger-operator.labels" . | indent 4 }}
+{{- with .Values.extraLabels }}
+{{ . | toYaml | indent 4 }}
+{{- end }}
 spec:
-  replicas: 1
+  replicas: {{ .Values.replicaCount }}
  selector:
    matchLabels:
 {{ include "jaeger-operator.labels" . | indent 6 }}
@ -14,6 +18,9 @@ spec:
      name: {{ include "jaeger-operator.fullname" . }}
      labels:
 {{ include "jaeger-operator.labels" . | indent 8 }}
+{{- with .Values.extraLabels }}
+{{ . | toYaml | indent 8 }}
+{{- end }}
    spec:
      {{- if .Values.serviceAccount.create }}
      serviceAccountName: {{ include "jaeger-operator.serviceAccountName" . }}
@ -21,6 +28,9 @@ spec:
      {{- with .Values.securityContext }}
      securityContext:
 {{ toYaml . | indent 8 }}
+      {{- end }}
+      {{- if .Values.priorityClassName }}
+      priorityClassName: {{ .Values.priorityClassName | quote }}
      {{- end }}
      {{- if and .Values.image.imagePullSecrets (not .Values.serviceAccount.create ) }}
      imagePullSecrets:
@ -28,14 +38,38 @@ spec:
        - name: {{ . }}
      {{- end }}
      {{- end }}
+      {{- if .Values.hostNetwork }}
+      hostNetwork: {{ .Values.hostNetwork }}
+      {{- end }}
      containers:
        - name: {{ include "jaeger-operator.fullname" . }}
          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
          imagePullPolicy: {{ .Values.image.pullPolicy }}
          ports:
-          - containerPort: 8383
+          - containerPort: {{ .Values.metricsPort }}
            name: metrics
-          args: ["start"]
+          - containerPort: {{ .Values.webhooks.port }}
+            name: webhook-server
+            protocol: TCP
+          volumeMounts:
+          - mountPath: /tmp/k8s-webhook-server/serving-certs
+            name: cert
+            readOnly: true
+          args:
+            - start
+            - {{ printf "--metrics-port=%v" .Values.metricsPort }}
+            - {{ printf "--webhook-bind-port=%v" .Values.webhooks.port }}
+            {{- $replicaCount := int .Values.replicaCount }}
+            {{- if gt $replicaCount 1 }}
+            - --leader-elect
+            {{- end }}
+            {{- range $key, $value := .Values.extraArgs }}
+            {{- if $value }}
+            - --{{ $key }}={{ $value }}
+            {{- else }}
+            - --{{ $key }}
+            {{- end }}
+            {{- end }}
          env:
            - name: WATCH_NAMESPACE
              {{- if .Values.rbac.clusterRole }}
@ -55,8 +89,20 @@ spec:
                  fieldPath: metadata.namespace
            - name: OPERATOR_NAME
              value: {{ include "jaeger-operator.fullname" . | quote }}
+            {{- if .Values.extraEnv }}
+              {{- toYaml .Values.extraEnv | nindent 12 }}
+            {{- end }}
          resources:
 {{ toYaml .Values.resources | indent 12 }}
+          {{- with .Values.containerSecurityContext }}
+          securityContext:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+      volumes:
+      - name: cert
+        secret:
+          defaultMode: 420
+          secretName: {{ default "jaeger-operator-service-cert" .Values.certs.certificate.secretName }}
    {{- with .Values.nodeSelector }}
      nodeSelector:
 {{ toYaml . | indent 8 }}
@ -67,5 +113,9 @@ spec:
    {{- end }}
    {{- with .Values.tolerations }}
      tolerations:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.topologySpreadConstraints }}
+      topologySpreadConstraints:
 {{ toYaml . | indent 8 }}
    {{- end }}
--- a/charts/jaeger-operator/templates/issuer.yaml
+++ b/charts/jaeger-operator/templates/issuer.yaml
@ -0,0 +1,9 @@
+{{- if .Values.certs.issuer.create }}
+apiVersion: cert-manager.io/v1
+kind: Issuer
+metadata:
+  name: {{ default "selfsigned-issuer" .Values.certs.issuer.name }}
+  namespace: {{ .Release.Namespace }}
+spec:
+  selfSigned: {}
+{{- end }}
--- a/charts/jaeger-operator/templates/jaeger.yaml
+++ b/charts/jaeger-operator/templates/jaeger.yaml
@ -3,6 +3,7 @@ apiVersion: jaegertracing.io/v1
 kind: Jaeger
 metadata:
  name: {{ include "jaeger-operator.fullname" . }}-jaeger
+  namespace: {{ default .Release.Namespace .Values.jaeger.namespace }}
 {{- with .Values.jaeger.spec }}
 spec:
 {{ toYaml . | indent 2}}
--- a/charts/jaeger-operator/templates/mutating-webhook.yaml
+++ b/charts/jaeger-operator/templates/mutating-webhook.yaml
@ -0,0 +1,57 @@
+{{- if and (.Values.webhooks.mutatingWebhook.create) (.Values.webhooks.service.create) }}
+apiVersion: admissionregistration.k8s.io/v1
+kind: MutatingWebhookConfiguration
+metadata:
+  annotations:
+    cert-manager.io/inject-ca-from: {{ default .Release.Namespace .Values.certs.certificate.namespace }}/{{ default "jaeger-operator-service-cert" .Values.certs.certificate.secretName }}
+  labels:
+{{ include "jaeger-operator.labels" . | indent 4 }}
+  name: jaeger-operator-mutating-webhook-configuration
+webhooks:
+- admissionReviewVersions:
+  - v1
+  clientConfig:
+    service:
+      name: {{ default "jaeger-operator-webhook-service" .Values.webhooks.service.name }}
+      namespace: {{ .Release.Namespace }}
+      path: /mutate-v1-deployment
+  failurePolicy: Ignore
+  name: deployment.sidecar-injector.jaegertracing.io
+  objectSelector:
+    matchExpressions:
+    - key: app.kubernetes.io/name
+      operator: NotIn
+      values:
+      - {{ include "jaeger-operator.name" . }}
+  rules:
+  - apiGroups:
+    - apps
+    apiVersions:
+    - v1
+    operations:
+    - CREATE
+    - UPDATE
+    resources:
+    - deployments
+  sideEffects: None
+- admissionReviewVersions:
+  - v1
+  clientConfig:
+    service:
+      name: {{ default "jaeger-operator-webhook-service" .Values.webhooks.service.name }}
+      namespace: {{ .Release.Namespace }}
+      path: /mutate-jaegertracing-io-v1-jaeger
+  failurePolicy: Fail
+  name: mjaeger.kb.io
+  rules:
+  - apiGroups:
+    - jaegertracing.io
+    apiVersions:
+    - v1
+    operations:
+    - CREATE
+    - UPDATE
+    resources:
+    - jaegers
+  sideEffects: None
+{{- end }}
--- a/charts/jaeger-operator/templates/role.yaml
+++ b/charts/jaeger-operator/templates/role.yaml
@ -8,89 +8,169 @@ metadata:
 {{ include "jaeger-operator.labels" . | indent 4 }}
 rules:
 - apiGroups:
-  - ""
+  - apps
  resources:
-  - pods
-  - services
-  - endpoints
-  - persistentvolumeclaims
-  - events
-  - configmaps
-  - secrets
-  - serviceaccounts
+  - daemonsets
+  - deployments
+  - replicasets
+  - statefulsets
  verbs:
-  - '*'
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
 - apiGroups:
  - apps
  resources:
  - deployments
-  - daemonsets
-  - replicasets
-  - statefulsets
  verbs:
-  - '*'
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
 - apiGroups:
-  - monitoring.coreos.com
+  - apps
  resources:
-  - servicemonitors
+  - deployments/status
  verbs:
  - get
+  - patch
+  - update
+- apiGroups:
+  - autoscaling
+  resources:
+  - horizontalpodautoscalers
+  verbs:
  - create
- apiGroups:
-  - io.jaegertracing
-  resources:
-  - '*'
-  verbs:
-  - '*'
- apiGroups:
-  - extensions
-  resources:
-  - replicasets
-  - deployments
-  - daemonsets
-  - statefulsets
-  - ingresses
-  verbs:
-  - "*"
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
 - apiGroups:
  - batch
  resources:
-  - jobs
  - cronjobs
+  - jobs
  verbs:
-  - "*"
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
 - apiGroups:
-  - route.openshift.io
+  - console.openshift.io
  resources:
-  - routes
+  - consolelinks
  verbs:
-  - "*"
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
 - apiGroups:
-  - logging.openshift.io
+  - coordination.k8s.io
  resources:
-  - elasticsearches
+  - leases
  verbs:
-  - '*'
+  - create
+  - get
+  - list
+  - update
+- apiGroups:
+  - ""
+  resources:
+  - configmaps
+  - persistentvolumeclaims
+  - pods
+  - secrets
+  - serviceaccounts
+  - services
+  - services/finalizers
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - ""
+  resources:
+  - namespaces
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - ""
+  resources:
+  - namespaces/status
+  verbs:
+  - get
+  - patch
+  - update
+- apiGroups:
+  - extensions
+  resources:
+  - ingresses
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - image.openshift.io
+  resources:
+  - imagestreams
+  verbs:
+  - get
+  - list
+  - watch
 - apiGroups:
  - jaegertracing.io
  resources:
-  - '*'
+  - jaegers
  verbs:
-  - '*'
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
 - apiGroups:
-  - rbac.authorization.k8s.io
+  - jaegertracing.io
  resources:
-  - clusterrolebindings
+  - jaegers/finalizers
  verbs:
-  - '*'
+  - update
 - apiGroups:
-  - apps
-  - extensions
-  resourceNames:
-  - jaeger-operator
+  - jaegertracing.io
  resources:
-  - deployments/finalizers
+  - jaegers/status
  verbs:
+  - get
+  - patch
  - update
 - apiGroups:
  - kafka.strimzi.io
@ -98,7 +178,92 @@ rules:
  - kafkas
  - kafkausers
  verbs:
-  - '*'
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - logging.openshift.io
+  resources:
+  - elasticsearch
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - logging.openshift.io
+  resources:
+  - elasticsearches
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - monitoring.coreos.com
+  resources:
+  - servicemonitors
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - networking.k8s.io
+  resources:
+  - ingresses
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - networking.k8s.io
+  resources:
+  - ingressclasses
+  verbs:
+  - list
+  - watch
+- apiGroups:
+  - rbac.authorization.k8s.io
+  resources:
+  - clusterrolebindings
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - route.openshift.io
+  resources:
+  - routes
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
 {{- if .Values.rbac.pspEnabled }}
 - apiGroups: ['policy']
  resources: ['podsecuritypolicies']
--- a/charts/jaeger-operator/templates/service-account.yaml
+++ b/charts/jaeger-operator/templates/service-account.yaml
@ -6,6 +6,10 @@ metadata:
  namespace: {{ .Release.Namespace }}
  labels:
 {{ include "jaeger-operator.labels" . | indent 4 }}
+{{- if .Values.serviceAccount.annotations }}
+  annotations:
+{{ toYaml .Values.serviceAccount.annotations | indent 4 }}
+{{- end }}
 {{- if .Values.image.imagePullSecrets }}
 imagePullSecrets:
 {{- range .Values.image.imagePullSecrets }}
--- a/charts/jaeger-operator/templates/service.yaml
+++ b/charts/jaeger-operator/templates/service.yaml
@ -2,15 +2,47 @@ apiVersion: v1
 kind: Service
 metadata:
  name: {{ include "jaeger-operator.fullname" . }}-metrics
+  namespace: {{ .Release.Namespace }}
  labels:
 {{ include "jaeger-operator.labels" . | indent 4 }}
+{{- with .Values.serviceExtraLabels }}
+{{ . | toYaml | indent 4 }}
+{{- end }}
+{{- if .Values.service.annotations }}
+  annotations:
+{{ toYaml .Values.service.annotations | indent 4 }}
+{{- end }}
 spec:
  ports:
  - name: metrics
-    port: 8383
+    port: {{ .Values.metricsPort }}
    protocol: TCP
-    targetPort: 8383
+    targetPort: {{ .Values.metricsPort }}
+{{- if and (eq .Values.service.type "NodePort") (.Values.service.nodePort) }}
+    nodePort: {{ .Values.service.nodePort }}
+{{- end }}
  selector:
    app.kubernetes.io/name: {{ include "jaeger-operator.name" . }}
    app.kubernetes.io/instance: {{ .Release.Name }}
-  type: ClusterIP
+  type: {{ .Values.service.type }}
+---
+{{- if .Values.webhooks.service.create }}
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+{{ include "jaeger-operator.labels" . | indent 4 }}
+  name: {{ default "jaeger-operator-webhook-service" .Values.webhooks.service.name }}
+  namespace: {{ .Release.Namespace }}
+{{- if .Values.webhooks.service.annotations }}
+  annotations:
+{{ toYaml .Values.webhooks.service.annotations | indent 4 }}
+{{- end }}
+spec:
+  ports:
+  - port: 443
+    protocol: TCP
+    targetPort: {{ .Values.webhooks.port }}
+  selector:
+{{ include "jaeger-operator.labels" . | indent 4 }}
+{{- end }}
--- a/charts/jaeger-operator/templates/validating-webhook.yaml
+++ b/charts/jaeger-operator/templates/validating-webhook.yaml
@ -0,0 +1,29 @@
+{{- if and (.Values.webhooks.validatingWebhook.create) (.Values.webhooks.service.create) }}
+apiVersion: admissionregistration.k8s.io/v1
+kind: ValidatingWebhookConfiguration
+metadata:
+  annotations:
+    cert-manager.io/inject-ca-from: {{ default .Release.Namespace .Values.certs.certificate.namespace }}/{{ default "jaeger-operator-service-cert" .Values.certs.certificate.secretName }}
+  name: jaeger-operator-validating-webhook-configuration
+webhooks:
+- admissionReviewVersions:
+  - v1
+  clientConfig:
+    service:
+      name: {{ default "jaeger-operator-webhook-service" .Values.webhooks.service.name }}
+      namespace: {{ .Release.Namespace }}
+      path: /validate-jaegertracing-io-v1-jaeger
+  failurePolicy: Fail
+  name: vjaeger.kb.io
+  rules:
+  - apiGroups:
+    - jaegertracing.io
+    apiVersions:
+    - v1
+    operations:
+    - CREATE
+    - UPDATE
+    resources:
+    - jaegers
+  sideEffects: None
+{{- end }}
--- a/charts/jaeger-operator/values.yaml
+++ b/charts/jaeger-operator/values.yaml
@ -1,18 +1,42 @@
 # Default values for jaeger-operator.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
+
 image:
  repository: jaegertracing/jaeger-operator
-  tag: 1.17.0
+  tag: 1.61.0
  pullPolicy: IfNotPresent
  imagePullSecrets: []

-crd:
-  install: true
+certs:
+  issuer:
+    create: true
+    name: ""
+  certificate:
+    create: true
+    namespace: ""
+    secretName: ""
+    # Specify the cert-manager issuer kind to use an existing cert-manager
+    # issuer; typically Issuer or ClusterIssuer
+    # This field will be ignored if issuer.create is true
+    issuerKind: Issuer
+
+webhooks:
+  mutatingWebhook:
+    create: true
+  validatingWebhook:
+    create: true
+  port: 9443
+  service:
+    annotations: {}
+    create: true
+    name: ""

 jaeger:
  # Specifies whether Jaeger instance should be created
  create: false
+  # namespace where Jaeger resource should be created default to .Release.Namespace
+  namespace:
  spec: {}

 rbac:
@ -21,12 +45,42 @@ rbac:
  pspEnabled: false
  clusterRole: false

+service:
+  type: ClusterIP
+  # Specify a specific node port when type is NodePort
+  # nodePort: 32500
+  # Annotations for service
+  annotations: {}
+
 serviceAccount:
  # Specifies whether a ServiceAccount should be created
  create: true
  # The name of the ServiceAccount to use.
  # If not set and create is true, a name is generated using the fullname template
  name:
+  # Annotations for serviceAccount
+  annotations: {}
+
+extraArgs: {}
+  # Specifies extra command line arguments arguments passed to the operator:
+  # foo: bar
+
+# Specifies extra environment variables passed to the operator:
+extraEnv: []
+  # Specifies log-level for the operator:
+  # - name: LOG-LEVEL
+  #   value: debug
+
+serviceExtraLabels: {}
+  # Specifies extra labels for the operator-metric service:
+  # foo: bar
+
+extraLabels: {}
+  # Specifies extra labels for the operator deployment:
+  # foo: bar
+
+# Specifies desired number of operator pods
+replicaCount: 1

 resources: {}
  # limits:
@ -40,6 +94,17 @@ nodeSelector: {}

 tolerations: []

+topologySpreadConstraints: []
+
 affinity: {}

 securityContext: {}
+
+containerSecurityContext: {}
+
+priorityClassName:
+
+# Specifies weather host network should be used
+hostNetwork: false
+
+metricsPort: 8383
--- a/charts/jaeger/Chart.lock
+++ b/charts/jaeger/Chart.lock
@ -0,0 +1,15 @@
+dependencies:
+- name: cassandra
+  repository: https://charts.helm.sh/incubator
+  version: 0.15.3
+- name: elasticsearch
+  repository: https://charts.bitnami.com/bitnami
+  version: 20.0.4
+- name: kafka
+  repository: https://charts.bitnami.com/bitnami
+  version: 26.6.2
+- name: common
+  repository: https://charts.bitnami.com/bitnami
+  version: 2.19.1
+digest: sha256:16dad4387f2b392d5034731f997518ff05b77909220ce45ee6dd69664942f2df
+generated: "2024-04-11T08:42:48.824851-04:00"
--- a/charts/jaeger/Chart.yaml
+++ b/charts/jaeger/Chart.yaml
@ -1,23 +1,46 @@
-apiVersion: v1
-appVersion: 1.17.0
+apiVersion: v2
+appVersion: 1.53.0
 description: A Jaeger Helm chart for Kubernetes
 name: jaeger
-version: 0.20.0
+type: application
+version: 3.4.1
+# CronJobs require v1.21
+kubeVersion: ">= 1.21-0"
 keywords:
  - jaeger
  - opentracing
  - tracing
  - instrumentation
 home: https://jaegertracing.io
-icon: https://camo.githubusercontent.com/afa87494e0753b4b1f5719a2f35aa5263859dffb/687474703a2f2f6a61656765722e72656164746865646f63732e696f2f656e2f6c61746573742f696d616765732f6a61656765722d766563746f722e737667
+icon: https://www.jaegertracing.io/img/jaeger-icon-reverse-color.svg
 sources:
  - https://hub.docker.com/u/jaegertracing/
 maintainers:
  - name: dvonthenen
    email: david.vonthenen@dell.com
+  - name: mehta-ankit
+    email: ankit.mehta@appian.com
  - name: mikelorant
    email: michael.lorant@fairfaxmedia.com.au
  - name: naseemkullah
    email: naseem@transit.app
  - name: pavelnikolov
-    email: pavel.nikolov@fairfaxmedia.com.au
+    email: me@pavelnikolov.net
+  - name: jkowall
+    email: jkowall@kowall.net
+dependencies:
+  - name: cassandra
+    version: 0.15.3
+    repository: https://charts.helm.sh/incubator
+    condition: provisionDataStore.cassandra
+  - name: elasticsearch
+    version: 20.0.4
+    repository: https://charts.bitnami.com/bitnami
+    condition: provisionDataStore.elasticsearch
+  - name: kafka
+    version: 26.6.2
+    repository: https://charts.bitnami.com/bitnami
+    condition: provisionDataStore.kafka
+  - name: common
+    repository: https://charts.bitnami.com/bitnami
+    version: 2.x.x
--- a/charts/jaeger/OWNERS
+++ b/charts/jaeger/OWNERS
@ -1,10 +0,0 @@
-approvers:
- dvonthenen
- mikelorant
- naseemkullah
- pavelnikolov
-reviewers:
- dvonthenen
- mikelorant
- naseemkullah
- pavelnikolov
--- a/charts/jaeger/README.md
+++ b/charts/jaeger/README.md
@ -14,7 +14,7 @@ Add the Jaeger Tracing Helm repository:
 helm repo add jaegertracing https://jaegertracing.github.io/helm-charts
 ```

-To install the chart with the release name `jaeger`, run the following command:
+To install a release named `jaeger`:

 ```bash
 helm install jaeger jaegertracing/jaeger
@ -25,106 +25,80 @@ By default, the chart deploys the following:
 - Jaeger Agent DaemonSet
 - Jaeger Collector Deployment
 - Jaeger Query (UI) Deployment
- Cassandra StatefulSet
+- Cassandra StatefulSet (subject to change!)

-![Jaeger with Default components](https://www.jaegertracing.io/img/architecture-v1.png)
+![Jaeger with Default
+components](https://www.jaegertracing.io/img/architecture-v1.png)

-IMPORTANT NOTE: For testing purposes, the footprint for Cassandra can be reduced significantly in the event resources become constrained (such as running on your local laptop or in a Vagrant environment). You can override the resources required run running this command:
+## Configuration

-```bash
-helm install jaeger jaegertracing/jaeger \
-  --set cassandra.config.max_heap_size=1024M \
-  --set cassandra.config.heap_new_size=256M \
-  --set cassandra.resources.requests.memory=2048Mi \
-  --set cassandra.resources.requests.cpu=0.4 \
-  --set cassandra.resources.limits.memory=2048Mi \
-  --set cassandra.resources.limits.cpu=0.4
+See [Customizing the Chart Before Installing](https://helm.sh/docs/intro/using_helm/#customizing-the-chart-before-installing). To see all configurable options with detailed comments, visit the chart's [values.yaml](https://github.com/jaegertracing/helm-charts/blob/master/charts/jaeger/values.yaml), or run these configuration commands:
+
+```console
+$ helm show values jaegertracing/jaeger
 ```

-## Installing the Chart using an Existing Cassandra Cluster
+You may also `helm show values` on this chart's [dependencies](#dependencies) for additional options.

-If you already have an existing running Cassandra cluster, you can configure the chart as follows to use it as your backing store (make sure you replace `<HOST>`, `<PORT>`, etc with your values):
+### Dependencies

-```bash
-helm install jaeger jaegertracing/jaeger \
-  --set provisionDataStore.cassandra=false \
-  --set storage.cassandra.host=<HOST> \
-  --set storage.cassandra.port=<PORT> \
-  --set storage.cassandra.user=<USER> \
-  --set storage.cassandra.password=<PASSWORD>
+If installing with a dependency such as Cassandra, Elasticsearch and/or Kafka
+their, values can be shown by running:
+
+```console
+helm repo add elastic https://helm.elastic.co
+helm show values elastic/elasticsearch
 ```

-## Installing the Chart using an Existing Cassandra Cluster with TLS
-
-If you already have an existing running Cassandra cluster with TLS, you can configure the chart as follows to use it as your backing store:
-
-Content of the `values.yaml` file:
-
-```YAML
-storage:
-  type: cassandra
-  cassandra:
-    host: <HOST>
-    port: <PORT>
-    user: <USER>
-    password: <PASSWORD>
-    tls:
-      enabled: true
-      secretName: cassandra-tls-secret
-
-provisionDataStore:
-  cassandra: false
+```console
+helm repo add incubator https://kubernetes-charts-incubator.storage.googleapis.com/
+helm show values incubator/cassandra
 ```

-Content of the `jaeger-tls-cassandra-secret.yaml` file:
-
-```YAML
-apiVersion: v1
-kind: Secret
-metadata:
-  name: cassandra-tls-secret
-data:
-  commonName: <SERVER NAME>
-  ca-cert.pem: |
-    -----BEGIN CERTIFICATE-----
-    <CERT>
-    -----END CERTIFICATE-----
-  client-cert.pem: |
-    -----BEGIN CERTIFICATE-----
-    <CERT>
-    -----END CERTIFICATE-----
-  client-key.pem: |
-    -----BEGIN RSA PRIVATE KEY-----
-    -----END RSA PRIVATE KEY-----
-  cqlshrc: |
-    [ssl]
-    certfile = ~/.cassandra/ca-cert.pem
-    userkey = ~/.cassandra/client-key.pem
-    usercert = ~/.cassandra/client-cert.pem
-
+```console
+helm repo add bitnami https://charts.bitnami.com/bitnami
+helm show values bitnami/kafka
 ```

-```bash
-kubectl apply -f jaeger-tls-cassandra-secret.yaml
-helm install jaeger jaegertracing/jaeger --values values.yaml
-```
+Please note, any dependency values must be nested within the key named after the
+chart, i.e. `elasticsearch`, `cassandra` and/or `kafka`.

-## Installing the Chart using a New ElasticSearch Cluster
+## Storage
+
+As per Jaeger documentation, for large scale production deployment the Jaeger
+team [recommends Elasticsearch backend over Cassandra](https://www.jaegertracing.io/docs/latest/faq/#what-is-the-recommended-storage-backend),
+as such the default backend may change in the future and **it is highly
+recommended to explicitly configure storage**.
+
+If you are just starting out with a testing/demo setup, you can also use in-memory storage for a
+fast and easy setup experience using the [Jaeger All in One executable](https://www.jaegertracing.io/docs/1.29/getting-started/#all-in-one).
+
+### Elasticsearch configuration
+
+#### Elasticsearch Rollover
+
+If using the [Elasticsearch
+Rollover](https://www.jaegertracing.io/docs/latest/deployment/#elasticsearch-rollover)
+feature, elasticsearch must already be present and so must be deployed
+separately from this chart, if not the rollover init hook won't be able to
+complete successfully.
+
+#### Installing the Chart using a New ElasticSearch Cluster

 To install the chart with the release name `jaeger` using a new ElasticSearch cluster instead of Cassandra (default), run the following command:

-```bash
+```console
 helm install jaeger jaegertracing/jaeger \
  --set provisionDataStore.cassandra=false \
  --set provisionDataStore.elasticsearch=true \
  --set storage.type=elasticsearch
 ```

-## Installing the Chart using an Existing Elasticsearch Cluster
+#### Installing the Chart using an Existing Elasticsearch Cluster

 A release can be configured as follows to use an existing ElasticSearch cluster as it as the storage backend:

-```bash
+```console
 helm install jaeger jaegertracing/jaeger \
  --set provisionDataStore.cassandra=false \
  --set storage.type=elasticsearch \
@ -134,7 +108,7 @@ helm install jaeger jaegertracing/jaeger \
  --set storage.elasticsearch.password=<password>
 ```

-## Installing the Chart using an Existing ElasticSearch Cluster with TLS
+#### Installing the Chart using an Existing ElasticSearch Cluster with TLS

 If you already have an existing running ElasticSearch cluster with TLS, you can configure the chart as follows to use it as your backing store:

@ -184,175 +158,295 @@ spark:
 ```

 Generate configmap jaeger-tls:
-```bash
+
+```console
 keytool -import -trustcacerts -keystore trust.store -storepass changeit -alias es-root -file es.pem
 kubectl create configmap jaeger-tls --from-file=trust.store --from-file=es.pem
 ```

-```bash
+```console
 helm install jaeger jaegertracing/jaeger --values jaeger-values.yaml
 ```

-## Installing the Chart with Ingester enabled
+### Cassandra configuration
+
+#### Installing the Chart using an Existing Cassandra Cluster
+
+If you already have an existing running Cassandra cluster, you can configure the chart as follows to use it as your backing store (make sure you replace `<HOST>`, `<PORT>`, etc with your values):
+
+```console
+helm install jaeger jaegertracing/jaeger \
+  --set provisionDataStore.cassandra=false \
+  --set storage.cassandra.host=<HOST> \
+  --set storage.cassandra.port=<PORT> \
+  --set storage.cassandra.user=<USER> \
+  --set storage.cassandra.password=<PASSWORD>
+```
+
+#### Installing the Chart using an Existing Cassandra Cluster with TLS
+
+If you already have an existing running Cassandra cluster with TLS, you can configure the chart as follows to use it as your backing store:
+
+Content of the `values.yaml` file:
+
+```YAML
+storage:
+  type: cassandra
+  cassandra:
+    host: <HOST>
+    port: <PORT>
+    user: <USER>
+    password: <PASSWORD>
+    tls:
+      enabled: true
+      secretName: cassandra-tls-secret
+
+provisionDataStore:
+  cassandra: false
+```
+
+Content of the `jaeger-tls-cassandra-secret.yaml` file:
+
+```YAML
+apiVersion: v1
+kind: Secret
+metadata:
+  name: cassandra-tls-secret
+data:
+  commonName: <SERVER NAME>
+  ca-cert.pem: |
+    -----BEGIN CERTIFICATE-----
+    <CERT>
+    -----END CERTIFICATE-----
+  client-cert.pem: |
+    -----BEGIN CERTIFICATE-----
+    <CERT>
+    -----END CERTIFICATE-----
+  client-key.pem: |
+    -----BEGIN RSA PRIVATE KEY-----
+    -----END RSA PRIVATE KEY-----
+  cqlshrc: |
+    [ssl]
+    certfile = ~/.cassandra/ca-cert.pem
+    userkey = ~/.cassandra/client-key.pem
+    usercert = ~/.cassandra/client-cert.pem
+
+```
+
+```console
+kubectl apply -f jaeger-tls-cassandra-secret.yaml
+helm install jaeger jaegertracing/jaeger --values values.yaml
+```
+
+### Ingester Configuration
+
+#### Installing the Chart with Ingester enabled

 The architecture illustrated below can be achieved by enabling the ingester component. When enabled, Cassandra or Elasticsearch (depending on the configured values) now becomes the ingester's storage backend, whereas Kafka becomes the storage backend of the collector service.

 ![Jaeger with Ingester](https://www.jaegertracing.io/img/architecture-v2.png)

-## Installing the Chart with Ingester enabled using a New Kafka Cluster
+#### Installing the Chart with Ingester enabled using a New Kafka Cluster

 To provision a new Kafka cluster along with jaeger-ingester:

-```bash
+```console
 helm install jaeger jaegertracing/jaeger \
  --set provisionDataStore.kafka=true \
  --set ingester.enabled=true
 ```

-## Installing the Chart with Ingester using an existing Kafka Cluster
+#### Installing the Chart with Ingester using an existing Kafka Cluster

-You can use an exisiting Kafka cluster with jaeger too
+You can use an existing Kafka cluster with jaeger too

-```bash
+```console
 helm install jaeger jaegertracing/jaeger \
  --set ingester.enabled=true \
  --set storage.kafka.brokers={<BROKER1:PORT>,<BROKER2:PORT>} \
  --set storage.kafka.topic=<TOPIC>
 ```

-## Configuration
+### Other Storage Configuration

-The following table lists the configurable parameters of the Jaeger chart and their default values.
+If you are using grpc-plugin based storage, you can set environment
+variables that are needed by the plugin.

-| Parameter | Description | Default |
-|-----------|-------------|---------|
-| `<component>.nodeSelector` | Node selector | {} |
-| `<component>.tolerations` | Node tolerations | [] |
-| `<component.affinity` | Affinity | {} |
-| `<component>.podSecurityContext` | Pod security context | {} |
-| `<component>.securityContext` | Container security context | {} |
-| `<component>.serviceAccount.create` | Create service account | `true` |
-| `<component>.serviceAccount.name` | The name of the ServiceAccount to use. If not set and create is true, a name is generated using the fullname template | `` |
-| `agent.annotations` | Annotations for Agent | `nil` |
-| `agent.cmdlineParams` |Additional command line parameters| `nil` |
-| `agent.dnsPolicy` | Configure DNS policy for agents | `ClusterFirst` |
-| `agent.service.annotations` | Annotations for Agent SVC | `nil` |
-| `agent.service.binaryPort` | jaeger.thrift over binary thrift | `6832` |
-| `agent.service.compactPort` | jaeger.thrift over compact thrift| `6831` |
-| `agent.image` | Image for Jaeger Agent | `jaegertracing/jaeger-agent` |
-| `agent.podAnnotations` | Annotations for Agent pod | `nil` |
-| `agent.pullPolicy` | Agent image pullPolicy | `IfNotPresent` |
-| `agent.service.loadBalancerSourceRanges` | list of IP CIDRs allowed access to load balancer (if supported) | `[]` |
-| `agent.service.annotations` | Annotations for Agent SVC | `nil` |
-| `agent.service.binaryPort` | jaeger.thrift over binary thrift | `6832` |
-| `agent.service.compactPort` | jaeger.thrift over compact thrift | `6831` |
-| `agent.service.zipkinThriftPort` | zipkin.thrift over compact thrift | `5775` |
-| `agent.extraConfigmapMounts` | Additional agent configMap mounts | `[]` |
-| `agent.extraSecretMounts` | Additional agent secret mounts | `[]` |
-| `agent.useHostNetwork` | Enable hostNetwork for agents | `false` |
-| `collector.autoscaling.enabled` | Enable horizontal pod autoscaling | `false` |
-| `collector.autoscaling.minReplicas` | Minimum replicas |  2 |
-| `collector.autoscaling.maxReplicas` | Maximum replicas |  10 |
-| `collector.autoscaling.targetCPUUtilizationPercentage` | Target CPU utilization |  80 |
-| `collector.autoscaling.targetMemoryUtilizationPercentage` | Target memory utilization | `nil` |
-| `collector.cmdlineParams` | Additional command line parameters | `nil` |
-| `collector.podAnnotations` | Annotations for Collector pod | `nil` |
-| `collector.service.httpPort` | Client port for HTTP thrift | `14268` |
-| `collector.service.annotations` | Annotations for Collector SVC | `nil` |
-| `collector.image` | Image for jaeger collector | `jaegertracing/jaeger-collector` |
-| `collector.pullPolicy` | Collector image pullPolicy | `IfNotPresent` |
-| `collector.service.annotations` | Annotations for Collector SVC | `nil` |
-| `collector.service.httpPort` | Client port for HTTP thrift | `14268` |
-| `collector.service.loadBalancerSourceRanges` | list of IP CIDRs allowed access to load balancer (if supported) | `[]` |
-| `collector.service.tchannelPort` | Jaeger Agent port for thrift| `14267` |
-| `collector.service.type` | Service type | `ClusterIP` |
-| `collector.service.zipkinPort` | Zipkin port for JSON/thrift HTTP | `nil` |
-| `collector.extraConfigmapMounts` | Additional collector configMap mounts | `[]` |
-| `collector.extraSecretMounts` | Additional collector secret mounts | `[]` |
-| `collector.samplingConfig` | [Sampling strategies json file](https://www.jaegertracing.io/docs/latest/sampling/#collector-sampling-configuration) | `nil` |
-| `ingester.enabled` | Enable ingester component, collectors will write to Kafka | `false` |
-| `ingester.autoscaling.enabled` | Enable horizontal pod autoscaling | `false` |
-| `ingester.autoscaling.minReplicas` | Minimum replicas |  2 |
-| `ingester.autoscaling.maxReplicas` | Maximum replicas |  10 |
-| `ingester.autoscaling.targetCPUUtilizationPercentage` | Target CPU utilization |  80 |
-| `ingester.autoscaling.targetMemoryUtilizationPercentage` | Target memory utilization | `nil` |
-| `ingester.cmdlineParams` | Additional command line parameters | `nil` |
-| `ingester.podAnnotations` | Annotations for Ingester pod | `nil` |
-| `ingester.service.annotations` | Annotations for Ingester SVC | `nil` |
-| `ingester.image` | Image for jaeger Ingester | `jaegertracing/jaeger-ingester` |
-| `ingester.pullPolicy` | Ingester image pullPolicy | `IfNotPresent` |
-| `ingester.service.annotations` | Annotations for Ingester SVC | `nil` |
-| `ingester.service.loadBalancerSourceRanges` | list of IP CIDRs allowed access to load balancer (if supported) | `[]` |
-| `ingester.service.type` | Service type | `ClusterIP` |
-| `ingester.extraConfigmapMounts` | Additional Ingester configMap mounts | `[]` |
-| `ingester.extraSecretMounts` | Additional Ingester secret mounts | `[]` |
-| `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` |
-| `provisionDataStore.kafka` | Provision Kafka 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` |
-| `query.ingress.enabled` | Allow external traffic access | `false` |
-| `query.ingress.annotations` | Configure annotations for Ingress | `{}` |
-| `query.ingress.hosts` | Configure host for Ingress | `nil` |
-| `query.ingress.tls` | Configure tls for Ingress | `nil` |
-| `query.podAnnotations` | Annotations for Query pod | `nil` |
-| `query.pullPolicy` | Query UI image pullPolicy | `IfNotPresent` |
-| `query.service.loadBalancerSourceRanges` | list of IP CIDRs allowed access to load balancer (if supported) | `[]` |
-| `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) | `/` |
-| `query.extraConfigmapMounts` | Additional query configMap mounts | `[]` |
-| `schema.annotations` | Annotations for the schema job| `nil` |
-| `schema.extraConfigmapMounts` | Additional cassandra schema job configMap mounts | `[]`  |
-| `schema.image` | Image to setup cassandra schema | `jaegertracing/jaeger-cassandra-schema` |
-| `schema.mode` | Schema mode (prod or test) | `prod` |
-| `schema.pullPolicy` | Schema image pullPolicy | `IfNotPresent` |
-| `schema.activeDeadlineSeconds` | Deadline in seconds for cassandra schema creation job to complete | `120` |
-| `schema.traceTtl` | Time to live for trace data in seconds | `nil` |
-| `schema.keyspace` | Set explicit keyspace name | `nil` |
-| `schema.dependenciesTtl` | Time to live for dependencies data in seconds | `nil` |
-| `spark.enabled` | Enables the dependencies job| `false` |
-| `spark.image` | Image for the dependencies job| `jaegertracing/spark-dependencies` |
-| `spark.pullPolicy` | Image pull policy of the deps image | `Always` |
-| `spark.schedule` | Schedule of the cron job | `"49 23 * * *"` |
-| `spark.successfulJobsHistoryLimit` | Cron job successfulJobsHistoryLimit | `5` |
-| `spark.failedJobsHistoryLimit` | Cron job failedJobsHistoryLimit | `5` |
-| `spark.tag` | Tag of the dependencies job image | `latest` |
-| `spark.extraConfigmapMounts` | Additional spark configMap mounts | `[]` |
-| `spark.extraSecretMounts` | Additional spark secret mounts | `[]` |
-| `storage.cassandra.existingSecret` | Name of existing password secret object (for password authentication | `nil`
-| `storage.cassandra.host` | Provisioned cassandra host | `cassandra` |
-| `storage.cassandra.keyspace` | Schema name for cassandra | `jaeger_v1_test` |
-| `storage.cassandra.password` | Provisioned cassandra password  (ignored if storage.cassandra.existingSecret set) | `password` |
-| `storage.cassandra.port` | Provisioned cassandra port | `9042` |
-| `storage.cassandra.tls.enabled` | Provisioned cassandra TLS connection enabled | `false` |
-| `storage.cassandra.tls.secretName` | Provisioned cassandra TLS connection existing secret name (possible keys in secret: `ca-cert.pem`, `client-key.pem`, `client-cert.pem`, `cqlshrc`, `commonName`) | `` |
-| `storage.cassandra.usePassword` | Use password | `true` |
-| `storage.cassandra.user` | Provisioned cassandra username | `user` |
-| `storage.elasticsearch.existingSecret` | Name of existing password secret object (for password authentication | `nil` |
-| `storage.elasticsearch.host` | Provisioned elasticsearch host| `elasticsearch` |
-| `storage.elasticsearch.password` | Provisioned elasticsearch password  (ignored if storage.elasticsearch.existingSecret set | `changeme` |
-| `storage.elasticsearch.port` | Provisioned elasticsearch port| `9200` |
-| `storage.elasticsearch.scheme` | Provisioned elasticsearch scheme | `http` |
-| `storage.elasticsearch.usePassword` | Use password | `true` |
-| `storage.elasticsearch.user` | Provisioned elasticsearch user| `elastic` |
-| `storage.elasticsearch.indexPrefix` | Index Prefix for elasticsearch | `nil` |
-| `storage.elasticsearch.nodesWanOnly` | Only access specified es host | `false` |
-| `storage.kafka.brokers` | Broker List for Kafka with port | `kafka:9092` |
-| `storage.kafka.topic` | Topic name for Kafka | `jaeger_v1_test` |
-| `storage.type` | Storage type (ES or Cassandra)| `cassandra` |
-| `tag` | Image tag/version | `1.17.0` |
+As as example if using the [jaeger-mongodb](https://github.com/mongodb-labs/jaeger-mongodb)
+plugin you can set the `MONGO_URL` as follows...

-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.
+```YAML
+storage:
+  type: grpc-plugin
+  grpcPlugin:
+    extraEnv:
+      - name: MONGO_URL
+        valueFrom:
+          secretKeyRef:
+            key: MONGO_URL
+            name: jaeger-secrets
+```

-For more information about some of the tunable parameters that Jaeger provides, please visit the official [Jaeger repo](https://github.com/uber/jaeger) at GitHub.com.
+### All in One In-Memory Configuration

-### Pending enhancements
+#### Installing the Chart using the All in One executable and in-memory storage

- [ ] Sidecar deployment support
+To install the chart with the release name `jaeger` using in-memory storage and the All in One
+executable, configure the chart as follows:
+
+Content of the `values.yaml` file:
+
+```yaml
+provisionDataStore:
+  cassandra: false
+allInOne:
+  enabled: true
+storage:
+  type: memory
+agent:
+  enabled: false
+collector:
+  enabled: false
+query:
+  enabled: false
+```
+
+It's possible to specify resources, extra environment variables, and extra secrets for the all in one deployment:
+
+```yaml
+allInOne:
+  extraEnv:
+    - name: QUERY_BASE_PATH
+      value: /jaeger
+  resources:
+    limits:
+      cpu: 500m
+      memory: 512Mi
+    requests:
+      cpu: 256m
+      memory: 128Mi
+  extraSecretMounts:
+    - name: jaeger-tls
+      mountPath: /tls
+      subPath: ""
+      secretName: jaeger-tls
+      readOnly: true
+```
+
+```bash
+helm install jaeger jaegertracing/jaeger --values values.yaml
+```
+
+## oAuth2 Sidecar
+If extra protection of the Jaeger UI is needed, then the oAuth2 sidecar can be enabled in the Jaeger Query. The oAuth2
+sidecar acts as a security proxy in front of the Jaeger Query service and enforces user authentication before reaching
+the Jaeger UI. This method can work with any valid provider including Keycloak, Azure, Google, GitHub, and more.
+
+Offical docs [here](https://oauth2-proxy.github.io/oauth2-proxy/docs/behaviour)
+
+Content of the `jaeger-values.yaml` file:
+
+```YAML
+query:
+  enabled: true
+  oAuthSidecar:
+    enabled: true
+    resources: {}
+    image:
+      registry: quay.io
+      repository: oauth2-proxy/oauth2-proxy
+      tag: v7.6.0
+    pullPolicy: IfNotPresent
+    containerPort: 4180
+    args:
+      - --config
+      - /etc/oauth2-proxy/oauth2-proxy.cfg
+      - --client-secret
+      - "$(client-secret)"
+    extraEnv:
+      - name: client-secret
+        valueFrom:
+          secretKeyRef:
+            name: client-secret
+            key: client-secret-key
+    extraConfigmapMounts: []
+    extraSecretMounts: []
+    config: |-
+      provider = "oidc"
+      https_address = ":4180"
+      upstreams = ["http://localhost:16686"]
+      redirect_url = "https://jaeger-svc-domain/oauth2/callback"
+      client_id = "jaeger-query"
+      oidc_issuer_url = "https://keycloak-svc-domain/auth/realms/Default"
+      cookie_secure = "true"
+      cookie_secret = ""
+      email_domains = "*"
+      oidc_groups_claim = "groups"
+      user_id_claim = "preferred_username"
+      skip_provider_button = "true"
+```
+
+## Installing extra kubernetes objects
+
+If additional kubernetes objects need to be installed alongside this chart, set the `extraObjects` array to contain
+the yaml describing these objects. The values in the array are treated as a template to allow the use of variable
+substitution and function calls as in the example below.
+
+Content of the `jaeger-values.yaml` file:
+
+```YAML
+extraObjects:
+  - apiVersion: rbac.authorization.k8s.io/v1
+    kind: RoleBinding
+    metadata:
+      name: "{{ .Release.Name }}-someRoleBinding"
+    roleRef:
+      apiGroup: rbac.authorization.k8s.io
+      kind: Role
+      name: someRole
+    subjects:
+      - kind: ServiceAccount
+        name: "{{ include \"jaeger.esLookback.serviceAccountName\" . }}"
+```
+
+## Configuring the hotrod example application to send traces to the OpenTelemetry collector
+
+If the `hotrod` example application is enabled it will export traces to Jaeger
+via the Jaeger exporter. To switch this to another collector and/or protocol,
+such as an OpenTelemetry OTLP Collector, see the example below.
+
+The primary use case of sending the traces to the collector instead of directly
+to Jaeger is to verify traces can get back to Jaeger or another distributed
+tracing store and verify that pipeline with the pre-instrumented hotrod
+application.
+
+**NOTE: This will not install or setup the OpenTelemetry collector. To setup an example OpenTelemetry Collector, see the [OpenTelemetry helm
+charts](https://github.com/open-telemetry/opentelemetry-helm-charts/tree/main/charts/opentelemetry-collector).**
+
+Content of the `jaeger-values.yaml` file:
+
+```YAML
+hotrod:
+  enabled: true
+  # Switch from the jaeger protocol to OTLP
+  extraArgs:
+    - --otel-exporter=otlp
+  # Set the address of the OpenTelemetry collector endpoint
+  extraEnv:
+    - name: OTEL_EXPORTER_OTLP_ENDPOINT
+      value: http://my-otel-collector-opentelemetry-collector:4318
+```
+
+## Updating to Kafka to Kraft Mode
+
+In the Kafka Helm Chart version 24.0.0 major refactors were done to support Kraft mode. More information can be found [here](https://github.com/bitnami/charts/tree/main/bitnami/kafka#to-2400).
+
+#### Upgrading from Kraft mode
+
+If you are upgrading from Kraft mode, follow the instructions [here](https://github.com/bitnami/charts/tree/main/bitnami/kafka#upgrading-from-zookeeper-mode).
+
+#### Upgrading from Zookeeper mode
+
+If you are upgrading from Zookeeper mode, follow the instructions [here](https://github.com/bitnami/charts/tree/main/bitnami/kafka#upgrading-from-zookeeper-mode).
+
+After you complete the steps above, follow the instructions [here](https://github.com/bitnami/charts/tree/main/bitnami/kafka#migrating-from-zookeeper-early-access) to finally migrate from Zookeeper.
--- a/charts/jaeger/requirements.yaml
+++ b/charts/jaeger/requirements.yaml
@ -1,13 +0,0 @@
-dependencies:
-  - name: cassandra
-    version: ^0.13.1
-    repository: https://kubernetes-charts-incubator.storage.googleapis.com/
-    condition: provisionDataStore.cassandra
-  - name: elasticsearch
-    version: ^7.5.1
-    repository: https://helm.elastic.co
-    condition: provisionDataStore.elasticsearch
-  - name: kafka
-    version: ^0.20.6
-    repository: https://kubernetes-charts-incubator.storage.googleapis.com/
-    condition: provisionDataStore.kafka
--- a/charts/jaeger/templates/NOTES.txt
+++ b/charts/jaeger/templates/NOTES.txt
@ -1,3 +1,12 @@
+
+###################################################################
+### IMPORTANT: Ensure that storage is explicitly configured     ###
+### Default storage options are subject to change.              ###
+###                                                             ###
+### IMPORTANT: The use of <component>.env: {...} is deprecated. ###
+### Please use <component>.extraEnv: [] instead.                ###
+###################################################################
+
 You can log into the Jaeger Query UI here:

 {{- if contains "NodePort" .Values.query.service.type }}
--- a/charts/jaeger/templates/_helpers.tpl
+++ b/charts/jaeger/templates/_helpers.tpl
@ -73,6 +73,39 @@ Create the name of the spark service account to use
 {{- end -}}
 {{- end -}}

+{{/*
+Create the name of the esIndexCleaner service account to use
+*/}}
+{{- define "jaeger.esIndexCleaner.serviceAccountName" -}}
+{{- if .Values.esIndexCleaner.serviceAccount.create -}}
+  {{ default (printf "%s-es-index-cleaner" (include "jaeger.fullname" .)) .Values.esIndexCleaner.serviceAccount.name }}
+{{- else -}}
+  {{ default "default" .Values.esIndexCleaner.serviceAccount.name }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create the name of the esRollover service account to use
+*/}}
+{{- define "jaeger.esRollover.serviceAccountName" -}}
+{{- if .Values.esRollover.serviceAccount.create -}}
+  {{ default (printf "%s-es-rollover" (include "jaeger.fullname" .)) .Values.esRollover.serviceAccount.name }}
+{{- else -}}
+  {{ default "default" .Values.esRollover.serviceAccount.name }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create the name of the esLookback service account to use
+*/}}
+{{- define "jaeger.esLookback.serviceAccountName" -}}
+{{- if .Values.esLookback.serviceAccount.create -}}
+  {{ default (printf "%s-es-lookback" (include "jaeger.fullname" .)) .Values.esLookback.serviceAccount.name }}
+{{- else -}}
+  {{ default "default" .Values.esLookback.serviceAccount.name }}
+{{- end -}}
+{{- end -}}
+
 {{/*
 Create the name of the hotrod service account to use
 */}}
@ -117,6 +150,28 @@ Create the name of the collector service account to use
 {{- end -}}
 {{- end -}}

+{{/*
+Create the collector ingress host
+*/}}
+{{- define "jaeger.collector.ingressHost" -}}
+{{- if (kindIs "string" .) }}
+  {{- . }}
+{{- else }}
+  {{- .host }}
+{{- end }}
+{{- end -}}
+
+{{/*
+Create the collector ingress servicePort
+*/}}
+{{- define "jaeger.collector.ingressServicePort" -}}
+{{- if (kindIs "string" .context) }}
+  {{- .defaultServicePort }}
+{{- else }}
+  {{- .context.servicePort }}
+{{- end }}
+{{- end -}}
+
 {{/*
 Create the name of the ingester service account to use
 */}}
@ -213,7 +268,11 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 */}}
 {{- define "elasticsearch.client.url" -}}
 {{- $port := .Values.storage.elasticsearch.port | toString -}}
-{{- printf "%s://%s:%s" .Values.storage.elasticsearch.scheme .Values.storage.elasticsearch.host $port }}
+{{- $host := .Values.storage.elasticsearch.host }}
+{{- if .Values.provisionDataStore.elasticsearch }}
+{{- $host = printf "%s-elasticsearch" .Release.Name }}
+{{- end }}
+{{- printf "%s://%s:%s" .Values.storage.elasticsearch.scheme $host $port }}
 {{- end -}}

 {{- define "jaeger.hotrod.tracing.host" -}}
@ -237,3 +296,442 @@ Configure list of IP CIDRs allowed access to load balancer (if supported)
 {{- $local := dict "first" true -}}
 {{- range $k, $v := . -}}{{- if not $local.first -}},{{- end -}}{{- $v -}}{{- $_ := set $local "first" false -}}{{- end -}}
 {{- end -}}
+
+
+{{/*
+Cassandra related environment variables
+*/}}
+{{- define "cassandra.env" -}}
+- name: CASSANDRA_SERVERS
+  value: {{ include "cassandra.host" . }}
+- name: CASSANDRA_PORT
+  value: {{ .Values.storage.cassandra.port | quote }}
+{{ if .Values.storage.cassandra.tls.enabled }}
+- name: CASSANDRA_TLS_ENABLED
+  value: "true"
+- name: CASSANDRA_TLS_SERVER_NAME
+  valueFrom:
+    secretKeyRef:
+      name: {{ .Values.storage.cassandra.tls.secretName }}
+      key: commonName
+- name: CASSANDRA_TLS_KEY
+  value: "/cassandra-tls/client-key.pem"
+- name: CASSANDRA_TLS_CERT
+  value: "/cassandra-tls/client-cert.pem"
+- name: CASSANDRA_TLS_CA
+  value: "/cassandra-tls/ca-cert.pem"
+{{- end }}
+{{- if .Values.storage.cassandra.keyspace }}
+- name: CASSANDRA_KEYSPACE
+  value: {{ .Values.storage.cassandra.keyspace }}
+{{- end }}
+- name: CASSANDRA_USERNAME
+  value: {{ .Values.storage.cassandra.user }}
+- name: CASSANDRA_PASSWORD
+  valueFrom:
+    secretKeyRef:
+      name: {{ if .Values.storage.cassandra.existingSecret }}{{ .Values.storage.cassandra.existingSecret }}{{- else }}{{ include "jaeger.fullname" . }}-cassandra{{- end }}
+      key: password
+{{- range $key, $value := .Values.storage.cassandra.env }}
+- name: {{ $key | quote }}
+  value: {{ $value | quote }}
+{{ end -}}
+{{- if .Values.storage.cassandra.extraEnv }}
+{{ toYaml .Values.storage.cassandra.extraEnv }}
+{{- end }}
+{{- end -}}
+
+{{/*
+Elasticsearch related environment variables
+*/}}
+{{- define "elasticsearch.env" -}}
+- name: ES_SERVER_URLS
+  value: {{ include "elasticsearch.client.url" . }}
+{{- if not .Values.storage.elasticsearch.anonymous }}
+- name: ES_USERNAME
+  value: {{ .Values.storage.elasticsearch.user }}
+{{- end }}
+{{- if .Values.storage.elasticsearch.usePassword }}
+- name: ES_PASSWORD
+  valueFrom:
+    secretKeyRef:
+      name: {{ if .Values.storage.elasticsearch.existingSecret }}{{ .Values.storage.elasticsearch.existingSecret }}{{- else }}{{ include "jaeger.fullname" . }}-elasticsearch{{- end }}
+      key: {{ default "password" .Values.storage.elasticsearch.existingSecretKey }}
+{{- end }}
+{{- if .Values.storage.elasticsearch.tls.enabled }}
+- name: ES_TLS_ENABLED
+  value: "true"
+- name: ES_TLS_CA
+  value: {{ .Values.storage.elasticsearch.tls.ca }}
+{{- end }}
+{{- if .Values.storage.elasticsearch.indexPrefix }}
+- name: ES_INDEX_PREFIX
+  value: {{ .Values.storage.elasticsearch.indexPrefix }}
+{{- end }}
+{{- range $key, $value := .Values.storage.elasticsearch.env }}
+- name: {{ $key | quote }}
+  value: {{ $value | quote }}
+{{ end -}}
+{{- if .Values.storage.elasticsearch.extraEnv }}
+{{ toYaml .Values.storage.elasticsearch.extraEnv }}
+{{- end }}
+{{- end -}}
+
+{{/*
+grpcPlugin related environment variables
+*/}}
+{{- define "grpcPlugin.env" -}}
+{{- if .Values.storage.grpcPlugin.extraEnv }}
+{{- toYaml .Values.storage.grpcPlugin.extraEnv }}
+{{- end }}
+{{- end -}}
+
+{{/*
+badger related environment variables
+*/}}
+{{- define "badger.env" -}}
+- name: BADGER_EPHEMERAL
+  value: {{ .Values.storage.badger.ephemeral | quote }}
+{{- if not .Values.storage.badger.ephemeral }}
+- name: BADGER_DIRECTORY_VALUE
+  value: {{ print .Values.storage.badger.persistence.mountPath "/badger/data" | quote }}
+- name: BADGER_DIRECTORY_KEY
+  value: {{ print .Values.storage.badger.persistence.mountPath "/badger/key" | quote }}
+{{- end }}
+{{- if .Values.storage.badger.extraEnv }}
+{{- toYaml .Values.storage.badger.extraEnv }}
+{{- end }}
+{{- end -}}
+
+{{/*
+memory related environment variables
+*/}}
+{{- define "memory.env" -}}
+{{- if .Values.storage.memory.extraEnv }}
+{{- toYaml .Values.storage.memory.extraEnv }}
+{{- end }}
+{{- end -}}
+
+
+{{/*
+Cassandra, Elasticsearch, or grpc-plugin, badger, memory related environment variables depending on which is used
+*/}}
+{{- define "storage.env" -}}
+{{- if eq .Values.storage.type "cassandra" -}}
+{{ include "cassandra.env" . }}
+{{- else if eq .Values.storage.type "elasticsearch" -}}
+{{ include "elasticsearch.env" . }}
+{{- else if or (eq .Values.storage.type "grpc-plugin") (eq .Values.storage.type "grpc") -}}
+{{ include "grpcPlugin.env" . }}
+{{- else if eq .Values.storage.type "badger" -}}
+{{ include "badger.env" . }}
+{{- else if eq .Values.storage.type "memory" -}}
+{{ include "memory.env" . }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Cassandra related command line options
+*/}}
+{{- define "cassandra.cmdArgs" -}}
+{{- range $key, $value := .Values.storage.cassandra.cmdlineParams -}}
+{{- if $value }}
+- --{{ $key }}={{ $value }}
+{{- else }}
+- --{{ $key }}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Elasticsearch related command line options
+*/}}
+{{- define "elasticsearch.cmdArgs" -}}
+{{- range $key, $value := .Values.storage.elasticsearch.cmdlineParams -}}
+{{- if $value }}
+- --{{ $key }}={{ $value }}
+{{- else }}
+- --{{ $key }}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Cassandra or Elasticsearch related command line options depending on which is used
+*/}}
+{{- define "storage.cmdArgs" -}}
+{{- if eq .Values.storage.type "cassandra" -}}
+{{- include "cassandra.cmdArgs" . -}}
+{{- else if eq .Values.storage.type "elasticsearch" -}}
+{{- include "elasticsearch.cmdArgs" . -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Add extra argument to the command line options
+Usage:
+    {{ include "extra.cmdArgs" ( dict "cmdlineParams" .Values.collector.cmdlineParams ) | nindent 10  }}
+*/}}
+{{- define "extra.cmdArgs" -}}
+{{- range $key, $value := .cmdlineParams -}}
+{{- if $value }}
+- --{{ $key }}={{ $value }}
+{{- else }}
+- --{{ $key }}
+{{- end }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Provides a basic ingress network policy
+*/}}
+{{- define "jaeger.ingress.networkPolicy" -}}
+apiVersion: {{ include "common.capabilities.networkPolicy.apiVersion" . }}
+kind: NetworkPolicy
+metadata:
+  name: {{ printf "%s-ingress" .Name }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/component: {{ .Component }}
+    {{- include "jaeger.labels" . | nindent 4 }}
+spec:
+  podSelector:
+    matchLabels:
+      app.kubernetes.io/component: {{ .Component }}
+  policyTypes:
+  - Ingress
+  ingress:
+  {{- if or .ComponentValues.networkPolicy.ingressRules.namespaceSelector .ComponentValues.networkPolicy.ingressRules.podSelector }}
+  - from:
+    {{- if .ComponentValues.networkPolicy.ingressRules.namespaceSelector }}
+    - namespaceSelector:
+        matchLabels: {{- include "common.tplvalues.render" (dict "value" .ComponentValues.networkPolicy.ingressRules.namespaceSelector "context" $) | nindent 10 }}
+    {{- end }}
+    {{- if .ComponentValues.networkPolicy.ingressRules.podSelector }}
+    - podSelector:
+        matchLabels: {{- include "common.tplvalues.render" (dict "value" .ComponentValues.networkPolicy.ingressRules.podSelector "context" $) | nindent 10 }}
+    {{- end }}
+  {{- end }}
+  {{- if .ComponentValues.networkPolicy.ingressRules.customRules }}
+  {{- include "common.tplvalues.render" (dict "value" .ComponentValues.networkPolicy.ingressRules.customRules "context" $) | nindent 2 }}
+  {{- end }}
+{{- end -}}
+
+{{/*
+Provides a basic egress network policy
+*/}}
+{{- define "jaeger.egress.networkPolicy" -}}
+apiVersion: {{ include "common.capabilities.networkPolicy.apiVersion" . }}
+kind: NetworkPolicy
+metadata:
+  name: {{ printf "%s-egress" .Name }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/component: {{ .Component }}
+    {{- include "jaeger.labels" . | nindent 4 }}
+spec:
+  podSelector:
+    matchLabels:
+      app.kubernetes.io/component: {{ .Component }}
+  policyTypes:
+  - Egress
+  egress:
+  {{- if or .ComponentValues.networkPolicy.egressRules.namespaceSelector .ComponentValues.networkPolicy.egressRules.podSelector }}
+  - to:
+    {{- if .ComponentValues.networkPolicy.egressRules.namespaceSelector }}
+    - namespaceSelector:
+        matchLabels: {{- include "common.tplvalues.render" (dict "value" .ComponentValues.networkPolicy.egressRules.namespaceSelector "context" $) | nindent 10 }}
+    {{- end }}
+    {{- if .ComponentValues.networkPolicy.egressRules.podSelector }}
+    - podSelector:
+        matchLabels: {{- include "common.tplvalues.render" (dict "value" .ComponentValues.networkPolicy.egressRules.podSelector "context" $) | nindent 10 }}
+    {{- end }}
+  {{- end }}
+  {{- if .ComponentValues.networkPolicy.egressRules.customRules }}
+  {{- include "common.tplvalues.render" (dict "value" .ComponentValues.networkPolicy.egressRules.customRules "context" $) | nindent 2 }}
+  {{- end }}
+{{- end -}}
+
+{{/*
+Create image name value
+If not tag is provided, it defaults to .Chart.AppVersion.
+( dict "imageRoot" .Values.path.to.image "context" $ )
+*/}}
+{{- define "renderImage" -}}
+{{- $image := merge .imageRoot (dict "tag" .context.Chart.AppVersion) -}}
+{{- include "common.images.image" (dict "imageRoot" $image "global" .context.Values.global) -}}
+{{- end -}}
+
+{{/*
+Create image name for all in one image
+*/}}
+{{- define "allInOne.image" -}}
+{{- include "renderImage" ( dict "imageRoot" .Values.allInOne.image "context" $ ) -}}
+{{- end -}}
+
+{{/*
+Create pull secrets for all in one image
+*/}}
+{{- define "allInOne.imagePullSecrets" -}}
+{{- include "common.images.renderPullSecrets" (dict "images" (list .Values.allInOne.image) "context" $) -}}
+{{- end }}
+
+{{/*
+Create image name for schema image
+*/}}
+{{- define "schema.image" -}}
+{{- include "renderImage" ( dict "imageRoot" .Values.schema.image "context" $ ) -}}
+{{- end -}}
+
+{{/*
+Create pull secrets for schema image
+*/}}
+{{- define "schema.imagePullSecrets" -}}
+{{- include "common.images.renderPullSecrets" (dict "images" (list .Values.schema.image) "context" $) -}}
+{{- end }}
+
+{{/*
+Create image name for ingester image
+*/}}
+{{- define "ingester.image" -}}
+{{- include "renderImage" ( dict "imageRoot" .Values.ingester.image "context" $ ) -}}
+{{- end -}}
+
+{{/*
+Create pull secrets for ingester image
+*/}}
+{{- define "ingester.imagePullSecrets" -}}
+{{- include "common.images.renderPullSecrets" (dict "images" (list .Values.ingester.image) "context" $) -}}
+{{- end }}
+
+{{/*
+Create image name for agent image
+*/}}
+{{- define "agent.image" -}}
+{{- include "renderImage" ( dict "imageRoot" .Values.agent.image "context" $ ) -}}
+{{- end -}}
+
+{{/*
+Create pull secrets for agent image
+*/}}
+{{- define "agent.imagePullSecrets" -}}
+{{- include "common.images.renderPullSecrets" (dict "images" (list .Values.agent.image) "context" $) -}}
+{{- end }}
+
+
+{{/*
+Create image name for collector image
+*/}}
+{{- define "collector.image" -}}
+{{- include "renderImage" ( dict "imageRoot" .Values.collector.image "context" $ ) -}}
+{{- end -}}
+
+{{/*
+Create pull secrets for collector image
+*/}}
+{{- define "collector.imagePullSecrets" -}}
+{{- include "common.images.renderPullSecrets" (dict "images" (list .Values.collector.image) "context" $) -}}
+{{- end }}
+
+{{/*
+Create image name for query image
+*/}}
+{{- define "query.image" -}}
+{{- include "renderImage" ( dict "imageRoot" .Values.query.image "context" $ ) -}}
+{{- end -}}
+
+{{/*
+Create pull secrets for query image
+*/}}
+{{- define "query.imagePullSecrets" -}}
+{{- include "common.images.renderPullSecrets" (dict "images" (list .Values.query.image .Values.query.oAuthSidecar.image) "context" $) -}}
+{{- end }}
+
+{{/*
+Create image name for oAuthSidecar image
+*/}}
+{{- define "oAuthSidecar.image" -}}
+{{- include "common.images.image" (dict "imageRoot" .Values.query.oAuthSidecar.image "global" .Values.global) -}}
+{{- end -}}
+
+{{/*
+Create image name for spark image
+*/}}
+{{- define "spark.image" -}}
+{{- include "common.images.image" (dict "imageRoot" .Values.spark.image "global" .Values.global) -}}
+{{- end -}}
+
+{{/*
+Create pull secrets for spark image
+*/}}
+{{- define "spark.imagePullSecrets" -}}
+{{- include "common.images.renderPullSecrets" (dict "images" (list .Values.spark.image) "context" $) -}}
+{{- end }}
+
+{{/*
+Create image name for esIndexCleaner image
+*/}}
+{{- define "esIndexCleaner.image" -}}
+{{- include "renderImage" ( dict "imageRoot" .Values.esIndexCleaner.image "context" $ ) -}}
+{{- end -}}
+
+{{/*
+Create pull secrets for esIndexCleaner image
+*/}}
+{{- define "esIndexCleaner.imagePullSecrets" -}}
+{{- include "common.images.renderPullSecrets" (dict "images" (list .Values.esIndexCleaner.image) "context" $) -}}
+{{- end }}
+
+{{/*
+Create image name for esRollover image
+*/}}
+{{- define "esRollover.image" -}}
+{{- include "renderImage" ( dict "imageRoot" .Values.esRollover.image "context" $ ) -}}
+{{- end -}}
+
+{{/*
+Create pull secrets for esRollover image
+*/}}
+{{- define "esRollover.imagePullSecrets" -}}
+{{- include "common.images.renderPullSecrets" (dict "images" (list .Values.esRollover.image) "context" $) -}}
+{{- end }}
+
+{{/*
+Create image name for esLookback image
+*/}}
+{{- define "esLookback.image" -}}
+{{- include "renderImage" ( dict "imageRoot" .Values.esLookback.image "context" $ ) -}}
+{{- end -}}
+
+{{/*
+Create pull secrets for esLookback image
+*/}}
+{{- define "esLookback.imagePullSecrets" -}}
+{{- include "common.images.renderPullSecrets" (dict "images" (list .Values.esLookback.image) "context" $) -}}
+{{- end }}
+
+{{/*
+Create image name for hotrod image
+*/}}
+{{- define "hotrod.image" -}}
+{{- include "renderImage" ( dict "imageRoot" .Values.hotrod.image "context" $ ) -}}
+{{- end -}}
+
+{{/*
+Define curl image declaration
+*/}}
+{{- define "curl.image" -}}
+{{- $image := "curlimages/curl" -}}
+{{- if .Values.global.imageRegistry -}}
+{{ .Values.global.imageRegistry }}/{{ $image }}
+{{- else -}}
+{{ $image }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create pull secrets for hotrod image
+*/}}
+{{- define "hotrod.imagePullSecrets" -}}
+{{- include "common.images.renderPullSecrets" (dict "images" (list .Values.hotrod.image) "context" $) -}}
+{{- end }}
--- a/charts/jaeger/templates/agent-ds.yaml
+++ b/charts/jaeger/templates/agent-ds.yaml
@ -8,47 +8,63 @@ metadata:
    app.kubernetes.io/component: agent
 {{- if .Values.agent.annotations }}
  annotations:
-{{ toYaml .Values.agent.annotations | indent 4 }}
+    {{- toYaml .Values.agent.annotations | nindent 4 }}
 {{- end }}
 spec:
  selector:
    matchLabels:
      {{- include "jaeger.selectorLabels" . | nindent 6 }}
      app.kubernetes.io/component: agent
+  {{- with .Values.agent.daemonset.updateStrategy }}
+  updateStrategy:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
  template:
    metadata:
 {{- if .Values.agent.podAnnotations }}
      annotations:
-{{ toYaml .Values.agent.podAnnotations | indent 8 }}
+        {{- toYaml .Values.agent.podAnnotations | nindent 8 }}
 {{- end }}
      labels:
        {{- include "jaeger.selectorLabels" . | nindent 8 }}
        app.kubernetes.io/component: agent
 {{- if .Values.agent.podLabels }}
-{{ toYaml .Values.agent.podLabels | indent 8 }}
+        {{- toYaml .Values.agent.podLabels | nindent 8 }}
 {{- end }}
    spec:
      securityContext:
-{{ toYaml .Values.agent.podSecurityContext | indent 8 }}
+        {{- toYaml .Values.agent.podSecurityContext | nindent 8 }}
      {{- if .Values.agent.useHostNetwork }}
      hostNetwork: true
      {{- end }}
      dnsPolicy: {{ .Values.agent.dnsPolicy }}
+      {{- with .Values.agent.priorityClassName }}
+      priorityClassName: {{ . }}
+      {{- end }}
      serviceAccountName: {{ template "jaeger.agent.serviceAccountName" . }}
+      {{- include "agent.imagePullSecrets" . | nindent 6 }}
+      {{- if .Values.agent.initContainers }}
+      initContainers:
+        {{- toYaml .Values.agent.initContainers | nindent 8 }}
+      {{- end}}
      containers:
      - name: {{ template "jaeger.agent.name" . }}
        securityContext:
-{{ toYaml .Values.agent.securityContext | indent 10 }}
-        image: {{ .Values.agent.image }}:{{ .Values.tag }}
-        imagePullPolicy: {{ .Values.agent.pullPolicy }}
+          {{- toYaml .Values.agent.securityContext | nindent 10 }}
+        image: {{ include "agent.image" . }}
+        imagePullPolicy: {{ .Values.agent.image.pullPolicy }}
+        args:
+          {{ include "extra.cmdArgs" ( dict "cmdlineParams" .Values.agent.cmdlineParams ) | nindent 10  }}
        env:
+        {{- if .Values.agent.extraEnv }}
+          {{- toYaml .Values.agent.extraEnv | nindent 10 }}
+        {{- end }}
        {{- if not (hasKey .Values.agent.cmdlineParams "reporter.grpc.host-port") }}
          - name: REPORTER_GRPC_HOST_PORT
-          value: {{ include "jaeger.collector.name" . }}:{{ .Values.collector.service.grpcPort }}
+            value: {{ include "jaeger.collector.name" . }}:{{ .Values.collector.service.grpc.port }}
        {{- end }}
-        {{- range $key, $value := .Values.agent.cmdlineParams }}
-        - name: {{ $key | replace "." "_" | replace "-" "_" | upper | quote }}
-          value: {{ $value | quote }}
+      {{- with .Values.agent.envFrom }}
+        envFrom: {{- toYaml . | nindent 10 }}
      {{- end }}
        ports:
        - name: zipkin-compact
@ -87,7 +103,7 @@ spec:
            path: /
            port: admin
        resources:
-{{ toYaml .Values.agent.resources | indent 10 }}
+          {{- toYaml .Values.agent.resources | nindent 10 }}
        volumeMounts:
        {{- range .Values.agent.extraConfigmapMounts }}
          - name: {{ .name }}
--- a/charts/jaeger/templates/agent-sa.yaml
+++ b/charts/jaeger/templates/agent-sa.yaml
@ -6,4 +6,9 @@ metadata:
  labels:
    {{- include "jaeger.labels" . | nindent 4 }}
    app.kubernetes.io/component: agent
+  {{- with .Values.agent.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+automountServiceAccountToken: {{ .Values.agent.serviceAccount.automountServiceAccountToken }}
 {{- end -}}
--- a/charts/jaeger/templates/agent-servicemonitor.yaml
+++ b/charts/jaeger/templates/agent-servicemonitor.yaml
@ -0,0 +1,44 @@
+{{- if and (.Values.agent.enabled) (.Values.agent.serviceMonitor.enabled)}}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ template "jaeger.agent.name" . }}
+  {{- if .Values.agent.serviceMonitor.namespace }}
+  namespace: {{ .Values.agent.serviceMonitor.namespace }}
+  {{- end }}
+  labels:
+    {{- include "jaeger.labels" . | nindent 4 }}
+    app.kubernetes.io/component: agent
+    {{- if .Values.agent.serviceMonitor.additionalLabels }}
+    {{- toYaml .Values.agent.serviceMonitor.additionalLabels | nindent 4 }}
+    {{- end }}
+  {{- if .Values.agent.serviceMonitor.annotations }}
+  annotations:
+    {{- toYaml .Values.agent.serviceMonitor.annotations | nindent 4 }}
+  {{- end }}
+spec:
+  endpoints:
+    - port: admin
+      path: /metrics
+      {{- if .Values.agent.serviceMonitor.interval }}
+      interval: {{ .Values.agent.serviceMonitor.interval }}
+      {{- end }}
+      {{- if .Values.agent.serviceMonitor.scrapeTimeout }}
+      scrapeTimeout: {{ .Values.agent.serviceMonitor.scrapeTimeout }}
+      {{- end }}
+      {{- if .Values.agent.serviceMonitor.relabelings }}
+      relabelings:
+        {{- toYaml .Values.agent.serviceMonitor.relabelings | nindent 8 }}
+      {{- end }}
+      {{- if .Values.agent.serviceMonitor.metricRelabelings }}
+      metricRelabelings:
+        {{- toYaml .Values.agent.serviceMonitor.metricRelabelings | nindent 8 }}
+      {{- end }}
+  namespaceSelector:
+    matchNames:
+      - {{ .Release.Namespace }}
+  selector:
+    matchLabels:
+      app.kubernetes.io/component: agent
+      app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
--- a/charts/jaeger/templates/agent-svc.yaml
+++ b/charts/jaeger/templates/agent-svc.yaml
@ -8,7 +8,7 @@ metadata:
    app.kubernetes.io/component: agent
 {{- if .Values.agent.service.annotations }}
  annotations:
-{{ toYaml .Values.agent.service.annotations | indent 4 }}
+    {{- toYaml .Values.agent.service.annotations | nindent 4 }}
 {{- end }}
 spec:
  ports:
@ -28,6 +28,10 @@ spec:
    port: {{ .Values.agent.service.samplingPort }}
    protocol: TCP
    targetPort: http
+  - name: admin
+    port: 14271
+    protocol: TCP
+    targetPort: admin
  type: {{ .Values.agent.service.type }}
  selector:
    {{- include "jaeger.selectorLabels" . | nindent 4 }}
--- a/charts/jaeger/templates/allinone-agent-svc.yaml
+++ b/charts/jaeger/templates/allinone-agent-svc.yaml
@ -0,0 +1,30 @@
+{{- if .Values.allInOne.enabled -}}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ template "jaeger.agent.name" . }}
+  labels:
+    {{- include "jaeger.labels" . | nindent 4 }}
+    app.kubernetes.io/component: service-agent
+spec:
+  clusterIP: None
+  ports:
+    - name: zk-compact-trft
+      port: 5775
+      protocol: UDP
+      targetPort: 0
+    - name: config-rest
+      port: 5778
+      targetPort: 0
+    - name: jg-compact-trft
+      port: 6831
+      protocol: UDP
+      targetPort: 0
+    - name: jg-binary-trft
+      port: 6832
+      protocol: UDP
+      targetPort: 0
+  selector:
+    {{- include "jaeger.selectorLabels" . | nindent 4 }}
+    app.kubernetes.io/component: all-in-one
+{{- end -}}
--- a/charts/jaeger/templates/allinone-collector-svc.yaml
+++ b/charts/jaeger/templates/allinone-collector-svc.yaml
@ -0,0 +1,48 @@
+{{- if .Values.allInOne.enabled -}}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ template "jaeger.collector.name" . }}
+  labels:
+    {{- include "jaeger.labels" . | nindent 4 }}
+    app.kubernetes.io/component: service-collector
+spec:
+  clusterIP: {{ .Values.allInOne.service.headless | ternary "None" "null" }}
+  ports:
+    - name: http-zipkin
+      port: 9411
+      targetPort: 0
+      {{- if semverCompare ">=1.20" .Capabilities.KubeVersion.Version }}
+      appProtocol: http
+      {{- end }}
+    - name: grpc-http
+      port: 14250
+      targetPort: 0
+      {{- if semverCompare ">=1.20" .Capabilities.KubeVersion.Version }}
+      appProtocol: grpc
+      {{- end }}
+    - name: c-tchan-trft
+      port: 14267
+      targetPort: 0
+    - name: http-c-binary-trft
+      port: 14268
+      targetPort: 0
+      {{- if semverCompare ">=1.20" .Capabilities.KubeVersion.Version }}
+      appProtocol: http
+      {{- end }}
+    - name: {{ .Values.allInOne.service.collector.otlp.grpc.name }}
+      port: 4317
+      targetPort: 0
+      {{- if semverCompare ">=1.20" .Capabilities.KubeVersion.Version }}
+      appProtocol: grpc
+      {{- end }}
+    - name: {{ .Values.allInOne.service.collector.otlp.http.name }}
+      port: 4318
+      targetPort: 0
+      {{- if semverCompare ">=1.20" .Capabilities.KubeVersion.Version }}
+      appProtocol: http
+      {{- end }}
+  selector:
+    {{- include "jaeger.selectorLabels" . | nindent 4 }}
+    app.kubernetes.io/component: all-in-one
+{{- end -}}
--- a/charts/jaeger/templates/allinone-configmap.yaml
+++ b/charts/jaeger/templates/allinone-configmap.yaml
@ -0,0 +1,12 @@
+{{- if .Values.allInOne.samplingConfig }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "jaeger.fullname" . }}-sampling-strategies
+  labels:
+    {{- include "jaeger.labels" . | nindent 4 }}
+    app.kubernetes.io/component: all-in-one
+data:
+  strategies.json: |-
+{{ tpl .Values.allInOne.samplingConfig . | indent 4 }}
+{{- end }}
--- a/charts/jaeger/templates/allinone-deploy.yaml
+++ b/charts/jaeger/templates/allinone-deploy.yaml
@ -0,0 +1,157 @@
+{{- if .Values.allInOne.enabled -}}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ template "jaeger.fullname" . }}
+  labels:
+    {{- include "jaeger.labels" . | nindent 4 }}
+    app.kubernetes.io/component: all-in-one
+    prometheus.io/port: "14269"
+    prometheus.io/scrape: "true"
+spec:
+  {{- if hasKey .Values.allInOne "replicas" }}
+  replicas: {{ .Values.allInOne.replicas }}
+  {{- end }}
+  strategy:
+    type: Recreate
+  selector:
+    matchLabels:
+      {{- include "jaeger.selectorLabels" . | nindent 6 }}
+      app.kubernetes.io/component: all-in-one
+  template:
+    metadata:
+      labels:
+        {{- include "jaeger.selectorLabels" . | nindent 8 }}
+        app.kubernetes.io/component: all-in-one
+{{- if .Values.allInOne.podLabels }}
+        {{- toYaml .Values.allInOne.podLabels | nindent 8 }}
+{{- end }}
+      annotations:
+        prometheus.io/port: "14269"
+        prometheus.io/scrape: "true"
+    spec:
+      {{- include "allInOne.imagePullSecrets" . | nindent 6 }}
+      containers:
+        - env:
+          {{- if .Values.allInOne.extraEnv }}
+            {{- toYaml .Values.allInOne.extraEnv | nindent 12 }}
+          {{- end }}
+            - name: SPAN_STORAGE_TYPE
+              value: {{ .Values.storage.type }}
+            {{- include "storage.env" . | nindent 12 }}
+            - name: COLLECTOR_ZIPKIN_HOST_PORT
+              value: :9411
+            - name: JAEGER_DISABLED
+              value: "false"
+            - name: COLLECTOR_OTLP_ENABLED
+              value: "true"
+            {{- if .Values.allInOne.samplingConfig }}
+            - name: SAMPLING_STRATEGIES_FILE
+              value: /etc/conf/strategies.json
+            {{- end }}
+        {{- with .Values.allInOne.envFrom }}
+          envFrom: {{- toYaml . | nindent 12 }}
+        {{- end }}
+          securityContext:
+            {{- toYaml .Values.allInOne.securityContext | nindent 12 }}
+          image: {{ include "allInOne.image" . }}
+          imagePullPolicy: {{ .Values.allInOne.image.pullPolicy }}
+          name: jaeger
+          args:
+            {{- range $arg := .Values.allInOne.args }}
+            - "{{ tpl $arg $ }}"
+            {{- end }}
+          ports:
+            - containerPort: 5775
+              protocol: UDP
+            - containerPort: 6831
+              protocol: UDP
+            - containerPort: 6832
+              protocol: UDP
+            - containerPort: 5778
+              protocol: TCP
+            - containerPort: 16686
+              protocol: TCP
+            - containerPort: 16685
+              protocol: TCP
+            - containerPort: 9411
+              protocol: TCP
+            - containerPort: 4317
+              protocol: TCP
+            - containerPort: 4318
+              protocol: TCP
+          livenessProbe:
+            failureThreshold: 5
+            httpGet:
+              path: /
+              port: 14269
+              scheme: HTTP
+            initialDelaySeconds: 5
+            periodSeconds: 15
+            successThreshold: 1
+            timeoutSeconds: 1
+          readinessProbe:
+            failureThreshold: 3
+            httpGet:
+              path: /
+              port: 14269
+              scheme: HTTP
+            initialDelaySeconds: 1
+            periodSeconds: 10
+            successThreshold: 1
+            timeoutSeconds: 1
+      {{- with .Values.allInOne.resources }}
+          resources:
+        {{- toYaml . | nindent 12 }}
+      {{- end }}
+          volumeMounts:
+        {{- if not .Values.storage.badger.ephemeral }}
+            - name: badger-data
+              mountPath: {{ .Values.storage.badger.persistence.mountPath }}
+        {{- end }}
+        {{- if .Values.allInOne.samplingConfig}}
+            - name: strategies
+              mountPath: /etc/conf/
+        {{- end }}
+        {{- range .Values.allInOne.extraSecretMounts }}
+            - name: {{ .name }}
+              mountPath: {{ .mountPath }}
+              subPath: {{ .subPath }}
+              readOnly: {{ .readOnly }}
+        {{- end }}
+      securityContext:
+        {{- toYaml .Values.allInOne.podSecurityContext | nindent 8 }}
+      serviceAccountName: {{ template "jaeger.fullname" . }}
+      volumes:
+    {{- if not .Values.storage.badger.ephemeral }}
+        - name: badger-data
+          persistentVolumeClaim:
+            claimName: {{ .Values.storage.badger.persistence.useExistingPvcName | required "Using badger persistence it is required to set an existing PVC"  }}
+    {{- end }}
+    {{- if .Values.allInOne.samplingConfig}}
+        - name: strategies
+          configMap:
+            name: {{ include "jaeger.fullname" . }}-sampling-strategies
+    {{- end }}
+    {{- range .Values.allInOne.extraSecretMounts }}
+        - name: {{ .name }}
+          secret:
+            secretName: {{ .secretName }}
+    {{- end }}
+    {{- with .Values.allInOne.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+    {{- end }}
+    {{- with .Values.allInOne.topologySpreadConstraints }}
+      topologySpreadConstraints:
+      {{- toYaml . | nindent 8 }}
+    {{- end }}
+    {{- with .Values.allInOne.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+    {{- end }}
+    {{- with .Values.allInOne.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+    {{- end }}
+{{- end -}}
--- a/charts/jaeger/templates/allinone-ing.yaml
+++ b/charts/jaeger/templates/allinone-ing.yaml
@ -0,0 +1,31 @@
+{{- if and (.Values.allInOne.enabled) (.Values.allInOne.ingress.enabled) -}}
+{{- $ingressSupportsIngressClassName := eq (include "common.ingress.supportsIngressClassname" .) "true" }}
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: {{ template "jaeger.query.name" . }}
+  labels:
+    {{- include "jaeger.labels" . | nindent 4 }}
+    app.kubernetes.io/component: all-in-one
+  {{- if .Values.allInOne.ingress.annotations }}
+  annotations:
+    {{- toYaml .Values.allInOne.ingress.annotations | nindent 4 }}
+  {{- end }}
+spec:
+  {{- if and $ingressSupportsIngressClassName .Values.allInOne.ingress.ingressClassName }}
+  ingressClassName: {{ .Values.allInOne.ingress.ingressClassName }}
+  {{- end }}
+  rules:
+    {{- range $host := .Values.allInOne.ingress.hosts }}
+    - host: {{ $host }}
+      http:
+        paths:
+          - path: /
+            pathType: {{ default "ImplementationSpecific" $.Values.allInOne.ingress.pathType }}
+            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "jaeger.query.name" $) "servicePort" 16686 "context" $) | nindent 14 }}
+  {{- end -}}
+  {{- if .Values.allInOne.ingress.tls }}
+  tls:
+  {{- toYaml .Values.allInOne.ingress.tls | nindent 4 }}
+  {{- end -}}
+{{- end -}}
--- a/charts/jaeger/templates/allinone-query-svc.yaml
+++ b/charts/jaeger/templates/allinone-query-svc.yaml
@ -0,0 +1,21 @@
+{{- if .Values.allInOne.enabled -}}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ template "jaeger.query.name" . }}
+  labels:
+    {{- include "jaeger.labels" . | nindent 4 }}
+    app.kubernetes.io/component: service-query
+spec:
+  clusterIP: None
+  ports:
+    - name: http-query
+      port: 16686
+      targetPort: 16686
+    - name: grpc-query
+      port: 16685
+      targetPort: 16685
+  selector:
+    {{- include "jaeger.selectorLabels" . | nindent 4 }}
+    app.kubernetes.io/component: all-in-one
+{{- end -}}
--- a/charts/jaeger/templates/allinone-sa.yaml
+++ b/charts/jaeger/templates/allinone-sa.yaml
@ -0,0 +1,14 @@
+{{- if .Values.allInOne.enabled -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ template "jaeger.fullname" . }}
+  labels:
+    {{- include "jaeger.labels" . | nindent 4 }}
+    app.kubernetes.io/component: all-in-one
+  {{- with .Values.allInOne.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+automountServiceAccountToken: {{ .Values.allInOne.serviceAccount.automountServiceAccountToken }}
+{{- end -}}
--- a/charts/jaeger/templates/cassandra-schema-job.yaml
+++ b/charts/jaeger/templates/cassandra-schema-job.yaml
@ -1,5 +1,6 @@
 {{- if .Values.collector.enabled -}}
 {{- if eq .Values.storage.type "cassandra" -}}
+{{- if .Values.storage.cassandra.schemaJobEnabled -}}
 apiVersion: batch/v1
 kind: Job
 metadata:
@ -9,57 +10,55 @@ metadata:
    app.kubernetes.io/component: cassandra-schema
 {{- if .Values.schema.annotations }}
  annotations:
-{{ toYaml .Values.schema.annotations | indent 4 }}
+    {{- toYaml .Values.schema.annotations | nindent 4 }}
 {{- end }}
 spec:
  activeDeadlineSeconds: {{ .Values.schema.activeDeadlineSeconds }}
  template:
    metadata:
      name: {{ include "jaeger.fullname" . }}-cassandra-schema
+{{- if .Values.schema.podAnnotations }}
+      annotations:
+        {{- toYaml .Values.schema.podAnnotations | nindent 8 }}
+{{- end }}
 {{- if .Values.schema.podLabels }}
      labels:
-{{ toYaml .Values.schema.podLabels | indent 8 }}
+        {{- toYaml .Values.schema.podLabels | nindent 8 }}
 {{- end }}
    spec:
+      securityContext:
+        {{- toYaml .Values.schema.podSecurityContext | nindent 8 }}
      serviceAccountName: {{ template "jaeger.cassandraSchema.serviceAccountName" . }}
+      {{- include "schema.imagePullSecrets" . | nindent 6 }}
      containers:
      - name: {{ include "jaeger.fullname" . }}-cassandra-schema
-        image: {{ .Values.schema.image }}:{{ .Values.tag }}
-        imagePullPolicy: {{ .Values.schema.pullPolicy }}
+        image: {{ include "schema.image" . }}
+        imagePullPolicy: {{ .Values.schema.image.pullPolicy }}
+        securityContext:
+          {{- toYaml .Values.schema.securityContext | nindent 10 }}
        env:
+        {{- if .Values.schema.extraEnv }}
+          {{- toYaml .Values.schema.extraEnv | nindent 10 }}
+        {{- end }}
+          {{ range $key, $value := .Values.schema.env }}
+          - name: {{ $key | quote }}
+            value: {{ $value | quote }}
+          {{ end }}
+          {{- include "cassandra.env" . | nindent 10 }}
          - name: CQLSH_HOST
            value: {{ template "cassandra.host" . }}
          {{ if .Values.storage.cassandra.tls.enabled }}
          - name: CQLSH_SSL
            value: "--ssl"
          {{- end }}
-        - name: MODE
-          value: {{ .Values.schema.mode | quote }}
          - name: DATACENTER
            value: {{ .Values.cassandra.config.dc_name | quote }}
-        - name: CASSANDRA_PORT
-          value: {{ .Values.storage.cassandra.port | quote }}
-        - name: CASSANDRA_USERNAME
-          value: {{ .Values.storage.cassandra.user }}
-        - name: CASSANDRA_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ if .Values.storage.cassandra.existingSecret }}{{ .Values.storage.cassandra.existingSecret }}{{- else }}{{ include "jaeger.fullname" . }}-cassandra{{- end }}
-              key: password
        {{- if .Values.storage.cassandra.keyspace }}
          - name: KEYSPACE
-          value: {{ .Values.storage.cassandra.keyspace | quote }}
-      {{- end }}
-      {{- if .Values.schema.traceTtl }}
-        - name: TRACE_TTL
-          value: {{ .Values.schema.traceTtl | quote }}
-      {{- end }}
-      {{- if .Values.schema.dependenciesTtl }}
-        - name: DEPENDENCIES_TTL
-          value: {{ .Values.schema.dependenciesTtl | quote }}
+            value: {{ .Values.storage.cassandra.keyspace }}
        {{- end }}
        resources:
-{{ toYaml .Values.schema.resources | indent 10 }}
+          {{- toYaml .Values.schema.resources | nindent 10 }}
        volumeMounts:
        {{- range .Values.schema.extraConfigmapMounts }}
          - name: {{ .name }}
@ -92,5 +91,19 @@ spec:
          configMap:
            name: {{ .configMap }}
      {{- end }}
+      {{- if .Values.storage.cassandra.tls.enabled }}
+        - name: {{ .Values.storage.cassandra.tls.secretName }}
+          secret:
+            secretName: {{ .Values.storage.cassandra.tls.secretName }}
+      {{- end }}
+    {{- with .Values.schema.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+    {{- end }}
+    {{- with .Values.schema.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+    {{- end }}
+{{- end -}}
 {{- end -}}
 {{- end -}}
--- a/charts/jaeger/templates/cassandra-schema-sa.yaml
+++ b/charts/jaeger/templates/cassandra-schema-sa.yaml
@ -6,4 +6,5 @@ metadata:
  labels:
    {{- include "jaeger.labels" . | nindent 4 }}
    app.kubernetes.io/component: cassandra-schema
+automountServiceAccountToken: {{ .Values.schema.serviceAccount.automountServiceAccountToken }}
 {{- end -}}
--- a/charts/jaeger/templates/collector-deploy.yaml
+++ b/charts/jaeger/templates/collector-deploy.yaml
@ -8,7 +8,7 @@ metadata:
    app.kubernetes.io/component: collector
 {{- if .Values.collector.annotations }}
  annotations:
-{{ toYaml .Values.collector.annotations | indent 4 }}
+    {{- toYaml .Values.collector.annotations | nindent 4 }}
 {{- end }}
 spec:
 {{- if not .Values.collector.autoscaling.enabled }}
@ -18,122 +18,127 @@ spec:
    matchLabels:
      {{- include "jaeger.selectorLabels" . | nindent 6 }}
      app.kubernetes.io/component: collector
-  strategy:
-    type: Recreate
  template:
    metadata:
      annotations:
        checksum/config-env: {{ include (print $.Template.BasePath "/collector-configmap.yaml") . | sha256sum }}
 {{- if .Values.collector.podAnnotations }}
-{{ toYaml .Values.collector.podAnnotations | indent 8 }}
+        {{- toYaml .Values.collector.podAnnotations | nindent 8 }}
 {{- end }}
      labels:
        {{- include "jaeger.selectorLabels" . | nindent 8 }}
        app.kubernetes.io/component: collector
 {{- if .Values.collector.podLabels }}
-{{ toYaml .Values.collector.podLabels | indent 8 }}
+        {{- toYaml .Values.collector.podLabels | nindent 8 }}
 {{- end }}
    spec:
+       {{- if .Values.provisionDataStore.elasticsearch }}
+      initContainers:
+        - name: elasticsearch-checker
+          image: {{ include "curl.image" . }}
+          command: 
+          - sh
+          - "-c"
+          - |
+            url="{{ include "elasticsearch.client.url" . }}"
+            until [ "$(curl -s -o /dev/null -w '%{http_code}' "$url/_cluster/health")" = "200" ]; do
+              echo "Waiting for Elasticsearch at $url"
+              sleep 5
+            done
+      {{- end}}
+      {{- with .Values.collector.priorityClassName }}
+      priorityClassName: {{ . }}
+      {{- end }}
      securityContext:
-{{ toYaml .Values.collector.podSecurityContext | indent 8 }}
+        {{- toYaml .Values.collector.podSecurityContext | nindent 8 }}
      serviceAccountName: {{ template "jaeger.collector.serviceAccountName" . }}
+      {{- include "collector.imagePullSecrets" . | nindent 6 }} 
+      {{- if .Values.collector.initContainers }}
+      initContainers:
+        {{- toYaml .Values.collector.initContainers | nindent 8 }}
+      {{- end}}
      containers:
      - name: {{ template "jaeger.collector.name" . }}
        securityContext:
-{{ toYaml .Values.collector.securityContext | indent 10 }}
-        image: {{ .Values.collector.image }}:{{ .Values.tag }}
-        imagePullPolicy: {{ .Values.collector.pullPolicy }}
-        env:
-          {{- range $key, $value := .Values.collector.cmdlineParams }}
-          - name: {{ $key | replace "." "_" | replace "-" "_" | upper | quote }}
-            value: {{ $value | quote }}
+          {{- toYaml .Values.collector.securityContext | nindent 10 }}
+        image: {{ include "collector.image" . }}
+        imagePullPolicy: {{ .Values.collector.image.pullPolicy }}
+        args:
+          {{ include "extra.cmdArgs" ( dict "cmdlineParams" .Values.collector.cmdlineParams ) | nindent 10  }}
+          {{- if not .Values.ingester.enabled -}}
+          {{- include "storage.cmdArgs" . | nindent 10 }}
+          {{- end }}
+        env:
+          {{- if .Values.collector.extraEnv }}
+            {{- toYaml .Values.collector.extraEnv | nindent 10 }}
+          {{- end }}
+          {{- if .Values.collector.service.zipkin }}
+          - name: COLLECTOR_ZIPKIN_HOST_PORT
+            value: {{ .Values.collector.service.zipkin.port | quote }}
+          {{- end }}
+          {{- if or .Values.collector.service.otlp.grpc .Values.collector.service.otlp.http }}
+          - name: COLLECTOR_OTLP_ENABLED
+            value: "true"
+          {{- if ne (default 4317 .Values.collector.service.otlp.grpc.port | toString ) "4317" }}
+          - name: COLLECTOR_OTLP_GRPC_HOST_PORT
+            value: {{ .Values.collector.service.otlp.grpc.port | quote }}
+          {{- end }}
+          {{- if ne (default 4318 .Values.collector.service.otlp.http.port | toString) "4318" }}
+          - name: COLLECTOR_OTLP_HTTP_HOST_PORT
+            value: {{ .Values.collector.service.otlp.http.port | quote }}
          {{- end }}
-          {{- if .Values.collector.service.zipkinPort }}
-          - name: COLLECTOR_ZIPKIN_HTTP_PORT
-            value: {{ .Values.collector.service.zipkinPort | quote }}
          {{- end }}
          {{- if .Values.ingester.enabled }}
          - name: SPAN_STORAGE_TYPE
            value: kafka
+          {{- range $key, $value := .Values.storage.kafka.env }}
+          - name: {{ $key | quote }}
+            value: {{ $value | quote }}
+          {{- end }}
+        {{- if .Values.storage.kafka.extraEnv }}
+          {{- toYaml .Values.storage.kafka.extraEnv | nindent 10 }}
+        {{- end }}
          - name: KAFKA_PRODUCER_BROKERS
-            value: {{ include "helm-toolkit.utils.joinListWithComma" .Values.storage.kafka.brokers }}
+            value: {{ tpl (include "helm-toolkit.utils.joinListWithComma" .Values.storage.kafka.brokers) . }}
          - name: KAFKA_PRODUCER_TOPIC
            value: {{ .Values.storage.kafka.topic }}
+          - name: KAFKA_PRODUCER_AUTHENTICATION
+            value: {{ .Values.storage.kafka.authentication }}
          {{ else }}
          - name: SPAN_STORAGE_TYPE
            value: {{ .Values.storage.type }}
-          {{- if eq .Values.storage.type "cassandra" }}
-          - name: CASSANDRA_SERVERS
-            value: {{ template "cassandra.host" . }}
-          - name: CASSANDRA_PORT
-            value: {{ .Values.storage.cassandra.port | quote }}
-          {{ if .Values.storage.cassandra.tls.enabled }}
-          - name: CASSANDRA_TLS
-            value: "true"
-          - name: CASSANDRA_TLS_SERVER_NAME
-            valueFrom:
-              secretKeyRef:
-                name: {{ .Values.storage.cassandra.tls.secretName }}
-                key: commonName
-          - name: CASSANDRA_TLS_KEY
-            value: "/cassandra-tls/client-key.pem"
-          - name: CASSANDRA_TLS_CERT
-            value: "/cassandra-tls/client-cert.pem"
-          - name: CASSANDRA_TLS_CA
-            value: "/cassandra-tls/ca-cert.pem"
-          {{- end }}
-          {{- if .Values.storage.cassandra.keyspace }}
-          - name: CASSANDRA_KEYSPACE
-            value: {{ .Values.storage.cassandra.keyspace }}
-          {{- end }}
-          - name: CASSANDRA_USERNAME
-            value: {{ .Values.storage.cassandra.user }}
-          - name: CASSANDRA_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: {{ if .Values.storage.cassandra.existingSecret }}{{ .Values.storage.cassandra.existingSecret }}{{- else }}{{ include "jaeger.fullname" . }}-cassandra{{- end }}
-                key: password
-          {{- end }}
-          {{- if eq .Values.storage.type "elasticsearch" }}
-          {{- if .Values.storage.elasticsearch.usePassword }}
-          - name: ES_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: {{ if .Values.storage.elasticsearch.existingSecret }}{{ .Values.storage.elasticsearch.existingSecret }}{{- else }}{{ include "jaeger.fullname" . }}-elasticsearch{{- end }}
-                key: password
-          {{- end }}
-          - name: ES_SERVER_URLS
-            value: {{ template "elasticsearch.client.url" . }}
-          - name: ES_USERNAME
-            value: {{ .Values.storage.elasticsearch.user }}
-          {{- if .Values.storage.elasticsearch.indexPrefix }}
-          - name: ES_INDEX_PREFIX
-            value: {{ .Values.storage.elasticsearch.indexPrefix }}
-          {{- end }}
-          {{- end }}
+          {{- include "storage.env" . | nindent 10 }}
          {{- end }}
          {{- if .Values.collector.samplingConfig}}
          - name: SAMPLING_STRATEGIES_FILE
            value: /etc/conf/strategies.json
          {{- end }}
+      {{- with .Values.collector.envFrom }}
+        envFrom: {{- toYaml . | nindent 10 }}
+      {{- end }}
        ports:
-        - containerPort: {{ .Values.collector.service.grpcPort }}
+        - containerPort: {{ .Values.collector.service.grpc.port }}
          name: grpc
          protocol: TCP
-        - containerPort: {{ .Values.collector.service.tchannelPort }}
-          name: tchannel
-          protocol: TCP
-        - containerPort: {{ .Values.collector.service.httpPort }}
+        - containerPort: {{ .Values.collector.service.http.port }}
          name: http
          protocol: TCP
        - containerPort: 14269
          name: admin
          protocol: TCP
-        {{- if .Values.collector.service.zipkinPort }}
-        - containerPort: {{ .Values.collector.service.zipkinPort }}
+        {{- if .Values.collector.service.zipkin }}
+        - containerPort: {{ .Values.collector.service.zipkin.port }}
          name: zipkin
          protocol: TCP
        {{- end }}
+        {{- if or .Values.collector.service.otlp.grpc .Values.collector.service.otlp.http }}
+        - containerPort: {{ default 4317 .Values.collector.service.otlp.grpc.port }}
+          name: {{ .Values.collector.service.otlp.grpc.name }}
+          protocol: TCP
+        - containerPort: {{ default 4318 .Values.collector.service.otlp.http.port }}
+          name: {{ .Values.collector.service.otlp.http.name }}
+          protocol: TCP
+        {{- end }}
        readinessProbe:
          httpGet:
            path: /
@ -143,7 +148,7 @@ spec:
            path: /
            port: admin
        resources:
-{{ toYaml .Values.collector.resources | indent 10 }}
+          {{- toYaml .Values.collector.resources | nindent 10 }}
        volumeMounts:
        {{- range .Values.collector.extraConfigmapMounts }}
          - name: {{ .name }}
@ -171,6 +176,12 @@ spec:
            subPath: "client-key.pem"
            readOnly: true
        {{- end }}
+        {{- if .Values.storage.elasticsearch.tls.enabled }}
+          - name: {{ .Values.storage.elasticsearch.tls.secretName }}
+            mountPath: {{ .Values.storage.elasticsearch.tls.mountPath }}
+            subPath: {{ .Values.storage.elasticsearch.tls.subPath }}
+            readOnly: true
+        {{- end }}
        {{- if .Values.collector.samplingConfig}}
          - name: strategies
            mountPath: /etc/conf/
@ -193,6 +204,16 @@ spec:
          configMap:
            name: {{ include "jaeger.fullname" . }}-sampling-strategies
      {{- end }}
+      {{- if .Values.storage.cassandra.tls.enabled }}
+        - name: {{ .Values.storage.cassandra.tls.secretName }}
+          secret:
+            secretName: {{ .Values.storage.cassandra.tls.secretName }}
+      {{- end }}
+      {{- if .Values.storage.elasticsearch.tls.enabled }}
+        - name: {{ .Values.storage.elasticsearch.tls.secretName }}
+          secret:
+            secretName: {{ .Values.storage.elasticsearch.tls.secretName }}
+       {{- end }}
    {{- with .Values.collector.nodeSelector }}
      nodeSelector:
        {{- toYaml . | nindent 8 }}
@ -201,6 +222,10 @@ spec:
      affinity:
        {{- toYaml . | nindent 8 }}
    {{- end }}
+    {{- with .Values.collector.topologySpreadConstraints }}
+      topologySpreadConstraints:
+      {{- toYaml . | nindent 8 }}
+    {{- end }}
    {{- with .Values.collector.tolerations }}
      tolerations:
        {{- toYaml . | nindent 8 }}
--- a/charts/jaeger/templates/collector-hpa.yaml
+++ b/charts/jaeger/templates/collector-hpa.yaml
@ -1,5 +1,5 @@
-{{- if .Values.collector.autoscaling.enabled }}
-apiVersion: autoscaling/v2beta1
+{{- if and .Values.collector.enabled .Values.collector.autoscaling.enabled }}
+apiVersion: {{ include "common.capabilities.hpa.apiVersion" ( dict "context" $ ) }}
 kind: HorizontalPodAutoscaler
 metadata:
  name: {{ template "jaeger.collector.name" . }}
@ -8,20 +8,36 @@ metadata:
    app.kubernetes.io/component: collector
 spec:
  scaleTargetRef:
-    apiVersion: apps/v1
+    apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
    kind: Deployment
    name: {{ template "jaeger.collector.name" . }}
  minReplicas: {{ .Values.collector.autoscaling.minReplicas }}
  maxReplicas: {{ .Values.collector.autoscaling.maxReplicas }}
  metrics:
-    - type: Resource
-      resource:
-        name: cpu
-        targetAverageUtilization: {{ .Values.collector.autoscaling.targetCPUUtilizationPercentage | default 80 }}
  {{- if .Values.collector.autoscaling.targetMemoryUtilizationPercentage }}
    - type: Resource
      resource:
        name: memory
+        {{- if eq "autoscaling/v2" (include "common.capabilities.hpa.apiVersion" ( dict "context" $ )) }}
+        target:
+          averageUtilization: {{ .Values.collector.autoscaling.targetMemoryUtilizationPercentage }}
+          type: Utilization
+        {{- else }}            
        targetAverageUtilization: {{ .Values.collector.autoscaling.targetMemoryUtilizationPercentage }}
        {{- end }} 
+  {{- end }}
+    - type: Resource
+      resource:
+        name: cpu
+        {{- if eq "autoscaling/v2" (include "common.capabilities.hpa.apiVersion" ( dict "context" $ )) }}        
+        target:
+          averageUtilization: {{ .Values.collector.autoscaling.targetCPUUtilizationPercentage | default 80 }}
+          type: Utilization
+        {{- else }}    
+        targetAverageUtilization: {{ .Values.collector.autoscaling.targetCPUUtilizationPercentage | default 80 }}
+        {{- end }}
+  {{- with .Values.collector.autoscaling.behavior }}
+  behavior:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}        
 {{- end }}
--- a/charts/jaeger/templates/collector-ing.yaml
+++ b/charts/jaeger/templates/collector-ing.yaml
@ -0,0 +1,38 @@
+{{- if .Values.collector.ingress.enabled -}}
+{{- $ingressSupportsIngressClassName := eq (include "common.ingress.supportsIngressClassname" .) "true" }}
+{{- $defaultServicePort := .Values.collector.service.http.port -}}
+{{- $basePath := .Values.collector.basePath -}}
+apiVersion: {{ include "common.capabilities.ingress.apiVersion" $ }}
+kind: Ingress
+metadata:
+  name: {{ template "jaeger.collector.name" . }}
+  labels:
+    {{- include "jaeger.labels" . | nindent 4 }}
+    {{- if .Values.collector.ingress.labels }}
+    {{- toYaml .Values.collector.ingress.labels | nindent 4 }}
+    {{- end }}
+    app.kubernetes.io/component: collector
+  {{- if .Values.collector.ingress.annotations }}
+  annotations:
+    {{- toYaml .Values.collector.ingress.annotations | nindent 4 }}
+    {{- end }}
+spec:
+  {{- if and $ingressSupportsIngressClassName .Values.collector.ingress.ingressClassName }}
+  ingressClassName: {{ .Values.collector.ingress.ingressClassName }}
+  {{- end }}
+  rules:
+    {{- range .Values.collector.ingress.hosts }}
+    - host: {{ include "jaeger.collector.ingressHost" . | quote }}
+      http:
+        paths:
+          - path: {{ $basePath }}
+            pathType: {{ default "ImplementationSpecific" $.Values.collector.ingress.pathType }}
+            {{- $servicePortString := (include "jaeger.collector.ingressServicePort" (dict "defaultServicePort" $defaultServicePort "context" .)) }}
+            {{- $servicePort := default $servicePortString ($servicePortString | float64) }}
+            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "jaeger.collector.name" $) "servicePort" $servicePort "context" $) | nindent 14 }}
+  {{- end -}}
+  {{- if .Values.collector.ingress.tls }}
+  tls:
+  {{- toYaml .Values.collector.ingress.tls | nindent 4 }}
+  {{- end -}}
+  {{- end -}}
--- a/charts/jaeger/templates/collector-networkpolicy-egress.yaml
+++ b/charts/jaeger/templates/collector-networkpolicy-egress.yaml
@ -0,0 +1,5 @@
+{{- if and .Values.networkPolicy.enabled .Values.collector.networkPolicy.enabled .Values.collector.networkPolicy.egressRules }}
+{{- $extraVals := dict "Name" (include "jaeger.collector.name" .) "Component" "collector" "ComponentValues" .Values.collector -}}
+{{- $npVals := merge $extraVals . -}}
+{{ include "jaeger.egress.networkPolicy" $npVals }}
+{{- end }}
--- a/charts/jaeger/templates/collector-networkpolicy-ingress.yaml
+++ b/charts/jaeger/templates/collector-networkpolicy-ingress.yaml
@ -0,0 +1,5 @@
+{{- if and .Values.networkPolicy.enabled .Values.collector.networkPolicy.enabled .Values.collector.networkPolicy.ingressRules -}}
+{{- $extraVals := dict "Name" (include "jaeger.collector.name" .) "Component" "collector" "ComponentValues" .Values.collector -}}
+{{- $npVals := merge $extraVals . -}}
+{{ include "jaeger.ingress.networkPolicy" $npVals }}
+{{- end -}}
--- a/charts/jaeger/templates/collector-sa.yaml
+++ b/charts/jaeger/templates/collector-sa.yaml
@ -6,4 +6,9 @@ metadata:
  labels:
    {{- include "jaeger.labels" . | nindent 4 }}
    app.kubernetes.io/component: collector
+  {{- with .Values.collector.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+automountServiceAccountToken: {{ .Values.collector.serviceAccount.automountServiceAccountToken }}
 {{- end -}}
--- a/charts/jaeger/templates/collector-servicemonitor.yaml
+++ b/charts/jaeger/templates/collector-servicemonitor.yaml
@ -0,0 +1,44 @@
+{{- if and (.Values.collector.enabled) (.Values.collector.serviceMonitor.enabled)}}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ template "jaeger.collector.name" . }}
+  {{- if .Values.collector.serviceMonitor.namespace }}
+  namespace: {{ .Values.collector.serviceMonitor.namespace }}
+  {{- end }}
+  labels:
+    {{- include "jaeger.labels" . | nindent 4 }}
+    app.kubernetes.io/component: collector
+    {{- if .Values.collector.serviceMonitor.additionalLabels }}
+    {{- toYaml .Values.collector.serviceMonitor.additionalLabels | nindent 4 }}
+    {{- end }}
+  {{- if .Values.collector.serviceMonitor.annotations }}
+  annotations:
+    {{- toYaml .Values.collector.serviceMonitor.annotations | nindent 4 }}
+  {{- end }}
+spec:
+  endpoints:
+    - port: admin
+      path: /metrics
+      {{- if .Values.collector.serviceMonitor.interval }}
+      interval: {{ .Values.collector.serviceMonitor.interval }}
+      {{- end }}
+      {{- if .Values.collector.serviceMonitor.scrapeTimeout }}
+      scrapeTimeout: {{ .Values.collector.serviceMonitor.scrapeTimeout }}
+      {{- end }}
+      {{- if .Values.collector.serviceMonitor.relabelings }}
+      relabelings:
+        {{- toYaml .Values.collector.serviceMonitor.relabelings | nindent 8 }}
+      {{- end }}
+      {{- if .Values.collector.serviceMonitor.metricRelabelings }}
+      metricRelabelings:
+        {{- toYaml .Values.collector.serviceMonitor.metricRelabelings | nindent 8 }}
+      {{- end }}
+  namespaceSelector:
+    matchNames:
+      - {{ .Release.Namespace }}
+  selector:
+    matchLabels:
+      app.kubernetes.io/component: collector
+      app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
--- a/charts/jaeger/templates/collector-svc.yaml
+++ b/charts/jaeger/templates/collector-svc.yaml
@ -8,31 +8,70 @@ metadata:
    app.kubernetes.io/component: collector
 {{- if .Values.collector.service.annotations }}
  annotations:
-{{ toYaml .Values.collector.service.annotations | indent 4 }}
+    {{- toYaml .Values.collector.service.annotations | nindent 4 }}
 {{- end }}
 spec:
  ports:
  - name: grpc
-    port: {{ .Values.collector.service.grpcPort }}
+    port: {{ .Values.collector.service.grpc.port }}
+{{- if and (eq .Values.collector.service.type "NodePort") (.Values.collector.service.grpc.nodePort) }}
+    nodePort: {{ .Values.collector.service.grpc.nodePort }}
+{{- end }}
    protocol: TCP
    targetPort: grpc
-  - name: tchannel
-    port: {{ .Values.collector.service.tchannelPort }}
-    protocol: TCP
-    targetPort: tchannel
+    {{- if semverCompare ">=1.20" .Capabilities.KubeVersion.Version }}
+    appProtocol: grpc
+    {{- end }}
  - name: http
-    port: {{ .Values.collector.service.httpPort }}
+    port: {{ .Values.collector.service.http.port }}
+{{- if and (eq .Values.collector.service.type "NodePort") (.Values.collector.service.http.nodePort) }}
+    nodePort: {{ .Values.collector.service.http.nodePort }}
+{{- end }}
    protocol: TCP
    targetPort: http
-{{- if .Values.collector.service.zipkinPort }}
+    {{- if semverCompare ">=1.20" .Capabilities.KubeVersion.Version }}
+    appProtocol: http
+    {{- end }}
+{{- if .Values.collector.service.zipkin }}
  - name: zipkin
-    port: {{ .Values.collector.service.zipkinPort }}
+    port: {{ .Values.collector.service.zipkin.port }}
+{{- if and (eq .Values.collector.service.type "NodePort") (.Values.collector.service.zipkin.nodePort) }}
+    nodePort: {{ .Values.collector.service.zipkin.nodePort }}
+{{- end }}
    protocol: TCP
    targetPort: zipkin
+    {{- if semverCompare ">=1.20" .Capabilities.KubeVersion.Version }}
+    appProtocol: http
    {{- end }}
+{{- end }}
+{{- if or .Values.collector.service.otlp.grpc .Values.collector.service.otlp.http }}
+  - name: {{ .Values.collector.service.otlp.grpc.name }}
+    port: {{ default 4317 .Values.collector.service.otlp.grpc.port }}
+{{- if and (eq .Values.collector.service.type "NodePort") (.Values.collector.service.otlp.grpc.nodePort) }}
+    nodePort: {{ .Values.collector.service.otlp.grpc.nodePort }}
+{{- end }}
+    protocol: TCP
+    targetPort: {{ .Values.collector.service.otlp.grpc.name }}
+  - name: {{ .Values.collector.service.otlp.http.name }}
+    port: {{ default 4318 .Values.collector.service.otlp.http.port }}
+{{- if and (eq .Values.collector.service.type "NodePort") (.Values.collector.service.otlp.http.nodePort) }}
+    nodePort: {{ .Values.collector.service.otlp.http.nodePort }}
+{{- end }}
+    protocol: TCP
+    targetPort: {{ .Values.collector.service.otlp.http.name }}
+{{- end }}
+  - name: {{ .Values.collector.service.admin.name }}
+    port: 14269
+    targetPort: {{ .Values.collector.service.admin.targetPort }}
  selector:
    {{- include "jaeger.selectorLabels" . | nindent 4 }}
    app.kubernetes.io/component: collector
+  {{- if and (eq .Values.collector.service.type "ClusterIP") .Values.collector.service.clusterIP }}
+  clusterIP: {{ .Values.collector.service.clusterIP }}
+  {{- end }}
  type: {{ .Values.collector.service.type }}
+  {{- if and (eq .Values.collector.service.type "LoadBalancer") .Values.collector.service.loadBalancerIP }}
+  loadBalancerIP: {{ .Values.collector.service.loadBalancerIP }}
+  {{- end -}}
 {{- template "loadBalancerSourceRanges" .Values.collector }}
 {{- end -}}
--- a/charts/jaeger/templates/elasticsearch-secret.yaml
+++ b/charts/jaeger/templates/elasticsearch-secret.yaml
@ -5,6 +5,11 @@ metadata:
  name: {{ include "jaeger.fullname" . }}-elasticsearch
  labels:
    {{- include "jaeger.labels" . | nindent 4 }}
+  annotations:
+    "helm.sh/hook": pre-install,pre-upgrade
+    "helm.sh/hook-weight": "-1"
+    "helm.sh/hook-delete-policy": before-hook-creation
+    "helm.sh/resource-policy": keep
 type: Opaque
 data:
  password: {{ .Values.storage.elasticsearch.password | b64enc | quote }}
--- a/charts/jaeger/templates/es-index-cleaner-cronjob.yaml
+++ b/charts/jaeger/templates/es-index-cleaner-cronjob.yaml
@ -0,0 +1,109 @@
+{{- if .Values.esIndexCleaner.enabled -}}
+apiVersion: {{ include "common.capabilities.cronjob.apiVersion" $ }}
+kind: CronJob
+metadata:
+  name: {{ include "jaeger.fullname" . }}-es-index-cleaner
+  labels:
+    {{- include "jaeger.labels" . | nindent 4 }}
+    app.kubernetes.io/component: es-index-cleaner
+{{- if .Values.esIndexCleaner.annotations }}
+  annotations:
+    {{- toYaml .Values.esIndexCleaner.annotations | nindent 4 }}
+{{- end }}
+spec:
+  concurrencyPolicy: {{ .Values.esIndexCleaner.concurrencyPolicy }}
+  schedule: {{ .Values.esIndexCleaner.schedule | quote }}
+  successfulJobsHistoryLimit: {{ .Values.esIndexCleaner.successfulJobsHistoryLimit }}
+  failedJobsHistoryLimit: {{ .Values.esIndexCleaner.failedJobsHistoryLimit }}
+  suspend: false
+  jobTemplate:
+    spec:
+      {{- if .Values.esIndexCleaner.activeDeadlineSeconds }}
+      activeDeadlineSeconds: {{ .Values.esIndexCleaner.activeDeadlineSeconds }}
+      {{- end }}
+      {{- if .Values.esIndexCleaner.ttlSecondsAfterFinished }}
+      ttlSecondsAfterFinished: {{ .Values.esIndexCleaner.ttlSecondsAfterFinished }}
+      {{- end }}
+      template:
+        metadata:
+          {{- if .Values.esIndexCleaner.podAnnotations }}
+          annotations:
+            {{- toYaml .Values.esIndexCleaner.podAnnotations | nindent 12 }}
+          {{- end }}
+          labels:
+            {{- include "jaeger.selectorLabels" . | nindent 12 }}
+            app.kubernetes.io/component: es-index-cleaner
+            {{- if .Values.esIndexCleaner.podLabels }}
+            {{- toYaml .Values.esIndexCleaner.podLabels | nindent 12 }}
+            {{- end }}
+        spec:
+          serviceAccountName: {{ template "jaeger.esIndexCleaner.serviceAccountName" . }}
+          {{- include "esIndexCleaner.imagePullSecrets" . | nindent 10 }}
+          securityContext:
+            {{- toYaml .Values.esIndexCleaner.podSecurityContext | nindent 12 }}
+          containers:
+          - name: {{ include "jaeger.fullname" . }}-es-index-cleaner
+            securityContext:
+              {{- toYaml .Values.esIndexCleaner.securityContext | nindent 14 }}
+            image: {{ include "esIndexCleaner.image" . }}
+            imagePullPolicy: {{ .Values.esIndexCleaner.image.pullPolicy }}
+            args:
+              - {{ .Values.esIndexCleaner.numberOfDays | quote }}
+              - {{ include "elasticsearch.client.url" . }}
+              {{ include "extra.cmdArgs" ( dict "cmdlineParams" .Values.esIndexCleaner.cmdlineParams ) | nindent 14  }}
+            env:
+            {{- if .Values.esIndexCleaner.extraEnv }}
+              {{- toYaml .Values.esIndexCleaner.extraEnv | nindent 14 }}
+            {{- end }}
+              {{ include "elasticsearch.env" . | nindent 14 }}
+            resources:
+              {{- toYaml .Values.esIndexCleaner.resources | nindent 14 }}
+            volumeMounts:
+            {{- range .Values.esIndexCleaner.extraConfigmapMounts }}
+              - name: {{ .name }}
+                mountPath: {{ .mountPath }}
+                subPath: {{ .subPath }}
+                readOnly: {{ .readOnly }}
+            {{- end }}
+            {{- range .Values.esIndexCleaner.extraSecretMounts }}
+              - name: {{ .name }}
+                mountPath: {{ .mountPath }}
+                subPath: {{ .subPath }}
+                readOnly: {{ .readOnly }}
+            {{- end }}
+            {{- if .Values.storage.elasticsearch.tls.enabled }}
+              - name: {{ .Values.storage.elasticsearch.tls.secretName }}
+                mountPath: {{ .Values.storage.elasticsearch.tls.mountPath }}
+                subPath: {{ .Values.storage.elasticsearch.tls.subPath }}
+                readOnly: true
+            {{- end }}
+          restartPolicy: OnFailure
+        {{- with .Values.esIndexCleaner.nodeSelector }}
+          nodeSelector:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+        {{- with .Values.esIndexCleaner.affinity }}
+          affinity:
+            {{- toYaml . | nindent 12 }}
+        {{- end }}
+        {{- with .Values.esIndexCleaner.tolerations }}
+          tolerations:
+            {{- toYaml . | nindent 12 }}
+        {{- end }}
+          volumes:
+          {{- range .Values.esIndexCleaner.extraConfigmapMounts }}
+            - name: {{ .name }}
+              configMap:
+                name: {{ .configMap }}
+          {{- end }}
+          {{- range .Values.esIndexCleaner.extraSecretMounts }}
+            - name: {{ .name }}
+              secret:
+                secretName: {{ .secretName }}
+        {{- end }}
+        {{- if .Values.storage.elasticsearch.tls.enabled }}
+            - name: {{ .Values.storage.elasticsearch.tls.secretName }}
+              secret:
+                secretName: {{ .Values.storage.elasticsearch.tls.secretName }}
+        {{- end }}
+{{- end -}}
--- a/charts/jaeger/templates/es-index-cleaner-sa.yaml
+++ b/charts/jaeger/templates/es-index-cleaner-sa.yaml
@ -0,0 +1,14 @@
+{{- if and .Values.esIndexCleaner.enabled .Values.esIndexCleaner.serviceAccount.create -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ template "jaeger.esIndexCleaner.serviceAccountName" . }}
+  labels:
+    {{- include "jaeger.labels" . | nindent 4 }}
+    app.kubernetes.io/component: es-index-cleaner
+  {{- with .Values.esIndexCleaner.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+automountServiceAccountToken: {{ .Values.esIndexCleaner.serviceAccount.automountServiceAccountToken }}
+{{- end -}}
--- a/charts/jaeger/templates/es-lookback-cronjob.yaml
+++ b/charts/jaeger/templates/es-lookback-cronjob.yaml
@ -0,0 +1,110 @@
+{{- if .Values.esLookback.enabled -}}
+apiVersion: {{ include "common.capabilities.cronjob.apiVersion" $ }}
+kind: CronJob
+metadata:
+  name: {{ include "jaeger.fullname" . }}-es-lookback
+  labels:
+    {{- include "jaeger.labels" . | nindent 4 }}
+    app.kubernetes.io/component: es-lookback
+{{- if .Values.esLookback.annotations }}
+  annotations:
+    {{- toYaml .Values.esLookback.annotations | nindent 4 }}
+{{- end }}
+spec:
+  concurrencyPolicy: {{ .Values.esLookback.concurrencyPolicy }}
+  schedule: {{ .Values.esLookback.schedule | quote }}
+  successfulJobsHistoryLimit: {{ .Values.esLookback.successfulJobsHistoryLimit }}
+  failedJobsHistoryLimit: {{ .Values.esLookback.failedJobsHistoryLimit }}
+  suspend: false
+  jobTemplate:
+    spec:
+      {{- if .Values.esLookback.activeDeadlineSeconds }}
+      activeDeadlineSeconds: {{ .Values.esLookback.activeDeadlineSeconds }}
+      {{- end }}
+      {{- if .Values.esLookback.ttlSecondsAfterFinished }}
+      ttlSecondsAfterFinished: {{ .Values.esLookback.ttlSecondsAfterFinished }}
+      {{- end }}
+      template:
+        metadata:
+          {{- if .Values.esLookback.podAnnotations }}
+          annotations:
+            {{- toYaml .Values.esLookback.podAnnotations | nindent 12 }}
+          {{- end }}
+          labels:
+            {{- include "jaeger.selectorLabels" . | nindent 12 }}
+            app.kubernetes.io/component: es-lookback
+            {{- if .Values.esLookback.podLabels }}
+            {{- toYaml .Values.esLookback.podLabels | nindent 12 }}
+            {{- end }}
+        spec:
+          serviceAccountName: {{ template "jaeger.esLookback.serviceAccountName" . }}
+          {{- include "esLookback.imagePullSecrets" . | nindent 10 }}  
+          securityContext:
+            {{- toYaml .Values.esLookback.podSecurityContext | nindent 12 }}
+          restartPolicy: OnFailure
+          {{- with .Values.esLookback.nodeSelector }}
+          nodeSelector:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with .Values.esLookback.affinity }}
+          affinity:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with .Values.esLookback.tolerations }}
+          tolerations:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+
+          containers:
+          - name: {{ include "jaeger.fullname" . }}-es-lookback
+            securityContext:
+              {{- toYaml .Values.esLookback.securityContext | nindent 14 }}
+            image: {{ include "esLookback.image" . }}
+            imagePullPolicy: {{ .Values.esLookback.image.pullPolicy }}
+            args:
+              - lookback
+              - {{ include "elasticsearch.client.url" . }}
+              {{ include "extra.cmdArgs" ( dict "cmdlineParams" .Values.esLookback.cmdlineParams ) | nindent 14  }}
+            env:
+              {{ include "elasticsearch.env" . | nindent 14 }}
+              {{- if .Values.esLookback.extraEnv }}
+                {{- toYaml .Values.esLookback.extraEnv | nindent 14 }}
+              {{- end }}
+            resources:
+              {{- toYaml .Values.esLookback.resources | nindent 14 }}
+            volumeMounts:
+            {{- range .Values.esLookback.extraConfigmapMounts }}
+              - name: {{ .name }}
+                mountPath: {{ .mountPath }}
+                subPath: {{ .subPath }}
+                readOnly: {{ .readOnly }}
+            {{- end }}
+            {{- range .Values.esLookback.extraSecretMounts }}
+              - name: {{ .name }}
+                mountPath: {{ .mountPath }}
+                subPath: {{ .subPath }}
+                readOnly: {{ .readOnly }}
+            {{- end }}
+            {{- if .Values.storage.elasticsearch.tls.enabled }}
+              - name: {{ .Values.storage.elasticsearch.tls.secretName }}
+                mountPath: {{ .Values.storage.elasticsearch.tls.mountPath }}
+                subPath: {{ .Values.storage.elasticsearch.tls.subPath }}
+                readOnly: true
+            {{- end }}
+          volumes:
+          {{- range .Values.esLookback.extraConfigmapMounts }}
+            - name: {{ .name }}
+              configMap:
+                name: {{ .configMap }}
+          {{- end }}
+          {{- range .Values.esLookback.extraSecretMounts }}
+            - name: {{ .name }}
+              secret:
+                secretName: {{ .secretName }}
+        {{- end }}
+        {{- if .Values.storage.elasticsearch.tls.enabled }}
+            - name: {{ .Values.storage.elasticsearch.tls.secretName }}
+              secret:
+                secretName: {{ .Values.storage.elasticsearch.tls.secretName }}
+        {{- end }}
+{{- end -}}
--- a/charts/jaeger/templates/es-lookback-sa.yaml
+++ b/charts/jaeger/templates/es-lookback-sa.yaml
@ -0,0 +1,14 @@
+{{- if and .Values.esLookback.enabled .Values.esLookback.serviceAccount.create -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ template "jaeger.esLookback.serviceAccountName" . }}
+  labels:
+    {{- include "jaeger.labels" . | nindent 4 }}
+    app.kubernetes.io/component: es-lookback
+  {{- with .Values.esLookback.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+automountServiceAccountToken: {{ .Values.esLookback.serviceAccount.automountServiceAccountToken }}
+{{- end -}}
--- a/charts/jaeger/templates/es-rollover-cronjob.yaml
+++ b/charts/jaeger/templates/es-rollover-cronjob.yaml
@ -0,0 +1,110 @@
+{{- if .Values.esRollover.enabled -}}
+apiVersion: {{ include "common.capabilities.cronjob.apiVersion" $ }}
+kind: CronJob
+metadata:
+  name: {{ include "jaeger.fullname" . }}-es-rollover
+  labels:
+    {{- include "jaeger.labels" . | nindent 4 }}
+    app.kubernetes.io/component: es-rollover
+{{- if .Values.esRollover.annotations }}
+  annotations:
+    {{- toYaml .Values.esRollover.annotations | nindent 4 }}
+{{- end }}
+spec:
+  concurrencyPolicy: {{ .Values.esRollover.concurrencyPolicy }}
+  schedule: {{ .Values.esRollover.schedule | quote }}
+  successfulJobsHistoryLimit: {{ .Values.esRollover.successfulJobsHistoryLimit }}
+  failedJobsHistoryLimit: {{ .Values.esRollover.failedJobsHistoryLimit }}
+  suspend: false
+  jobTemplate:
+    spec:
+      {{- if .Values.esRollover.activeDeadlineSeconds }}
+      activeDeadlineSeconds: {{ .Values.esRollover.activeDeadlineSeconds }}
+      {{- end }}
+      {{- if .Values.esRollover.ttlSecondsAfterFinished }}
+      ttlSecondsAfterFinished: {{ .Values.esRollover.ttlSecondsAfterFinished }}
+      {{- end }}
+      template:
+        metadata:
+          {{- if .Values.esRollover.podAnnotations }}
+          annotations:
+            {{- toYaml .Values.esRollover.podAnnotations | nindent 12 }}
+          {{- end }}
+          labels:
+            {{- include "jaeger.selectorLabels" . | nindent 12 }}
+            app.kubernetes.io/component: es-rollover
+            {{- if .Values.esRollover.podLabels }}
+            {{- toYaml .Values.esRollover.podLabels | nindent 12 }}
+            {{- end }}
+        spec:
+          serviceAccountName: {{ template "jaeger.esRollover.serviceAccountName" . }}
+          {{- include "esRollover.imagePullSecrets" . | nindent 10 }}
+          securityContext:
+            {{- toYaml .Values.esRollover.podSecurityContext | nindent 12 }}
+          restartPolicy: OnFailure
+          {{- with .Values.esRollover.nodeSelector }}
+          nodeSelector:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with .Values.esRollover.affinity }}
+          affinity:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with .Values.esRollover.tolerations }}
+          tolerations:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+
+          containers:
+          - name: {{ include "jaeger.fullname" . }}-es-rollover
+            securityContext:
+              {{- toYaml .Values.esRollover.securityContext | nindent 14 }}
+            image: {{ include "esRollover.image" . }}
+            imagePullPolicy: {{ .Values.esRollover.image.pullPolicy }}
+            args:
+              - rollover
+              - {{ include "elasticsearch.client.url" . }}
+              {{ include "extra.cmdArgs" ( dict "cmdlineParams" .Values.esRollover.cmdlineParams ) | nindent 14  }}
+            env:
+              {{ include "elasticsearch.env" . | nindent 14 }}
+              {{- if .Values.esRollover.extraEnv }}
+                {{- toYaml .Values.esRollover.extraEnv | nindent 14 }}
+              {{- end }}
+            resources:
+              {{- toYaml .Values.esRollover.resources | nindent 14 }}
+            volumeMounts:
+            {{- range .Values.esRollover.extraConfigmapMounts }}
+              - name: {{ .name }}
+                mountPath: {{ .mountPath }}
+                subPath: {{ .subPath }}
+                readOnly: {{ .readOnly }}
+            {{- end }}
+            {{- range .Values.esRollover.extraSecretMounts }}
+              - name: {{ .name }}
+                mountPath: {{ .mountPath }}
+                subPath: {{ .subPath }}
+                readOnly: {{ .readOnly }}
+            {{- end }}
+            {{- if .Values.storage.elasticsearch.tls.enabled }}
+              - name: {{ .Values.storage.elasticsearch.tls.secretName }}
+                mountPath: {{ .Values.storage.elasticsearch.tls.mountPath }}
+                subPath: {{ .Values.storage.elasticsearch.tls.subPath }}
+                readOnly: true
+            {{- end }}
+          volumes:
+          {{- range .Values.esRollover.extraConfigmapMounts }}
+            - name: {{ .name }}
+              configMap:
+                name: {{ .configMap }}
+          {{- end }}
+          {{- range .Values.esRollover.extraSecretMounts }}
+            - name: {{ .name }}
+              secret:
+                secretName: {{ .secretName }}
+        {{- end }}
+        {{- if .Values.storage.elasticsearch.tls.enabled }}
+            - name: {{ .Values.storage.elasticsearch.tls.secretName }}
+              secret:
+                secretName: {{ .Values.storage.elasticsearch.tls.secretName }}
+        {{- end }}
+{{- end -}}
--- a/charts/jaeger/templates/es-rollover-hook.yml
+++ b/charts/jaeger/templates/es-rollover-hook.yml
@ -0,0 +1,99 @@
+{{- if .Values.esRollover.enabled -}}
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: {{ include "jaeger.fullname" . }}-es-rollover-init
+  labels:
+    {{- include "jaeger.labels" . | nindent 4 }}
+    app.kubernetes.io/component: es-rollover-init
+  annotations:
+    "helm.sh/hook": pre-install,pre-upgrade
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+    {{- if .Values.esRollover.initHook.annotations }}
+      {{- toYaml .Values.esRollover.initHook.annotations | nindent 4 }}
+    {{- end }}
+spec:
+  {{- if .Values.esRollover.initHook.activeDeadlineSeconds }}
+  activeDeadlineSeconds: {{ .Values.esRollover.initHook.activeDeadlineSeconds }}
+  {{- end }}
+  {{- with .Values.esRollover.initHook.ttlSecondsAfterFinished }}
+  ttlSecondsAfterFinished: {{ . }}
+  {{- end }}
+
+  template:
+    metadata:
+      {{- with .Values.esRollover.initHook.podAnnotations }}
+      annotations: {{- toYaml . | nindent 8 }}
+      {{- end }}
+      labels:
+        {{- include "jaeger.selectorLabels" . | nindent 8 }}
+        app.kubernetes.io/component: es-rollover-init
+        {{- if .Values.esRollover.initHook.podLabels }}
+          {{- toYaml .Values.esRollover.initHook.podLabels | nindent 10 }}
+        {{- end }}
+    spec:
+      serviceAccountName: {{ template "jaeger.esRollover.serviceAccountName" . }}
+      {{- include "esRollover.imagePullSecrets" . | nindent 6 }}
+      securityContext: {{- toYaml .Values.esRollover.podSecurityContext | nindent 8 }}
+      restartPolicy: OnFailure
+      {{- with .Values.esRollover.nodeSelector }}
+      nodeSelector: {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.esRollover.affinity }}
+      affinity: {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.esRollover.tolerations }}
+      tolerations: {{- toYaml . | nindent 8 }}
+      {{- end }}
+
+      containers:
+        - name: {{ include "jaeger.fullname" . }}-es-rollover-init
+          securityContext: {{- toYaml .Values.esRollover.securityContext | nindent 12 }}
+          image: {{ include "esRollover.image" . }}
+          imagePullPolicy: {{ .Values.esRollover.image.pullPolicy }}
+          args:
+            - init
+            - {{ include "elasticsearch.client.url" . }}
+            {{ include "extra.cmdArgs" ( dict "cmdlineParams" .Values.esRollover.cmdlineParams ) | nindent 12  }}
+          env:
+            {{ include "elasticsearch.env" . | nindent 12 }}
+            {{- with .Values.esRollover.initHook.extraEnv }}
+              {{- toYaml . | nindent 12 }}
+            {{- end }}
+          resources: {{- toYaml .Values.esRollover.resources | nindent 12 }}
+          volumeMounts:
+          {{- range .Values.esRollover.extraConfigmapMounts }}
+            - name: {{ .name }}
+              mountPath: {{ .mountPath }}
+              subPath: {{ .subPath }}
+              readOnly: {{ .readOnly }}
+          {{- end }}
+          {{- range .Values.esRollover.extraSecretMounts }}
+            - name: {{ .name }}
+              mountPath: {{ .mountPath }}
+              subPath: {{ .subPath }}
+              readOnly: {{ .readOnly }}
+          {{- end }}
+          {{- if .Values.storage.elasticsearch.tls.enabled }}
+            - name: {{ .Values.storage.elasticsearch.tls.secretName }}
+              mountPath: {{ .Values.storage.elasticsearch.tls.mountPath }}
+              subPath: {{ .Values.storage.elasticsearch.tls.subPath }}
+              readOnly: true
+          {{- end }}
+      volumes:
+      {{- range .Values.esRollover.extraConfigmapMounts }}
+        - name: {{ .name }}
+          configMap:
+            name: {{ .configMap }}
+      {{- end }}
+      {{- range .Values.esRollover.extraSecretMounts }}
+        - name: {{ .name }}
+          secret:
+            secretName: {{ .secretName }}
+      {{- end }}
+      {{- if .Values.storage.elasticsearch.tls.enabled }}
+        - name: {{ .Values.storage.elasticsearch.tls.secretName }}
+          secret:
+            secretName: {{ .Values.storage.elasticsearch.tls.secretName }}
+      {{- end }}
+{{- end -}}
--- a/charts/jaeger/templates/es-rollover-sa.yaml
+++ b/charts/jaeger/templates/es-rollover-sa.yaml
@ -0,0 +1,15 @@
+{{- if and .Values.esRollover.enabled .Values.esRollover.serviceAccount.create -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ template "jaeger.esRollover.serviceAccountName" . }}
+  labels:
+    {{- include "jaeger.labels" . | nindent 4 }}
+    app.kubernetes.io/component: es-index-rollover
+  annotations:
+    "helm.sh/hook": pre-install,pre-upgrade
+    # Must be created before the rollover init hook
+    "helm.sh/hook-weight": "-10"
+    "helm.sh/hook-delete-policy": before-hook-creation
+automountServiceAccountToken: {{ .Values.esRollover.serviceAccount.automountServiceAccountToken }}
+{{- end -}}
--- a/charts/jaeger/templates/extra-list.yaml
+++ b/charts/jaeger/templates/extra-list.yaml
@ -0,0 +1,4 @@
+{{- range .Values.extraObjects }}
+---
+{{ tpl (. | toYaml) $ }}
+{{- end }}
--- a/charts/jaeger/templates/hotrod-deploy.yaml
+++ b/charts/jaeger/templates/hotrod-deploy.yaml
@ -19,19 +19,28 @@ spec:
        app.kubernetes.io/component: hotrod
    spec:
      securityContext:
-{{ toYaml .Values.hotrod.podSecurityContext | indent 8 }}
+        {{- toYaml .Values.hotrod.podSecurityContext | nindent 8 }}
      serviceAccountName: {{ template "jaeger.hotrod.serviceAccountName" . }}
+      {{- include "hotrod.imagePullSecrets" . | nindent 6 }}  
      containers:
        - name: {{ include "jaeger.fullname" . }}-hotrod
          securityContext:
-{{ toYaml .Values.hotrod.securityContext | indent 12 }}
-          image: {{ .Values.hotrod.image.repository }}:{{ .Values.tag }}
+            {{- toYaml .Values.hotrod.securityContext | nindent 12 }}
+          image: {{ include "hotrod.image" . }}
          imagePullPolicy: {{ .Values.hotrod.image.pullPolicy }}
+          args:
+            {{- toYaml .Values.hotrod.args | nindent 12 }}
+          {{- with .Values.hotrod.extraArgs }}
+            {{- toYaml . | nindent 12 }}
+          {{-  end }}
          env:
            - name: JAEGER_AGENT_HOST
              value: {{ template "jaeger.hotrod.tracing.host" . }}
            - name: JAEGER_AGENT_PORT
              value: {{ .Values.hotrod.tracing.port | quote }}
+          {{- if .Values.hotrod.extraEnv }}
+            {{- toYaml .Values.hotrod.extraEnv | nindent 12 }}
+          {{- end }}
          ports:
            - name: http
              containerPort: 8080
@ -45,7 +54,7 @@ spec:
              path: /
              port: http
          resources:
-{{ toYaml .Values.hotrod.resources | indent 12 }}
+            {{- toYaml .Values.hotrod.resources | nindent 12 }}
    {{- with .Values.hotrod.nodeSelector }}
      nodeSelector:
        {{- toYaml . | nindent 8 }}
--- a/charts/jaeger/templates/hotrod-ing.yaml
+++ b/charts/jaeger/templates/hotrod-ing.yaml
@ -1,8 +1,9 @@
 {{- if .Values.hotrod.enabled -}}
  {{- if .Values.hotrod.ingress.enabled -}}
+  {{- $ingressSupportsIngressClassName := eq (include "common.ingress.supportsIngressClassname" .) "true" }}
  {{- $serviceName := include "jaeger.fullname" . -}}
  {{- $servicePort := .Values.hotrod.service.port -}}
-apiVersion: extensions/v1beta1
+apiVersion: {{ include "common.capabilities.ingress.apiVersion" $ }}
 kind: Ingress
 metadata:
  name: {{ include "jaeger.fullname" . }}-hotrod
@ -11,22 +12,24 @@ metadata:
    app.kubernetes.io/component: hotrod
  {{- if .Values.hotrod.ingress.annotations }}
  annotations:
-{{ toYaml .Values.hotrod.ingress.annotations | indent 4 }}
+    {{- toYaml .Values.hotrod.ingress.annotations | nindent 4 }}
    {{- end }}
 spec:
+  {{- if and $ingressSupportsIngressClassName .Values.hotrod.ingress.ingressClassName }}
+  ingressClassName: {{ .Values.hotrod.ingress.ingressClassName }}
+  {{- end }}
  rules:
    {{- range $host := .Values.hotrod.ingress.hosts }}
-    - host: {{ $host }}
+    - host: {{ $host | quote}}
      http:
        paths:
          - path: /
-            backend:
-              serviceName: {{ $serviceName }}-hotrod
-              servicePort: {{ $servicePort }}
+            pathType: {{ default "ImplementationSpecific" $.Values.hotrod.ingress.pathType }}
+            backend: {{- include "common.ingress.backend" (dict "serviceName" (printf "%s-hotrod" $serviceName) "servicePort" $servicePort "context" $) | nindent 14 }}
  {{- end -}}
  {{- if .Values.hotrod.ingress.tls }}
  tls:
-{{ toYaml .Values.hotrod.ingress.tls | indent 4 }}
+  {{- toYaml .Values.hotrod.ingress.tls | nindent 4 }}
  {{- end -}}
  {{- end -}}
  {{- end -}}
--- a/charts/jaeger/templates/hotrod-sa.yaml
+++ b/charts/jaeger/templates/hotrod-sa.yaml
@ -6,4 +6,9 @@ metadata:
  labels:
    {{- include "jaeger.labels" . | nindent 4 }}
    app.kubernetes.io/component: hotrod
+  {{- with .Values.hotrod.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+automountServiceAccountToken: {{ .Values.hotrod.serviceAccount.automountServiceAccountToken }}
 {{- end -}}
--- a/charts/jaeger/templates/hotrod-svc.yaml
+++ b/charts/jaeger/templates/hotrod-svc.yaml
@ -8,7 +8,7 @@ metadata:
    app.kubernetes.io/component: hotrod
 {{- if .Values.hotrod.service.annotations }}
  annotations:
-{{ toYaml .Values.hotrod.service.annotations | indent 4 }}
+    {{- toYaml .Values.hotrod.service.annotations | nindent 4 }}
 {{- end }}
 spec:
  type: {{ .Values.hotrod.service.type }}
--- a/charts/jaeger/templates/ingester-deploy.yaml
+++ b/charts/jaeger/templates/ingester-deploy.yaml
@ -8,7 +8,7 @@ metadata:
    app.kubernetes.io/component: ingester
 {{- if .Values.ingester.annotations }}
  annotations:
-{{ toYaml .Values.ingester.annotations | indent 4 }}
+    {{- toYaml .Values.ingester.annotations | nindent 4 }}
 {{- end }}
 spec:
 {{- if not .Values.ingester.autoscaling.enabled }}
@ -18,92 +18,73 @@ spec:
    matchLabels:
      {{- include "jaeger.selectorLabels" . | nindent 6 }}
      app.kubernetes.io/component: ingester
-  strategy:
-    type: Recreate
  template:
    metadata:
      annotations:
 {{- if .Values.ingester.podAnnotations }}
-{{ toYaml .Values.ingester.podAnnotations | indent 8 }}
+        {{- toYaml .Values.ingester.podAnnotations | nindent 8 }}
 {{- end }}
      labels:
        {{- include "jaeger.selectorLabels" . | nindent 8 }}
        app.kubernetes.io/component: ingester
 {{- if .Values.ingester.podLabels }}
-{{ toYaml .Values.ingester.podLabels | indent 8 }}
+        {{- toYaml .Values.ingester.podLabels | nindent 8 }}
 {{- end }}
    spec:
+      serviceAccountName: {{ include "jaeger.ingester.serviceAccountName" . }}
      securityContext:
-{{ toYaml .Values.ingester.podSecurityContext | indent 8 }}
+        {{- toYaml .Values.ingester.podSecurityContext | nindent 8 }}
+      {{- include "ingester.imagePullSecrets" . | nindent 6 }}
+      {{- with .Values.ingester.nodeSelector }}
      nodeSelector:
-{{ toYaml .Values.ingester.nodeSelector | indent 8 }}
-{{- if .Values.ingester.tolerations }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.ingester.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.ingester.topologySpreadConstraints }}
+        topologySpreadConstraints:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.ingester.tolerations }}
      tolerations:
-{{ toYaml .Values.ingester.tolerations | indent 8 }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- if .Values.ingester.initContainers }}
+      initContainers:
+      {{- toYaml .Values.ingester.initContainers | nindent 8 }}
      {{- end}}
      containers:
      - name: {{ include "jaeger.fullname" . }}-ingester
        securityContext:
-{{ toYaml .Values.ingester.securityContext | indent 10 }}
-        image: {{ .Values.ingester.image }}:{{ .Values.tag }}
-        imagePullPolicy: {{ .Values.ingester.pullPolicy }}
+          {{- toYaml .Values.ingester.securityContext | nindent 10 }}
+        image: {{ include "ingester.image" . }}
+        imagePullPolicy: {{ .Values.ingester.image.pullPolicy }}
+        args:
+          {{ include "extra.cmdArgs" ( dict "cmdlineParams" .Values.ingester.cmdlineParams ) | nindent 10  }}
+          {{- include "storage.cmdArgs" . | nindent 10 }}
        env:
-          {{- range $key, $value := .Values.ingester.cmdlineParams }}
-          - name: {{ $key | replace "." "_" | replace "-" "_" | upper | quote }}
-            value: {{ $value | quote }}
+        {{- if .Values.ingester.extraEnv }}
+          {{- toYaml .Values.ingester.extraEnv | nindent 10 }}
        {{- end }}
          - name: SPAN_STORAGE_TYPE
            value: {{ .Values.storage.type }}
+          {{- include "storage.env" . | nindent 10 }}
+          {{ if .Values.storage.kafka.brokers }}
          - name: KAFKA_CONSUMER_BROKERS
-            value: {{ include "helm-toolkit.utils.joinListWithComma" .Values.storage.kafka.brokers }}
+            value: {{ tpl (include "helm-toolkit.utils.joinListWithComma" .Values.storage.kafka.brokers) . }}
+          {{- end }}
+          {{ if .Values.storage.kafka.topic }}
          - name: KAFKA_CONSUMER_TOPIC
            value: {{ .Values.storage.kafka.topic }}
-          {{- if eq .Values.storage.type "cassandra" }}
-          - name: CASSANDRA_SERVERS
-            value: {{ .Values.storage.cassandra.host | quote }}
-          - name: CASSANDRA_PORT
-            value: {{ .Values.storage.cassandra.port | quote }}
-          {{ if .Values.storage.cassandra.tls.enabled }}
-          - name: CASSANDRA_TLS
-            value: "true"
-          - name: CASSANDRA_TLS_SERVER_NAME
-            valueFrom:
-              secretKeyRef:
-                name: {{ .Values.storage.cassandra.tls.secretName }}
-                key: commonName
-          - name: CASSANDRA_TLS_KEY
-            value: "/cassandra-tls/client-key.pem"
-          - name: CASSANDRA_TLS_CERT
-            value: "/cassandra-tls/client-cert.pem"
-          - name: CASSANDRA_TLS_CA
-            value: "/cassandra-tls/ca-cert.pem"
          {{- end }}
-          - name: CASSANDRA_KEYSPACE
-            value: {{ .Values.storage.cassandra.keyspace | quote }}
-          - name: CASSANDRA_USERNAME
-            value: {{ .Values.storage.cassandra.user }}
-          - name: CASSANDRA_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: {{ if .Values.storage.cassandra.existingSecret }}{{ .Values.storage.cassandra.existingSecret }}{{- else }}{{ include "jaeger.fullname" . }}-cassandra{{- end }}
-                key: password
-          {{- end }}
-          {{- if eq .Values.storage.type "elasticsearch" }}
-          {{- if .Values.storage.elasticsearch.usePassword }}
-          - name: ES_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: {{ if .Values.storage.elasticsearch.existingSecret }}{{ .Values.storage.elasticsearch.existingSecret }}{{- else }}{{ include "jaeger.fullname" . }}-elasticsearch{{- end }}
-                key: password
-          {{- end }}
-          - name: ES_SERVER_URLS
-            value: {{ template "elasticsearch.client.url" . }}
-          - name: ES_USERNAME
-            value: {{ .Values.storage.elasticsearch.user }}
-          {{- if .Values.storage.elasticsearch.indexPrefix }}
-          - name: ES_INDEX_PREFIX
-            value: {{ .Values.storage.elasticsearch.indexPrefix }}
+          {{ if .Values.storage.kafka.authentication }}
+          - name: KAFKA_CONSUMER_AUTHENTICATION
+            value: {{ .Values.storage.kafka.authentication }}
          {{- end }}
+      {{- with .Values.ingester.envFrom }}
+        envFrom: {{- toYaml . | nindent 10 }}
      {{- end }}
        ports:
        - containerPort: 14270
@ -118,7 +99,7 @@ spec:
            path: /
            port: admin
        resources:
-{{ toYaml .Values.ingester.resources | indent 10 }}
+          {{- toYaml .Values.ingester.resources | nindent 10 }}
        volumeMounts:
        {{- range .Values.ingester.extraConfigmapMounts }}
          - name: {{ .name }}
@ -159,4 +140,9 @@ spec:
          secret:
            secretName: {{ .secretName }}
      {{- end }}
+      {{- if .Values.storage.cassandra.tls.enabled }}
+        - name: {{ .Values.storage.cassandra.tls.secretName }}
+          secret:
+            secretName: {{ .Values.storage.cassandra.tls.secretName }}
+      {{- end }}
 {{- end -}}
--- a/charts/jaeger/templates/ingester-hpa.yaml
+++ b/charts/jaeger/templates/ingester-hpa.yaml
@ -1,5 +1,5 @@
-{{- if .Values.ingester.autoscaling.enabled }}
-apiVersion: autoscaling/v2beta1
+{{- if and .Values.ingester.enabled .Values.ingester.autoscaling.enabled }}
+apiVersion: {{ include "common.capabilities.hpa.apiVersion" ( dict "context" $ ) }}
 kind: HorizontalPodAutoscaler
 metadata:
  name: {{ template "jaeger.ingester.name" . }}
@ -8,20 +8,36 @@ metadata:
    app.kubernetes.io/component: ingester
 spec:
  scaleTargetRef:
-    apiVersion: apps/v1
+    apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
    kind: Deployment
    name: {{ template "jaeger.ingester.name" . }}
  minReplicas: {{ .Values.ingester.autoscaling.minReplicas }}
  maxReplicas: {{ .Values.ingester.autoscaling.maxReplicas }}
  metrics:
-    - type: Resource
-      resource:
-        name: cpu
-        targetAverageUtilization: {{ .Values.ingester.autoscaling.targetCPUUtilizationPercentage | default 80 }}
  {{- if .Values.ingester.autoscaling.targetMemoryUtilizationPercentage }}
    - type: Resource
      resource:
        name: memory
+        {{- if eq "autoscaling/v2" (include "common.capabilities.hpa.apiVersion" ( dict "context" $ )) }}
+        target:
+          averageUtilization: {{ .Values.ingester.autoscaling.targetMemoryUtilizationPercentage }}
+          type: Utilization
+        {{- else }}            
        targetAverageUtilization: {{ .Values.ingester.autoscaling.targetMemoryUtilizationPercentage }}
        {{- end }} 
+  {{- end }}
+    - type: Resource
+      resource:
+        name: cpu
+        {{- if eq "autoscaling/v2" (include "common.capabilities.hpa.apiVersion" ( dict "context" $ )) }}        
+        target:
+          averageUtilization: {{ .Values.ingester.autoscaling.targetCPUUtilizationPercentage | default 80 }}
+          type: Utilization
+        {{- else }}    
+        targetAverageUtilization: {{ .Values.ingester.autoscaling.targetCPUUtilizationPercentage | default 80 }}
+        {{- end }}
+  {{- with .Values.ingester.autoscaling.behavior }}
+  behavior:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}   
 {{- end }}
--- a/charts/jaeger/templates/ingester-sa.yaml
+++ b/charts/jaeger/templates/ingester-sa.yaml
@ -6,4 +6,9 @@ metadata:
  labels:
    {{- include "jaeger.labels" . | nindent 4 }}
    app.kubernetes.io/component: ingester
+  {{- with .Values.ingester.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+automountServiceAccountToken: {{ .Values.ingester.serviceAccount.automountServiceAccountToken }}
 {{- end -}}
--- a/charts/jaeger/templates/ingester-servicemonitor.yaml
+++ b/charts/jaeger/templates/ingester-servicemonitor.yaml
@ -0,0 +1,44 @@
+{{- if and (.Values.ingester.enabled) (.Values.ingester.serviceMonitor.enabled)}}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ template "jaeger.ingester.name" . }}
+  {{- if .Values.ingester.serviceMonitor.namespace }}
+  namespace: {{ .Values.ingester.serviceMonitor.namespace }}
+  {{- end }}
+  labels:
+    {{- include "jaeger.labels" . | nindent 4 }}
+    app.kubernetes.io/component: ingester
+    {{- if .Values.ingester.serviceMonitor.additionalLabels }}
+    {{- toYaml .Values.ingester.serviceMonitor.additionalLabels | nindent 4 }}
+    {{- end }}
+  {{- if .Values.ingester.serviceMonitor.annotations }}
+  annotations:
+    {{- toYaml .Values.ingester.serviceMonitor.annotations | nindent 4 }}
+  {{- end }}
+spec:
+  endpoints:
+    - port: admin
+      path: /metrics
+      {{- if .Values.ingester.serviceMonitor.interval }}
+      interval: {{ .Values.ingester.serviceMonitor.interval }}
+      {{- end }}
+      {{- if .Values.ingester.serviceMonitor.scrapeTimeout }}
+      scrapeTimeout: {{ .Values.ingester.serviceMonitor.scrapeTimeout }}
+      {{- end }}
+      {{- if .Values.ingester.serviceMonitor.relabelings }}
+      relabelings:
+        {{- toYaml .Values.ingester.serviceMonitor.relabelings | nindent 8 }}
+      {{- end }}
+      {{- if .Values.ingester.serviceMonitor.metricRelabelings }}
+      metricRelabelings:
+        {{- toYaml .Values.ingester.serviceMonitor.metricRelabelings | nindent 8 }}
+      {{- end }}
+  namespaceSelector:
+    matchNames:
+      - {{ .Release.Namespace }}
+  selector:
+    matchLabels:
+      app.kubernetes.io/component: ingester
+      app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
--- a/charts/jaeger/templates/ingester-svc.yaml
+++ b/charts/jaeger/templates/ingester-svc.yaml
@ -0,0 +1,23 @@
+{{- if .Values.ingester.enabled -}}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ template "jaeger.ingester.name" . }}
+  labels:
+    {{- include "jaeger.labels" . | nindent 4 }}
+    app.kubernetes.io/component: ingester
+{{- if .Values.ingester.service.annotations }}
+  annotations:
+    {{- toYaml .Values.ingester.service.annotations | nindent 4 }}
+{{- end }}
+spec:
+  ports:
+  - name: admin
+    port: 14270
+    targetPort: admin
+  selector:
+    {{- include "jaeger.selectorLabels" . | nindent 4 }}
+    app.kubernetes.io/component: ingester
+  type: {{ .Values.ingester.service.type }}
+{{- template "loadBalancerSourceRanges" .Values.ingester }}
+{{- end -}}
--- a/charts/jaeger/templates/oauth-sidecar-configmap.yaml
+++ b/charts/jaeger/templates/oauth-sidecar-configmap.yaml
@ -0,0 +1,12 @@
+{{- if and .Values.query.oAuthSidecar.enabled .Values.query.oAuthSidecar.config}}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "jaeger.fullname" . }}-oauth-configuration
+  labels:
+    {{- include "jaeger.labels" . | nindent 4 }}
+    app.kubernetes.io/component: query
+data:
+  oauth2-proxy.cfg: |-
+{{ tpl .Values.query.oAuthSidecar.config . | indent 4 }}
+{{- end }}
--- a/charts/jaeger/templates/query-configmap.yaml
+++ b/charts/jaeger/templates/query-configmap.yaml
@ -0,0 +1,12 @@
+{{- if .Values.query.config }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "jaeger.fullname" . }}-ui-configuration
+  labels:
+    {{- include "jaeger.labels" . | nindent 4 }}
+    app.kubernetes.io/component: query
+data:
+  query-ui-config.json: |-
+{{ tpl .Values.query.config . | indent 4 }}
+{{- end }}
--- a/charts/jaeger/templates/query-deploy.yaml
+++ b/charts/jaeger/templates/query-deploy.yaml
@ -8,7 +8,7 @@ metadata:
    app.kubernetes.io/component: query
 {{- if .Values.query.annotations }}
  annotations:
-{{ toYaml .Values.query.annotations | indent 4 }}
+    {{- toYaml .Values.query.annotations | nindent 4 }}
 {{- end }}
 spec:
  replicas: {{ .Values.query.replicaCount }}
@ -16,102 +16,101 @@ spec:
    matchLabels:
      {{- include "jaeger.selectorLabels" . | nindent 6 }}
      app.kubernetes.io/component: query
-  strategy:
-    type: Recreate
  template:
    metadata:
-{{- if .Values.query.podAnnotations }}
+{{- if or .Values.query.config .Values.query.podAnnotations }}
      annotations:
-{{ toYaml .Values.query.podAnnotations | indent 8 }}
+      {{- if .Values.query.config }}
+        checksum/ui-config: {{ include (print $.Template.BasePath "/query-configmap.yaml") . | sha256sum }}
+      {{- end }}
+      {{- if and .Values.query.oAuthSidecar.enabled .Values.query.oAuthSidecar.config }}
+        checksum/oauth2-config: {{ sha256sum .Values.query.oAuthSidecar.config }}
+      {{- end }}
+      {{- if .Values.query.podAnnotations }}
+        {{- toYaml .Values.query.podAnnotations | nindent 8 }}
+      {{- end }}
 {{- end }}
      labels:
        {{- include "jaeger.selectorLabels" . | nindent 8 }}
        app.kubernetes.io/component: query
 {{- if .Values.query.podLabels }}
-{{ toYaml .Values.query.podLabels | indent 8 }}
+        {{- toYaml .Values.query.podLabels | nindent 8 }}
 {{- end }}
    spec:
+      {{- with .Values.query.priorityClassName }}
+      priorityClassName: {{ . }}
+      {{- end }}
      securityContext:
-{{ toYaml .Values.query.podSecurityContext | indent 8 }}
+        {{- toYaml .Values.query.podSecurityContext | nindent 8 }}
      serviceAccountName: {{ template "jaeger.query.serviceAccountName" . }}
+      {{- include "query.imagePullSecrets" . | nindent 6 }}
+      {{- if or .Values.query.initContainers .Values.provisionDataStore.elasticsearch }}
+      initContainers:
+       {{- if .Values.query.initContainers }}
+        {{- toYaml .Values.query.initContainers | nindent 8 }}
+        {{- end }}
+        {{- if .Values.provisionDataStore.elasticsearch }}
+        - name: elasticsearch-checker
+          image: {{ include "curl.image" . }}
+          command: 
+          - sh
+          - "-c"
+          - |
+            url="{{ include "elasticsearch.client.url" . }}"
+            until [ "$(curl -s -o /dev/null -w '%{http_code}' "$url/_cluster/health")" = "200" ]; do
+              echo "waiting for Elasticsearch at $url"
+              sleep 5
+            done
+        {{- end }}
+      {{- end }}  
      containers:
      - name: {{ template "jaeger.query.name" . }}
        securityContext:
-{{ toYaml .Values.query.securityContext | indent 10 }}
-        image: {{ .Values.query.image }}:{{ .Values.tag }}
-        imagePullPolicy: {{ .Values.query.pullPolicy }}
+          {{- toYaml .Values.query.securityContext | nindent 10 }}
+        image: {{ include "query.image" . }}
+        imagePullPolicy: {{ .Values.query.image.pullPolicy }}
+        args:
+          {{ include "extra.cmdArgs" ( dict "cmdlineParams" .Values.query.cmdlineParams ) | nindent 10  }}
+          {{- include "storage.cmdArgs" . | nindent 10 }}
        env:
-          {{- range $key, $value := .Values.query.cmdlineParams }}
-          - name: {{ $key | replace "." "_" | replace "-" "_" | upper | quote }}
-            value: {{ $value | quote }}
+        {{- if .Values.query.extraEnv }}
+          {{- toYaml .Values.query.extraEnv | nindent 10 }}
        {{- end }}
          - name: SPAN_STORAGE_TYPE
            value: {{ .Values.storage.type }}
-          {{- if eq .Values.storage.type "cassandra" }}
-          - name: CASSANDRA_SERVERS
-            value: {{ template "cassandra.host" . }}
-          - name: CASSANDRA_PORT
-            value: {{ .Values.storage.cassandra.port | quote }}
-          {{ if .Values.storage.cassandra.tls.enabled }}
-          - name: CASSANDRA_TLS
-            value: "true"
-          - name: CASSANDRA_TLS_SERVER_NAME
-            valueFrom:
-              secretKeyRef:
-                name: {{ .Values.storage.cassandra.tls.secretName }}
-                key: commonName
-          - name: CASSANDRA_TLS_KEY
-            value: "/cassandra-tls/client-key.pem"
-          - name: CASSANDRA_TLS_CERT
-            value: "/cassandra-tls/client-cert.pem"
-          - name: CASSANDRA_TLS_CA
-            value: "/cassandra-tls/ca-cert.pem"
-          {{- end }}
-          {{- if .Values.storage.cassandra.keyspace }}
-          - name: CASSANDRA_KEYSPACE
-            value: {{ .Values.storage.cassandra.keyspace | quote }}
-          {{- end }}
-          - name: CASSANDRA_USERNAME
-            value: {{ .Values.storage.cassandra.user }}
-          - name: CASSANDRA_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: {{ if .Values.storage.cassandra.existingSecret }}{{ .Values.storage.cassandra.existingSecret }}{{- else }}{{ include "jaeger.fullname" . }}-cassandra{{- end }}
-                key: password
-          {{- end }}
-          {{- if eq .Values.storage.type "elasticsearch" }}
-          {{- if .Values.storage.elasticsearch.usePassword }}
-          - name: ES_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: {{ if .Values.storage.elasticsearch.existingSecret }}{{ .Values.storage.elasticsearch.existingSecret }}{{- else }}{{ include "jaeger.fullname" . }}-elasticsearch{{- end }}
-                key: password
-          {{- end }}
-          - name: ES_SERVER_URLS
-            value: {{ template "elasticsearch.client.url" . }}
-          - name: ES_USERNAME
-            value: {{ .Values.storage.elasticsearch.user }}
-          {{- if .Values.storage.elasticsearch.indexPrefix }}
-          - name: ES_INDEX_PREFIX
-            value: {{ .Values.storage.elasticsearch.indexPrefix }}
-          {{- end }}
-          {{- end }}
+          {{- include "storage.env" . | nindent 10 }}
          {{- if .Values.query.basePath }}
          - name: QUERY_BASE_PATH
            value: {{ .Values.query.basePath | quote }}
          {{- end }}
          - name: JAEGER_AGENT_PORT
            value: "6831"
+          {{- if .Values.query.config}}
+          - name: QUERY_UI_CONFIG
+            value: /etc/conf/query-ui-config.json
+          {{- end }}
+      {{- with .Values.query.envFrom }}
+        envFrom: {{- toYaml . | nindent 10 }}
+      {{- end }}
        ports:
        - name: query
          containerPort: 16686
          protocol: TCP
+        - name: grpc
+          containerPort: 16685
+          protocol: TCP
        - name: admin
          containerPort: 16687
          protocol: TCP
        resources:
-{{ toYaml .Values.query.resources | indent 10 }}
+          {{- toYaml .Values.query.resources | nindent 10 }}
        volumeMounts:
+        {{- range .Values.query.extraSecretMounts }}
+          - name: {{ .name }}
+            mountPath: {{ .mountPath }}
+            subPath: {{ .subPath }}
+            readOnly: {{ .readOnly }}
+        {{- end }}
        {{- range .Values.query.extraConfigmapMounts }}
          - name: {{ .name }}
            mountPath: {{ .mountPath }}
@ -132,6 +131,16 @@ spec:
            subPath: "client-key.pem"
            readOnly: true
        {{- end }}
+        {{- if .Values.storage.elasticsearch.tls.enabled }}
+          - name: {{ .Values.storage.elasticsearch.tls.secretName }}
+            mountPath: {{ .Values.storage.elasticsearch.tls.mountPath }}
+            subPath: {{ .Values.storage.elasticsearch.tls.subPath }}
+            readOnly: true
+        {{- end }}
+        {{- if .Values.query.config}}
+          - name: ui-configuration
+            mountPath: /etc/conf/
+        {{- end }}
        livenessProbe:
          httpGet:
            path: /
@ -140,25 +149,76 @@ spec:
          httpGet:
            path: /
            port: admin
+{{- if .Values.query.oAuthSidecar.enabled }}
+      - name: {{ template "jaeger.agent.name" . }}-oauth2-sidecar
+        securityContext:
+          {{- toYaml .Values.query.securityContext | nindent 10 }}
+        image: {{ include "oAuthSidecar.image" . }}
+        imagePullPolicy: {{ .Values.query.oAuthSidecar.image.pullPolicy }}
+        args:
+        {{- range .Values.query.oAuthSidecar.args }}
+          - {{ . }}
+        {{- end }}
+        {{- if .Values.query.oAuthSidecar.extraEnv }}
+        env:
+          {{- toYaml .Values.query.oAuthSidecar.extraEnv | nindent 10 }}
+        {{- end }}
+        volumeMounts:
+        {{- range .Values.query.oAuthSidecar.extraConfigmapMounts }}
+          - name: {{ .name }}
+            mountPath: {{ .mountPath }}
+            subPath: {{ .subPath }}
+            readOnly: {{ .readOnly }}
+        {{- end }}
+        {{- range .Values.query.oAuthSidecar.extraSecretMounts }}
+          - name: {{ .name }}
+            mountPath: {{ .mountPath }}
+            subPath: {{ .subPath }}
+            readOnly: {{ .readOnly }}
+        {{- end }}
+        {{- if .Values.query.oAuthSidecar.config}}
+          - name: jaeger-oauth-configuration
+            mountPath: /etc/oauth2-proxy
+        {{- end }}
+        ports:
+          - containerPort: {{ .Values.query.oAuthSidecar.containerPort }}
+            name: oauth-proxy
+        resources:
+          {{- toYaml .Values.query.oAuthSidecar.resources | nindent 10 }}
+        {{- if .Values.query.oAuthSidecar.livenessProbe }}
+        livenessProbe:
+          {{- toYaml .Values.query.oAuthSidecar.livenessProbe | nindent 10 }}
+        {{- end }}
+        {{- if .Values.query.oAuthSidecar.readinessProbe }}
+        readinessProbe:
+          {{- toYaml .Values.query.oAuthSidecar.readinessProbe | nindent 10 }}
+        {{- end }}
+{{- end }}
 {{- if .Values.query.agentSidecar.enabled }}
      - name: {{ template "jaeger.agent.name" . }}-sidecar
        securityContext:
-{{ toYaml .Values.query.securityContext | indent 10 }}
-        image: {{ .Values.agent.image }}:{{ .Values.tag }}
-        imagePullPolicy: {{ .Values.agent.pullPolicy }}
+          {{- toYaml .Values.query.securityContext | nindent 10 }}
+        image: {{ include "agent.image" . }}
+        imagePullPolicy: {{ .Values.agent.image.pullPolicy }}
+        args:
+          {{- range $key, $value := .Values.agent.cmdlineParams }}
+          {{- if $value }}
+          - --{{ $key }}={{ $value }}
+          {{- else }}
+          - --{{ $key }}
+          {{- end }}
+          {{- end }}
        env:
        {{- if not (hasKey .Values.agent.cmdlineParams "reporter.grpc.host-port") }}
        - name: REPORTER_GRPC_HOST_PORT
-          value: {{ include "jaeger.collector.name" . }}:{{ .Values.collector.service.grpcPort }}
-        {{- end }}
-        {{- range $key, $value := .Values.agent.cmdlineParams }}
-        - name: {{ $key | replace "." "_" | replace "-" "_" | upper | quote }}
-          value: {{ $value | quote }}
+          value: {{ include "jaeger.collector.name" . }}:{{ .Values.collector.service.grpc.port }}
        {{- end }}
        ports:
        - name: admin
          containerPort: 14271
          protocol: TCP
+        resources:
+          {{- toYaml .Values.query.agentSidecar.resources | nindent 10 }}
        volumeMounts:
        {{- range .Values.agent.extraConfigmapMounts }}
          - name: {{ .name }}
@ -180,6 +240,9 @@ spec:
          httpGet:
            path: /
            port: admin
+{{- end }}
+      {{- if .Values.query.sidecars }}
+        {{- tpl (toYaml .Values.query.sidecars) . | nindent 6 }}
      {{- end }}
      dnsPolicy: {{ .Values.query.dnsPolicy }}
      restartPolicy: Always
@ -189,6 +252,44 @@ spec:
          configMap:
            name: {{ .configMap }}
      {{- end }}
+      {{- range .Values.query.extraSecretMounts }}
+        - name: {{ .name }}
+          secret:
+            secretName: {{ .secretName }}
+      {{- end }}
+      {{- if .Values.query.config}}
+        - name: ui-configuration
+          configMap:
+            name: {{ include "jaeger.fullname" . }}-ui-configuration
+      {{- end }}
+      {{- if .Values.storage.cassandra.tls.enabled }}
+        - name: {{ .Values.storage.cassandra.tls.secretName }}
+          secret:
+            secretName: {{ .Values.storage.cassandra.tls.secretName }}
+      {{- end }}
+      {{- if .Values.storage.elasticsearch.tls.enabled }}
+        - name: {{ .Values.storage.elasticsearch.tls.secretName }}
+          secret:
+            secretName: {{ .Values.storage.elasticsearch.tls.secretName }}
+       {{- end }}
+{{- if .Values.query.oAuthSidecar.enabled }}
+      {{- range .Values.query.oAuthSidecar.extraConfigmapMounts }}
+        - name: {{ .name }}
+          configMap:
+            name: {{ .configMap }}
+      {{- end }}
+      {{- range .Values.query.oAuthSidecar.extraSecretMounts }}
+        - name: {{ .name }}
+          secret:
+            secretName: {{ .secretName }}
+      {{- end }}
+      {{- if .Values.query.oAuthSidecar.config }}
+        - name: jaeger-oauth-configuration
+          configMap:
+            name: {{ include "jaeger.fullname" . }}-oauth-configuration
+      {{- end }}
+{{- end }}
+{{- if .Values.query.agentSidecar.enabled }}
      {{- range .Values.agent.extraSecretMounts }}
        - name: {{ .name }}
          secret:
@ -199,6 +300,10 @@ spec:
          configMap:
            name: {{ .configMap }}
      {{- end }}
+{{- end }}
+      {{- if .Values.query.extraVolumes }}
+        {{- tpl (toYaml .Values.query.extraVolumes) . | nindent 8 }}
+      {{- end }}
    {{- with .Values.query.nodeSelector }}
      nodeSelector:
        {{- toYaml . | nindent 8 }}
@ -207,6 +312,10 @@ spec:
      affinity:
        {{- toYaml . | nindent 8 }}
    {{- end }}
+    {{- with .Values.query.topologySpreadConstraints }}
+      topologySpreadConstraints:
+      {{- toYaml . | nindent 8 }}
+    {{- end }}
    {{- with .Values.query.tolerations }}
      tolerations:
        {{- toYaml . | nindent 8 }}
--- a/charts/jaeger/templates/query-ing.yaml
+++ b/charts/jaeger/templates/query-ing.yaml
@ -1,30 +1,41 @@
 {{- if .Values.query.ingress.enabled -}}
+{{- $ingressSupportsIngressClassName := eq (include "common.ingress.supportsIngressClassname" .) "true" }}
  {{- $servicePort := .Values.query.service.port -}}
  {{- $basePath := .Values.query.basePath -}}
-apiVersion: extensions/v1beta1
+apiVersion: {{ include "common.capabilities.ingress.apiVersion" $ }}
 kind: Ingress
 metadata:
  name: {{ template "jaeger.query.name" . }}
  labels:
    {{- include "jaeger.labels" . | nindent 4 }}
+    {{- if .Values.query.ingress.labels }}
+    {{- toYaml .Values.query.ingress.labels | nindent 4 }}
+    {{- end }}
    app.kubernetes.io/component: query
  {{- if .Values.query.ingress.annotations }}
  annotations:
-{{ toYaml .Values.query.ingress.annotations | indent 4 }}
+    {{- toYaml .Values.query.ingress.annotations | nindent 4 }}
    {{- end }}
 spec:
+  {{- if and $ingressSupportsIngressClassName .Values.query.ingress.ingressClassName }}
+  ingressClassName: {{ .Values.query.ingress.ingressClassName }}
+  {{- end }}
  rules:
    {{- range $host := .Values.query.ingress.hosts }}
-    - host: {{ $host }}
+    - host: {{ $host | quote }}
      http:
        paths:
          - path: {{ $basePath }}
-            backend:
-              serviceName: {{ template "jaeger.query.name" $ }}
-              servicePort: {{ $servicePort }}
+            pathType: {{ default "ImplementationSpecific" $.Values.query.ingress.pathType }}
+            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "jaeger.query.name" $) "servicePort" $servicePort "context" $) | nindent 14 }}
+          {{- end -}}
+          {{- if .Values.query.ingress.health.exposed }}
+          - path: /health
+            pathType: {{ default "ImplementationSpecific" $.Values.query.ingress.pathType }}
+            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "jaeger.query.name" $) "servicePort" 16687 "context" $) | nindent 14 }}
  {{- end -}}
  {{- if .Values.query.ingress.tls }}
  tls:
-{{ toYaml .Values.query.ingress.tls | indent 4 }}
+  {{- toYaml .Values.query.ingress.tls | nindent 4 }}
  {{- end -}}
  {{- end -}}
--- a/charts/jaeger/templates/query-networkpolicy-egress.yaml
+++ b/charts/jaeger/templates/query-networkpolicy-egress.yaml
@ -0,0 +1,5 @@
+{{- if and .Values.networkPolicy.enabled .Values.query.networkPolicy.enabled .Values.query.networkPolicy.egressRules }}
+{{- $extraVals := dict "Name" (include "jaeger.query.name" .) "Component" "query" "ComponentValues" .Values.query -}}
+{{- $npVals := merge $extraVals . -}}
+{{ include "jaeger.egress.networkPolicy" $npVals }}
+{{- end }}
--- a/charts/jaeger/templates/query-networkpolicy-ingress.yaml
+++ b/charts/jaeger/templates/query-networkpolicy-ingress.yaml
@ -0,0 +1,5 @@
+{{- if and .Values.networkPolicy.enabled .Values.query.networkPolicy.enabled .Values.query.networkPolicy.ingressRules }}
+{{- $extraVals := dict "Name" (include "jaeger.query.name" .) "Component" "query" "ComponentValues" .Values.query -}}
+{{- $npVals := merge $extraVals . -}}
+{{ include "jaeger.ingress.networkPolicy" $npVals }}
+{{- end }}
--- a/charts/jaeger/templates/query-sa.yaml
+++ b/charts/jaeger/templates/query-sa.yaml
@ -6,4 +6,9 @@ metadata:
  labels:
    {{- include "jaeger.labels" . | nindent 4 }}
    app.kubernetes.io/component: query
+  {{- with .Values.query.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+automountServiceAccountToken: {{ .Values.query.serviceAccount.automountServiceAccountToken }}
 {{- end -}}
--- a/charts/jaeger/templates/query-servicemonitor.yaml
+++ b/charts/jaeger/templates/query-servicemonitor.yaml
@ -0,0 +1,44 @@
+{{- if and (.Values.query.enabled) (.Values.query.serviceMonitor.enabled)}}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ template "jaeger.query.name" . }}
+  {{- if .Values.query.serviceMonitor.namespace }}
+  namespace: {{ .Values.query.serviceMonitor.namespace }}
+  {{- end }}
+  labels:
+    {{- include "jaeger.labels" . | nindent 4 }}
+    app.kubernetes.io/component: query
+    {{- if .Values.query.serviceMonitor.additionalLabels }}
+    {{- toYaml .Values.query.serviceMonitor.additionalLabels | nindent 4 }}
+    {{- end }}
+  {{- if .Values.query.serviceMonitor.annotations }}
+  annotations:
+    {{- toYaml .Values.query.serviceMonitor.annotations | nindent 4 }}
+  {{- end }}
+spec:
+  endpoints:
+    - port: admin
+      path: /metrics
+      {{- if .Values.query.serviceMonitor.interval }}
+      interval: {{ .Values.query.serviceMonitor.interval }}
+      {{- end }}
+      {{- if .Values.query.serviceMonitor.scrapeTimeout }}
+      scrapeTimeout: {{ .Values.query.serviceMonitor.scrapeTimeout }}
+      {{- end }}
+      {{- if .Values.query.serviceMonitor.relabelings }}
+      relabelings:
+        {{- toYaml .Values.query.serviceMonitor.relabelings | nindent 8 }}
+      {{- end }}
+      {{- if .Values.query.serviceMonitor.metricRelabelings }}
+      metricRelabelings:
+        {{- toYaml .Values.query.serviceMonitor.metricRelabelings | nindent 8 }}
+      {{- end }}
+  namespaceSelector:
+    matchNames:
+      - {{ .Release.Namespace }}
+  selector:
+    matchLabels:
+      app.kubernetes.io/component: query
+      app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
--- a/charts/jaeger/templates/query-svc.yaml
+++ b/charts/jaeger/templates/query-svc.yaml
@ -8,14 +8,25 @@ metadata:
    app.kubernetes.io/component: query
 {{- if .Values.query.service.annotations }}
  annotations:
-{{ toYaml .Values.query.service.annotations | indent 4 }}
+    {{- toYaml .Values.query.service.annotations | nindent 4 }}
 {{- end }}
 spec:
  ports:
  - name: query
    port: {{ .Values.query.service.port }}
    protocol: TCP
-    targetPort: query
+    targetPort: {{ default (ternary "oauth-proxy" "query" .Values.query.oAuthSidecar.enabled) .Values.query.service.targetPort }}
+{{- if and (eq .Values.query.service.type "NodePort") (.Values.query.service.nodePort) }}
+    nodePort: {{ .Values.query.service.nodePort }}
+{{- end }}
+  - name: grpc
+    port: 16685
+    protocol: TCP
+    targetPort: grpc
+  - name: {{ .Values.query.service.admin.name }}
+    port: 16687
+    protocol: TCP
+    targetPort: {{ .Values.query.service.admin.targetPort }}
  selector:
    {{- include "jaeger.selectorLabels" . | nindent 4 }}
    app.kubernetes.io/component: query
--- a/charts/jaeger/templates/spark-cronjob.yaml
+++ b/charts/jaeger/templates/spark-cronjob.yaml
@ -1,5 +1,5 @@
 {{- if .Values.spark.enabled -}}
-apiVersion: batch/v1beta1
+apiVersion: {{ include "common.capabilities.cronjob.apiVersion" $ }}
 kind: CronJob
 metadata:
  name: {{ include "jaeger.fullname" . }}-spark
@ -8,67 +8,63 @@ metadata:
    app.kubernetes.io/component: spark
 {{- if .Values.spark.annotations }}
  annotations:
-{{ toYaml .Values.spark.annotations | indent 4 }}
+    {{- toYaml .Values.spark.annotations | nindent 4 }}
 {{- end }}
 spec:
  schedule: {{ .Values.spark.schedule | quote }}
  successfulJobsHistoryLimit: {{ .Values.spark.successfulJobsHistoryLimit }}
  failedJobsHistoryLimit: {{ .Values.spark.failedJobsHistoryLimit }}
+  concurrencyPolicy: {{ .Values.spark.concurrencyPolicy }}
  jobTemplate:
    spec:
+      {{- if .Values.spark.activeDeadlineSeconds }}
+      activeDeadlineSeconds: {{ .Values.spark.activeDeadlineSeconds }}
+      {{- end}}
+      {{- if .Values.spark.ttlSecondsAfterFinished }}
+      ttlSecondsAfterFinished: {{ .Values.spark.ttlSecondsAfterFinished }}
+      {{- end }}
      template:
        metadata:
+          {{- if .Values.spark.podAnnotations }}
+          annotations:
+            {{- toYaml .Values.spark.podAnnotations | nindent 12 }}
+          {{- end }}
          labels:
            {{- include "jaeger.selectorLabels" . | nindent 12 }}
            app.kubernetes.io/component: spark
            {{- if .Values.spark.podLabels }}
-{{ toYaml .Values.spark.podLabels | indent 12 }}
+            {{- toYaml .Values.spark.podLabels | nindent 12 }}
            {{- end }}
        spec:
          serviceAccountName: {{ template "jaeger.spark.serviceAccountName" . }}
+          {{- include "spark.imagePullSecrets" . | nindent 10 }}
+          securityContext:
+            {{- toYaml .Values.spark.podSecurityContext | nindent 12 }}
          containers:
          - name: {{ include "jaeger.fullname" . }}-spark
-            image: {{ .Values.spark.image }}:{{ .Values.spark.tag }}
-            imagePullPolicy: {{ .Values.spark.pullPolicy }}
+            image: {{ include "spark.image" . }}
+            imagePullPolicy: {{ .Values.spark.image.pullPolicy }}
+            args:
+              {{ include "extra.cmdArgs" ( dict "cmdlineParams" .Values.spark.cmdlineParams ) | nindent 14  }}
            env:
-            {{- range $key, $value := .Values.spark.cmdlineParams }}
-            - name: {{ $key | replace "." "_" | replace "-" "_" | upper | quote }}
-              value: {{ $value | quote }}
-            {{- end }}
              - name: STORAGE
                value: {{ .Values.storage.type }}
+              {{- include "storage.env" . | nindent 14 }}
+            {{- if .Values.spark.extraEnv }}
+              {{- toYaml .Values.spark.extraEnv | nindent 14 }}
+            {{- end }}
            {{- if eq .Values.storage.type "cassandra" }}
              - name: CASSANDRA_CONTACT_POINTS
-              value: {{ template "cassandra.contact_points" . }}
-            - name: CASSANDRA_KEYSPACE
-              value: {{ .Values.storage.cassandra.keyspace }}
-            {{- if .Values.storage.cassandra.usePassword }}
-            - name: CASSANDRA_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: {{ if .Values.storage.cassandra.existingSecret }}{{ .Values.storage.cassandra.existingSecret }}{{- else }}{{ include "jaeger.fullname" . }}-cassandra{{- end }}
-                  key: password
-            {{- end }}
-            - name: CASSANDRA_USERNAME
-              value: {{ .Values.storage.cassandra.user }}
+                value: {{ include "cassandra.contact_points" . }}
            {{- end }}
            {{- if eq .Values.storage.type "elasticsearch" }}
              - name: ES_NODES
-              value: {{ template "elasticsearch.client.url" . }}
+                value: {{ include "elasticsearch.client.url" . }}
              - name: ES_NODES_WAN_ONLY
                value: {{ .Values.storage.elasticsearch.nodesWanOnly | quote }}
-            {{- if .Values.storage.elasticsearch.usePassword }}
-            - name: ES_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: {{ if .Values.storage.elasticsearch.existingSecret }}{{ .Values.storage.elasticsearch.existingSecret }}{{- else }}{{ include "jaeger.fullname" . }}-elasticsearch{{- end }}
-                  key: password
-            {{- end }}
-            - name: ES_USERNAME
-              value: {{ .Values.storage.elasticsearch.user }}
            {{- end }}
            resources:
-{{ toYaml .Values.spark.resources | indent 14 }}
+              {{- toYaml .Values.spark.resources | nindent 14 }}
            volumeMounts:
            {{- range .Values.spark.extraConfigmapMounts }}
              - name: {{ .name }}
@ -82,6 +78,8 @@ spec:
                subPath: {{ .subPath }}
                readOnly: {{ .readOnly }}
            {{- end }}
+            securityContext:
+              {{- toYaml .Values.spark.securityContext | nindent 14 }}
          restartPolicy: OnFailure
          volumes:
          {{- range .Values.spark.extraConfigmapMounts }}
--- a/charts/jaeger/templates/spark-sa.yaml
+++ b/charts/jaeger/templates/spark-sa.yaml
@ -6,4 +6,9 @@ metadata:
  labels:
    {{- include "jaeger.labels" . | nindent 4 }}
    app.kubernetes.io/component: spark
+  {{- with .Values.spark.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+automountServiceAccountToken: {{ .Values.spark.serviceAccount.automountServiceAccountToken }}
 {{- end -}}
--- a/charts/jaeger/values.yaml
+++ b/charts/jaeger/values.yaml
@ -2,22 +2,109 @@
 # This is a YAML-formatted file.
 # Jaeger values are grouped by component. Cassandra values override subchart values

+global:
+  imageRegistry:
+
 provisionDataStore:
  cassandra: true
  elasticsearch: false
  kafka: false

-tag: 1.17.0
+networkPolicy:
+  enabled: false
+
+# Overrides the image tag where default is the chart appVersion.
+tag: ""

 nameOverride: ""
 fullnameOverride: ""

+allInOne:
+  enabled: false
+  replicas: 1
+  image:
+    registry: ""
+    repository: jaegertracing/all-in-one
+    tag: ""
+    digest: ""
+    pullPolicy: IfNotPresent
+    pullSecrets: []
+  extraEnv: []
+  extraSecretMounts:
+    []
+    # - name: jaeger-tls
+    #   mountPath: /tls
+    #   subPath: ""
+    #   secretName: jaeger-tls
+    #   readOnly: true
+  # command line arguments / CLI flags
+  # See https://www.jaegertracing.io/docs/cli/
+  args: []
+  # samplingConfig: |-
+  #   {
+  #     "default_strategy": {
+  #       "type": "probabilistic",
+  #       "param": 1
+  #     }
+  #   }
+  serviceAccount:
+    annotations: {}
+    automountServiceAccountToken: true
+  service:
+    headless: true
+    collector:
+      otlp:
+        grpc:
+          name: otlp-grpc
+        http:
+          name: otlp-http
+  ingress:
+    enabled: false
+    # For Kubernetes >= 1.18 you should specify the ingress-controller via the field ingressClassName
+    # See https://kubernetes.io/blog/2020/04/02/improvements-to-the-ingress-api-in-kubernetes-1.18/#specifying-the-class-of-an-ingress
+    # ingressClassName: nginx
+    annotations: {}
+    labels: {}
+    # Used to create an Ingress record.
+    # hosts:
+    #   - chart-example.local
+    # annotations:
+    #   kubernetes.io/ingress.class: nginx
+    #   kubernetes.io/tls-acme: "true"
+    # labels:
+    #   app: jaeger
+    # tls:
+    #   # Secrets must be manually created in the namespace.
+    #   - secretName: chart-example-tls
+    #     hosts:
+    #       - chart-example.local
+    pathType:
+  # resources:
+  #   limits:
+  #     cpu: 500m
+  #     memory: 512Mi
+  #   requests:
+  #     cpu: 256m
+  #     memory: 128Mi
+  nodeSelector: {}
+  tolerations: []
+  affinity: {}
+  topologySpreadContraints: []
+  podSecurityContext:
+    runAsUser: 10001
+    runAsGroup: 10001
+    fsGroup: 10001
+  securityContext: {}
+
 storage:
-  # allowed values (cassandra, elasticsearch)
+  # allowed values (cassandra, elasticsearch, grpc-plugin, badger, memory)
  type: cassandra
  cassandra:
    host: cassandra
    port: 9042
+    # Change this value to false if you want to avoid starting the
+    # -cassandra-schema Job
+    schemaJobEnabled: true
    tls:
      enabled: false
      secretName: cassandra-tls-secret
@ -27,21 +114,76 @@ storage:
    keyspace: jaeger_v1_test
    ## Use existing secret (ignores previous password)
    # existingSecret:
+    ## Cassandra related env vars to be configured on the concerned components
+    extraEnv:
+      []
+      # - name: CASSANDRA_SERVERS
+      #   value: cassandra
+      # - name: CASSANDRA_PORT
+      #   value: "9042"
+      # - name: CASSANDRA_KEYSPACE
+      #   value: jaeger_v1_test
+      # - name: CASSANDRA_TLS_ENABLED
+      #   value: "false"
+    ## Cassandra related cmd line opts to be configured on the concerned components
+    cmdlineParams:
+      {}
+      # cassandra.servers: cassandra
+      # cassandra.port: 9042
+      # cassandra.keyspace: jaeger_v1_test
+      # cassandra.tls.enabled: "false"
  elasticsearch:
    scheme: http
    host: elasticsearch-master
    port: 9200
+    anonymous: false
    user: elastic
    usePassword: true
    password: changeme
    # indexPrefix: test
    ## Use existing secret (ignores previous password)
    # existingSecret:
+    # existingSecretKey:
    nodesWanOnly: false
+    extraEnv: []
+    ## ES related env vars to be configured on the concerned components
+    # - name: ES_SERVER_URLS
+    #   value: http://elasticsearch-master:9200
+    # - name: ES_USERNAME
+    #   value: elastic
+    # - name: ES_INDEX_PREFIX
+    #   value: test
+    ## ES related cmd line opts to be configured on the concerned components
+    cmdlineParams:
+      {}
+      # es.server-urls: http://elasticsearch-master:9200
+      # es.username: elastic
+      # es.index-prefix: test
+    tls:
+      enabled: false
+      secretName: es-tls-secret
+      # The mount properties of the secret
+      mountPath: /es-tls/ca-cert.pem
+      subPath: ca-cert.pem
+      # How ES_TLS_CA variable will be set in the various components
+      ca: /es-tls/ca-cert.pem
+
  kafka:
    brokers:
      - kafka:9092
    topic: jaeger_v1_test
+    authentication: none
+    extraEnv: []
+  grpcPlugin:
+    extraEnv: []
+  badger:
+    ephemeral: true
+    persistence:
+      mountPath: /mnt/data
+      useExistingPvcName: ""
+    extraEnv: []
+  memory:
+    extraEnv: []

 # Begin: Override values on the Cassandra subchart to customize for Jaeger
 cassandra:
@ -58,26 +200,48 @@ cassandra:

 # Begin: Override values on the Kafka subchart to customize for Jaeger
 kafka:
-  replicas: 1
-  configurationOverrides:
-    "auto.create.topics.enable": true
-  zookeeper:
-    replicaCount: 1
+  listeners:
+    client:
+      protocol: PLAINTEXT
+    controller:
+      protocol: PLAINTEXT
+    interbroker:
+      protocol: PLAINTEXT
+    external:
+      protocol: PLAINTEXT
+  controller:
+    replicaCount: 3
+    extraConfig: |
+      auto.create.topics.enable=true
+# Zookeeper has been deprecated by Kafka in favor of Kraft Mode: https://developer.confluent.io/learn/kraft/
+# Documentation for upgrading Kafka and keeping Zookeeper: https://github.com/bitnami/charts/tree/main/bitnami/kafka#upgrading-from-zookeeper-mode
+# Documentation for migrating away from Zookeeper to Kraft Mode: https://github.com/bitnami/charts/tree/main/bitnami/kafka#migrating-from-zookeeper-early-access
+  # zookeeper:
+  #   enabled: false
+  #   replicaCount: 1
+  #   serviceAccount:
+  #     create: true
+
 # End: Override values on the Kafka subchart to customize for Jaeger

 # Begin: Default values for the various components of Jaeger
 # This chart has been based on the Kubernetes integration found in the following repo:
-# https://github.com/jaegertracing/jaeger-kubernetes/blob/master/production/jaeger-production-template.yml
+# https://github.com/jaegertracing/jaeger-kubernetes/blob/main/production/jaeger-production-template.yml
 #
 # This is the jaeger-cassandra-schema Job which sets up the Cassandra schema for
 # use by Jaeger
 schema:
  annotations: {}
-  image: jaegertracing/jaeger-cassandra-schema
+  tolerations: []
+  image:
+    registry: ""
+    repository: jaegertracing/jaeger-cassandra-schema
+    tag: ""
+    digest: ""
    pullPolicy: IfNotPresent
-  # Acceptable values are test and prod. Default is for production use.
-  mode: prod
-  resources: {}
+    pullSecrets: []
+  resources:
+    {}
    # limits:
    #   cpu: 500m
    #   memory: 512Mi
@ -86,26 +250,78 @@ schema:
    #   memory: 128Mi
  serviceAccount:
    create: true
+    # Explicitly mounts the API credentials for the Service Account
+    automountServiceAccountToken: true
    name:
-  ## Additional pod labels
-  ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
+  podAnnotations: {}
  podLabels: {}
+  securityContext: {}
+  podSecurityContext: {}
+  nodeSelector: {}
  ## Deadline for cassandra schema creation job
  activeDeadlineSeconds: 300
-  # traceTtl: 172800
-  # dependenciesTtl: 0
+  extraEnv:
+    []
+    # - name: MODE
+    #   value: prod
+    # - name: TRACE_TTL
+    #   value: "172800"
+    # - name: DEPENDENCIES_TTL
+    #   value: "0"

 # For configurable values of the elasticsearch if provisioned, please see:
-# https://github.com/elastic/helm-charts/tree/master/elasticsearch#configuration
+# https://github.com/bitnami/charts/tree/main/bitnami/elasticsearch
 elasticsearch: {}

+# Example that uses no auth:
+# elasticsearch:
+#   fullnameOverride: "elasticsearch"
+#   image:
+#     registry: ""
+#     repository: docker.io/bitnami/elasticsearch
+#     tag: ""
+#   master:
+#     masterOnly: false
+#     replicaCount: 3
+#     extraEnvVars:
+#       - name: ES_JAVA_OPTS
+#         value: "-Xmx20g -Xms20g"
+#     persistence:
+#       enabled: true
+#       storageClass: managed-premium
+#       accessModes: [ "ReadWriteOnce" ]
+#       size: 100gb
+#   extraConfig:
+#     cluster.max_shards_per_node: 3000
+#   sysctlImage:
+#     registry: ""
+#     repository: docker.io/bitnami/os-shell
+#     tag: 12-debian-12-r18
+#   volumePermissions:
+#     enabled: true
+#     image:
+#       registry: ""
+#       repository: docker.io/bitnami/os-shell
+#       tag: 12-debian-12-r18
+#   data:
+#     replicaCount: 0
+#   coordinating:
+#     replicaCount: 0
+#   ingest:
+#     replicaCount: 0
+
 ingester:
  enabled: false
  podSecurityContext: {}
  securityContext: {}
  annotations: {}
-  image: jaegertracing/jaeger-ingester
+  image:
+    registry: ""
+    repository: jaegertracing/jaeger-ingester
+    tag: ""
+    digest: ""
    pullPolicy: IfNotPresent
+    pullSecrets: []
  dnsPolicy: ClusterFirst
  cmdlineParams: {}
  replicaCount: 1
@ -113,6 +329,7 @@ ingester:
    enabled: false
    minReplicas: 2
    maxReplicas: 10
+    behavior: {}
    # targetCPUUtilizationPercentage: 80
    # targetMemoryUtilizationPercentage: 80
  service:
@ -120,7 +337,8 @@ ingester:
    # List of IP ranges that are allowed to access the load balancer (if supported)
    loadBalancerSourceRanges: []
    type: ClusterIP
-  resources: {}
+  resources:
+    {}
    # limits:
    #   cpu: 1
    #   memory: 1Gi
@ -129,27 +347,54 @@ ingester:
    #   memory: 512Mi
  serviceAccount:
    create: true
+    # Explicitly mounts the API credentials for the Service Account
+    automountServiceAccountToken: false
+    annotations: {}
    name:
  nodeSelector: {}
  tolerations: []
  affinity: {}
+  topologySpreadContraints: []
  podAnnotations: {}
  ## Additional pod labels
  ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
  podLabels: {}
  extraSecretMounts: []
  extraConfigmapMounts: []
+  extraEnv: []
+  envFrom: []
+  initContainers: []
+
+  serviceMonitor:
+    enabled: false
+    additionalLabels: {}
+    # https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#relabelconfig
+    relabelings: []
+    # -- ServiceMonitor metric relabel configs to apply to samples before ingestion
+    # https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api.md#endpoint
+    metricRelabelings: []

 agent:
  podSecurityContext: {}
  securityContext: {}
  enabled: true
  annotations: {}
-  image: jaegertracing/jaeger-agent
+  image:
+    registry: ""
+    repository: jaegertracing/jaeger-agent
+    tag: ""
+    digest: ""
    pullPolicy: IfNotPresent
+    pullSecrets: []
  cmdlineParams: {}
+  extraEnv: []
  daemonset:
    useHostPort: false
+    updateStrategy:
+      {}
+      # type: RollingUpdate
+      # rollingUpdate:
+      #   maxUnavailable: 1
  service:
    annotations: {}
    # List of IP ranges that are allowed to access the load balancer (if supported)
@ -163,7 +408,8 @@ agent:
    binaryPort: 6832
    # samplingPort: (HTTP) serve configs, sampling strategies
    samplingPort: 5778
-  resources: {}
+  resources:
+    {}
    # limits:
    #   cpu: 500m
    #   memory: 512Mi
@ -172,7 +418,10 @@ agent:
    #   memory: 128Mi
  serviceAccount:
    create: true
+    # Explicitly mounts the API credentials for the Service Account
+    automountServiceAccountToken: false
    name:
+    annotations: {}
  nodeSelector: {}
  tolerations: []
  affinity: {}
@ -192,38 +441,109 @@ agent:
  #   subPath: ""
  #   configMap: jaeger-config
  #   readOnly: true
+  envFrom: []
  useHostNetwork: false
  dnsPolicy: ClusterFirst
+  priorityClassName: ""
+  initContainers: []
+
+  serviceMonitor:
+    enabled: false
+    additionalLabels: {}
+    # https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#relabelconfig
+    relabelings: []
+    # -- ServiceMonitor metric relabel configs to apply to samples before ingestion
+    # https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api.md#endpoint
+    metricRelabelings: []

 collector:
  podSecurityContext: {}
  securityContext: {}
  enabled: true
  annotations: {}
-  image: jaegertracing/jaeger-collector
+  image:
+    registry: ""
+    repository: jaegertracing/jaeger-collector
+    tag: ""
+    digest: ""
    pullPolicy: IfNotPresent
+    pullSecrets: []
  dnsPolicy: ClusterFirst
+  extraEnv: []
+  envFrom: []
  cmdlineParams: {}
+  basePath: /
  replicaCount: 1
  autoscaling:
    enabled: false
    minReplicas: 2
    maxReplicas: 10
+    behavior: {}
    # targetCPUUtilizationPercentage: 80
    # targetMemoryUtilizationPercentage: 80
  service:
    annotations: {}
+    # The IP to be used by the load balancer (if supported)
+    loadBalancerIP: ""
    # List of IP ranges that are allowed to access the load balancer (if supported)
    loadBalancerSourceRanges: []
    type: ClusterIP
-    grpcPort: 14250
-    # tchannelPort: used by jaeger-agent to send spans in jaeger.thrift format
-    tchannelPort: 14267
+    # Cluster IP address to assign to service. Set to None to make service headless
+    clusterIP: ""
+    grpc:
+      port: 14250
+      # nodePort:
    # httpPort: can accept spans directly from clients in jaeger.thrift format
-    httpPort: 14268
+    http:
+      port: 14268
+      # nodePort:
    # can accept Zipkin spans in JSON or Thrift
-    # zipkinPort: 9411
-  resources: {}
+    zipkin:
+      {}
+      # port: 9411
+      # nodePort:
+    otlp:
+      grpc:
+        {}
+        # name: otlp-grpc
+        # port: 4317
+        # nodePort:
+      http:
+        {}
+        # name: otlp-http
+        # port: 4318
+        # nodePort:
+    admin:
+      name: admin
+      targetPort: admin
+  ingress:
+    enabled: false
+    # For Kubernetes >= 1.18 you should specify the ingress-controller via the field ingressClassName
+    # See https://kubernetes.io/blog/2020/04/02/improvements-to-the-ingress-api-in-kubernetes-1.18/#specifying-the-class-of-an-ingress
+    # ingressClassName: nginx
+    annotations: {}
+    labels: {}
+    # Used to create an Ingress record.
+    # The 'hosts' variable accepts two formats:
+    # hosts:
+    #   - chart-example.local
+    # or:
+    # hosts:
+    #   - host: chart-example.local
+    #     servicePort: grpc
+    # annotations:
+    # kubernetes.io/ingress.class: nginx
+    # kubernetes.io/tls-acme: "true"
+    # labels:
+    # app: jaeger-collector
+    # tls:
+    # Secrets must be manually created in the namespace.
+    # - secretName: chart-example-tls
+    #   hosts:
+    #     - chart-example.local
+    pathType:
+  resources:
+    {}
    # limits:
    #   cpu: 1
    #   memory: 1Gi
@ -232,10 +552,14 @@ collector:
    #   memory: 512Mi
  serviceAccount:
    create: true
+    # Explicitly mounts the API credentials for the Service Account
+    automountServiceAccountToken: false
    name:
+    annotations: {}
  nodeSelector: {}
  tolerations: []
  affinity: {}
+  topologySpreadContraints: []
  podAnnotations: {}
  ## Additional pod labels
  ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
@ -283,18 +607,88 @@ collector:
  #       "param": 1
  #     }
  #   }
+  priorityClassName: ""
+  serviceMonitor:
+    enabled: false
+    additionalLabels: {}
+    # https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#relabelconfig
+    relabelings: []
+    # -- ServiceMonitor metric relabel configs to apply to samples before ingestion
+    # https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api.md#endpoint
+    metricRelabelings: []
+  initContainers: []
+  networkPolicy:
+    enabled: false
+    # ingressRules:
+    #   namespaceSelector: {}
+    #   podSelector: {}
+    #   customRules: []
+    # egressRules:
+    #   namespaceSelector: {}
+    #   podSelector: {}
+    #   customRules: []

 query:
  enabled: true
+  basePath: /
+  initContainers: []
+  oAuthSidecar:
+    enabled: false
+    resources:
+      {}
+      # limits:
+      #   cpu: 500m
+      #   memory: 512Mi
+      # requests:
+      #   cpu: 256m
+      #   memory: 128Mi
+    image:
+      registry: quay.io
+      repository: oauth2-proxy/oauth2-proxy
+      tag: v7.6.0
+      digest: ""
+      pullPolicy: IfNotPresent
+      pullSecrets: []
+    containerPort: 4180
+    args: []
+    extraEnv: []
+    extraConfigmapMounts: []
+    extraSecretMounts: []
+  # config: |-
+  #   provider = "oidc"
+  #   https_address = ":4180"
+  #   upstreams = ["http://localhost:16686"]
+  #   redirect_url = "https://jaeger-svc-domain/oauth2/callback"
+  #   client_id = "jaeger-query"
+  #   oidc_issuer_url = "https://keycloak-svc-domain/auth/realms/Default"
+  #   cookie_secure = "true"
+  #   email_domains = "*"
+  #   oidc_groups_claim = "groups"
+  #   user_id_claim = "preferred_username"
+  #   skip_provider_button = "true"
  podSecurityContext: {}
  securityContext: {}
  agentSidecar:
    enabled: true
+  #    resources:
+  #      limits:
+  #        cpu: 500m
+  #        memory: 512Mi
+  #      requests:
+  #        cpu: 256m
+  #        memory: 128Mi
  annotations: {}
-  image: jaegertracing/jaeger-query
+  image:
+    registry: ""
+    repository: jaegertracing/jaeger-query
+    tag: ""
+    digest: ""
    pullPolicy: IfNotPresent
+    pullSecrets: []
  dnsPolicy: ClusterFirst
  cmdlineParams: {}
+  extraEnv: []
+  envFrom: []
  replicaCount: 1
  service:
    annotations: {}
@ -302,21 +696,38 @@ query:
    # List of IP ranges that are allowed to access the load balancer (if supported)
    loadBalancerSourceRanges: []
    port: 80
+    # Specify a custom target port (e.g. port of auth proxy)
+    # targetPort: 8080
+    # Specify a specific node port when type is NodePort
+    # nodePort: 32500
+    admin:
+      name: admin
+      targetPort: admin
  ingress:
    enabled: false
+    # For Kubernetes >= 1.18 you should specify the ingress-controller via the field ingressClassName
+    # See https://kubernetes.io/blog/2020/04/02/improvements-to-the-ingress-api-in-kubernetes-1.18/#specifying-the-class-of-an-ingress
+    # ingressClassName: nginx
    annotations: {}
+    labels: {}
    # Used to create an Ingress record.
    # hosts:
    #   - chart-example.local
    # annotations:
    # kubernetes.io/ingress.class: nginx
    # kubernetes.io/tls-acme: "true"
+    # labels:
+    # app: jaeger-query
    # tls:
    # Secrets must be manually created in the namespace.
    # - secretName: chart-example-tls
    #   hosts:
    #     - chart-example.local
-  resources: {}
+    pathType:
+    health:
+      exposed: false
+  resources:
+    {}
    # limits:
    #   cpu: 500m
    #   memory: 512Mi
@ -325,10 +736,14 @@ query:
    #    memory: 128Mi
  serviceAccount:
    create: true
+    # Explicitly mounts the API credentials for the Service Account
+    automountServiceAccountToken: false
    name:
+    annotations: {}
  nodeSelector: {}
  tolerations: []
  affinity: {}
+  topologySpreadContraints: []
  podAnnotations: {}
  ## Additional pod labels
  ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
@ -339,18 +754,65 @@ query:
  #   subPath: ""
  #   configMap: jaeger-config
  #   readOnly: true
+  extraVolumes: []
+  sidecars: []
+  ##   - name: your-image-name
+  ##     image: your-image
+  ##     ports:
+  ##       - name: portname
+  ##         containerPort: 1234
+  priorityClassName: ""
+  serviceMonitor:
+    enabled: false
+    additionalLabels: {}
+    # https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#relabelconfig
+    relabelings: []
+    # -- ServiceMonitor metric relabel configs to apply to samples before ingestion
+    # https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api.md#endpoint
+    metricRelabelings: []
+  # config: |-
+  #   {
+  #     "dependencies": {
+  #       "dagMaxNumServices": 200,
+  #       "menuEnabled": true
+  #     },
+  #     "archiveEnabled": true,
+  #     "tracking": {
+  #       "gaID": "UA-000000-2",
+  #       "trackErrors": true
+  #     }
+  #   }
+  networkPolicy:
+    enabled: false
+    # ingressRules:
+    #   namespaceSelector: {}
+    #   podSelector: {}
+    #   customRules: []
+    # egressRules:
+    #   namespaceSelector: {}
+    #   podSelector: {}
+    #   customRules: []

 spark:
  enabled: false
+  securityContext: {}
+  podSecurityContext: {}
  annotations: {}
-  image: jaegertracing/spark-dependencies
+  image:
+    registry: ""
+    repository: jaegertracing/spark-dependencies
    tag: latest
-  pullPolicy: Always
+    digest: ""
+    pullPolicy: IfNotPresent
+    pullSecrets: []
  cmdlineParams: {}
+  extraEnv: []
  schedule: "49 23 * * *"
  successfulJobsHistoryLimit: 5
  failedJobsHistoryLimit: 5
-  resources: {}
+  concurrencyPolicy: Forbid
+  resources:
+    {}
    # limits:
    #   cpu: 500m
    #   memory: 512Mi
@ -359,15 +821,171 @@ spark:
    #   memory: 128Mi
  serviceAccount:
    create: true
+    annotations: {}
+    # Explicitly mounts the API credentials for the Service Account
+    automountServiceAccountToken: false
    name:
  nodeSelector: {}
  tolerations: []
  affinity: {}
  extraSecretMounts: []
  extraConfigmapMounts: []
+  podAnnotations: {}
  ## Additional pod labels
  ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
  podLabels: {}
+  # ttlSecondsAfterFinished: 120
+
+esIndexCleaner:
+  enabled: false
+  securityContext:
+    runAsUser: 1000
+  podSecurityContext:
+    runAsUser: 1000
+  annotations: {}
+  image:
+    registry: ""
+    repository: jaegertracing/jaeger-es-index-cleaner
+    tag: ""
+    digest: ""
+    pullPolicy: IfNotPresent
+    pullSecrets: []
+  cmdlineParams: {}
+  extraEnv:
+    []
+    # - name: ROLLOVER
+    #   value: 'true'
+  schedule: "55 23 * * *"
+  successfulJobsHistoryLimit: 3
+  failedJobsHistoryLimit: 3
+  concurrencyPolicy: Forbid
+  resources:
+    {}
+    # limits:
+    #   cpu: 500m
+    #   memory: 512Mi
+    # requests:
+    #   cpu: 256m
+    #   memory: 128Mi
+  numberOfDays: 7
+  serviceAccount:
+    create: true
+    annotations: {}
+    # Explicitly mounts the API credentials for the Service Account
+    automountServiceAccountToken: false
+    name:
+  nodeSelector: {}
+  tolerations: []
+  affinity: {}
+  extraSecretMounts: []
+  extraConfigmapMounts: []
+  podAnnotations: {}
+  ## Additional pod labels
+  ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
+  podLabels: {}
+  # ttlSecondsAfterFinished: 120
+
+esRollover:
+  enabled: false
+  securityContext: {}
+  podSecurityContext:
+    runAsUser: 1000
+  annotations: {}
+  image:
+    registry: ""
+    repository: jaegertracing/jaeger-es-rollover
+    tag: ""
+    digest: ""
+    pullPolicy: IfNotPresent
+    pullSecrets: []
+  cmdlineParams: {}
+  extraEnv:
+    - name: CONDITIONS
+      value: '{"max_age": "1d"}'
+  schedule: "10 0 * * *"
+  successfulJobsHistoryLimit: 3
+  failedJobsHistoryLimit: 3
+  concurrencyPolicy: Forbid
+  resources:
+    {}
+    # limits:
+    #   cpu: 500m
+    #   memory: 512Mi
+    # requests:
+    #   cpu: 256m
+    #   memory: 128Mi
+  serviceAccount:
+    create: true
+    # Explicitly mounts the API credentials for the Service Account
+    automountServiceAccountToken: false
+    name:
+  nodeSelector: {}
+  tolerations: []
+  affinity: {}
+  extraSecretMounts: []
+  extraConfigmapMounts: []
+  podAnnotations: {}
+  ## Additional pod labels
+  ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
+  podLabels: {}
+  # ttlSecondsAfterFinished: 120
+  initHook:
+    extraEnv:
+      []
+      # - name: SHARDS
+      #   value: "3"
+    annotations: {}
+    podAnnotations: {}
+    podLabels: {}
+    ttlSecondsAfterFinished: 120
+
+esLookback:
+  enabled: false
+  securityContext: {}
+  podSecurityContext:
+    runAsUser: 1000
+  annotations: {}
+  image:
+    registry: ""
+    repository: jaegertracing/jaeger-es-rollover
+    tag: ""
+    digest: ""
+    pullPolicy: IfNotPresent
+    pullSecrets: []
+  cmdlineParams: {}
+  extraEnv:
+    - name: UNIT
+      value: days
+    - name: UNIT_COUNT
+      value: "7"
+  schedule: "5 0 * * *"
+  successfulJobsHistoryLimit: 3
+  failedJobsHistoryLimit: 3
+  concurrencyPolicy: Forbid
+  resources:
+    {}
+    # limits:
+    #   cpu: 500m
+    #   memory: 512Mi
+    # requests:
+    #   cpu: 256m
+    #   memory: 128Mi
+  serviceAccount:
+    create: true
+    annotations: {}
+    # Explicitly mounts the API credentials for the Service Account
+    automountServiceAccountToken: false
+    name:
+  nodeSelector: {}
+  tolerations: []
+  affinity: {}
+  extraSecretMounts: []
+  extraConfigmapMounts: []
+  podAnnotations: {}
+  ## Additional pod labels
+  ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
+  podLabels: {}
+  # ttlSecondsAfterFinished: 120
 # End: Default values for the various components of Jaeger

 hotrod:
@ -375,9 +993,24 @@ hotrod:
  podSecurityContext: {}
  securityContext: {}
  replicaCount: 1
+  # set the primary command(s) for the hotrod application
+  args:
+    - all
+  # add extra arguments to the hotrod application to customize tracing
+  extraArgs: []
+  #   - --otel-exporter=otlp
+  #   - --jaeger-ui=http://jaeger.chart.local
+  # add extra environment variables to the hotrod application
+  extraEnv: []
+  #   - name: OTEL_EXPORTER_OTLP_ENDPOINT
+  #     value: http://my-otel-collector.chart.local:4318
  image:
+    registry: ""
    repository: jaegertracing/example-hotrod
-    pullPolicy: Always
+    tag: ""
+    digest: ""
+    pullPolicy: IfNotPresent
+    pullSecrets: []
  service:
    annotations: {}
    name: hotrod
@ -387,10 +1020,14 @@ hotrod:
    port: 80
  ingress:
    enabled: false
+    # For Kubernetes >= 1.18 you should specify the ingress-controller via the field ingressClassName
+    # See https://kubernetes.io/blog/2020/04/02/improvements-to-the-ingress-api-in-kubernetes-1.18/#specifying-the-class-of-an-ingress
+    # ingressClassName: nginx
    # Used to create Ingress record (should be used with service.type: ClusterIP).
    hosts:
      - chart-example.local
-    annotations: {}
+    annotations:
+      {}
      # kubernetes.io/ingress.class: nginx
      # kubernetes.io/tls-acme: "true"
    tls:
@ -398,7 +1035,9 @@ hotrod:
      # - secretName: chart-example-tls
      #   hosts:
      #     - chart-example.local
-  resources: {}
+    pathType:
+  resources:
+    {}
    # We usually recommend not to specify default resources and to leave this as a conscious
    # choice for the user. This also increases chances charts run on environments with little
    # resources, such as Minikube. If you do want to specify resources, uncomment the following
@ -411,6 +1050,9 @@ hotrod:
    #   memory: 128Mi
  serviceAccount:
    create: true
+    # Explicitly mounts the API credentials for the Service Account
+    automountServiceAccountToken: false
+    annotations: {}
    name:
  nodeSelector: {}
  tolerations: []
@ -418,3 +1060,6 @@ hotrod:
  tracing:
    host: null
    port: 6831
+
+# Array with extra yaml objects to install alongside the chart. Values are evaluated as a template.
+extraObjects: []
--- a/ct.yaml
+++ b/ct.yaml
@ -3,6 +3,8 @@ remote: origin
 chart-dirs:
  - charts
 chart-repos:
-  - incubator=https://kubernetes-charts-incubator.storage.googleapis.com
+  - incubator=https://charts.helm.sh/incubator
  - elastic=https://helm.elastic.co
-helm-extra-args: --timeout=500
+  - bitnami=https://charts.bitnami.com/bitnami
+helm-extra-args: --timeout=600s
+target-branch: main