bump python version (#648)

Signed-off-by: Yuri Shkuro <yurishkuro@users.noreply.github.com>

.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

.github/workflows/lint-test.yaml

@@ -3,30 +3,29 @@ name: Lint and Test Charts
 on: pull_request
 
 jobs:
-  lint-test:
+  lint:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
+      - uses: actions/checkout@v2
-        uses: actions/checkout@v2
         with:
           fetch-depth: 0
 
       - name: Set up Helm
-        uses: azure/setup-helm@v1
+        uses: azure/setup-helm@v4
         with:
-          version: v3.4.1
+          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@v2
+        uses: actions/setup-python@v4
         with:
-          python-version: 3.7
+          python-version: '3.11'
 
       - name: Set up chart-testing
-        uses: helm/chart-testing-action@v2.0.1
+        uses: helm/chart-testing-action@v2.6.1
         with:
-          version: v3.3.0
+          version: v3.10.1
 
       - name: Run chart-testing (list-changed)
         id: list-changed
@@ -39,34 +38,52 @@ jobs:
       - name: Run chart-testing (lint)
         run: ct lint --config ct.yaml
 
-      - name: Create kind cluster
+  test-with-cassandra:
-        uses: helm/kind-action@v1.2.0
+    runs-on: ubuntu-latest
-        if: steps.list-changed.outputs.changed == 'true'
+    steps:
-
+      - uses: actions/checkout@v2
-      - name: Install kubectl
-        uses: azure/setup-kubectl@v2.0
         with:
-          version: 'v1.22.0'
+          fetch-depth: 0
-        id: install
 
-      - name: Set up cert-manager
+      - uses: ./.github/actions/prepare-k8s
-        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
+      - name: Run cassandra-chart-testing (install)
-        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
-        run: |
-          cmctl check api --wait=5m
-
-      - name: Run chart-testing (install)
         run: ct install --config ct.yaml
+  test-with-allInOne:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          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"

README.md

@@ -5,6 +5,11 @@
 
 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.

charts/jaeger-operator/COMPATIBILITY.md

@@ -2,6 +2,13 @@ The following table shows the compatibility of `Jaeger Operator helm chart` with
 
 | 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+      |

charts/jaeger-operator/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v1
 description: jaeger-operator Helm chart for Kubernetes
 name: jaeger-operator
-version: 2.43.0
+version: 2.57.0
-appVersion: 1.43.0
+appVersion: 1.61.0
 home: https://www.jaegertracing.io/
 icon: https://www.jaegertracing.io/img/jaeger-icon-reverse-color.svg
 sources:

charts/jaeger-operator/README.md

@@ -19,6 +19,7 @@ This chart bootstraps a jaeger-operator deployment on a [Kubernetes](http://kube
 - 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
@@ -54,27 +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                                                                | `{}`                            |
+| `serviceExtraLabels`        | Additional labels to jaeger-operator service                                                                | `{}`                            |
-| `extraLabels`              | Additional labels to jaeger-operator deployment                                                             | `{}`                            |
+| `extraLabels`               | Additional labels to jaeger-operator deployment                                                             | `{}`                            |
-| `image.repository`         | Controller container image repository                                                                       | `jaegertracing/jaeger-operator` |
+| `image.repository`          | Controller container image repository                                                                       | `jaegertracing/jaeger-operator` |
-| `image.tag`                | Controller container image tag                                                                              | `1.43.0`                        |
+| `image.tag`                 | Controller container image tag                                                                              | `1.61.0`                        |
-| `image.pullPolicy`         | Controller container image pull policy                                                                      | `IfNotPresent`                  |
+| `image.pullPolicy`          | Controller container image pull policy                                                                      | `IfNotPresent`                  |
-| `jaeger.create`            | Jaeger instance will be created                                                                             | `false`                         |
+| `jaeger.create`             | Jaeger instance will be created                                                                             | `false`                         |
-| `jaeger.spec`              | Jaeger instance specification                                                                               | `{}`                            |
+| `jaeger.spec`               | Jaeger instance specification                                                                               | `{}`                            |
-| `rbac.create`              | All required roles and rolebindings will be created                                                         | `true`                          |
+| `rbac.create`               | All required roles and rolebindings will be created                                                         | `true`                          |
-| `serviceAccount.create`    | Service account to use                                                                                      | `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.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`                         |
+| `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`                           |
+| `serviceAccount.name`       | Service account name to use. If not set and create is true, a name is generated using the fullname template | `nil`                           |
-| `extraEnv`                 | Additional environment variables passed to the operator. For example:   name: LOG-LEVEL   value: debug      | `[]`                            |
+| `extraArgs`                 | Additional command line arguments arguments passed to the operator                                          | `{}`                            |
-| `resources`                | K8s pod resources                                                                                           | `None`                          |
+| `extraEnv`                  | Additional environment variables passed to the operator. For example: name: LOG-LEVEL value: debug          | `[]`                            |
-| `nodeSelector`             | Node labels for pod assignment                                                                              | `{}`                            |
+| `replicaCount`              | Desired number of operator pods                                                                             | `1`                             |
-| `tolerations`              | Toleration labels for pod assignment                                                                        | `[]`                            |
+| `resources`                 | K8s pod resources                                                                                           | `None`                          |
-| `affinity`                 | Affinity settings for pod assignment                                                                        | `{}`                            |
+| `nodeSelector`              | Node labels for pod assignment                                                                              | `{}`                            |
-| `securityContext`          | Security context for pod                                                                                    | `{}`                            |
+| `tolerations`               | Toleration labels for pod assignment                                                                        | `[]`                            |
-| `containerSecurityContext` | Security context for the container                                                                          | `{}`                            |
+| `topologySpreadConstraints` | Topology Spread Constraints for pod assignment                                                              | `[]`                            |
-| `priorityClassName`        | Priority class name for the pod                                                                             | `None`                          |
+| `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.
 

charts/jaeger-operator/crds/crd.yaml

@@ -955,6 +955,18 @@ spec:
                   resources:
                     nullable: true
                     properties:
+                      claims:
+                        items:
+                          properties:
+                            name:
+                              type: string
+                          required:
+                          - name
+                          type: object
+                        type: array
+                        x-kubernetes-list-map-keys:
+                        - name
+                        x-kubernetes-list-type: map
                       limits:
                         additionalProperties:
                           anyOf:
@@ -1378,13 +1390,26 @@ spec:
                                           type: string
                                         name:
                                           type: string
+                                        namespace:
+                                          type: string
                                       required:
                                       - kind
                                       - name
                                       type: object
-                                      x-kubernetes-map-type: atomic
                                     resources:
                                       properties:
+                                        claims:
+                                          items:
+                                            properties:
+                                              name:
+                                                type: string
+                                            required:
+                                            - name
+                                            type: object
+                                          type: array
+                                          x-kubernetes-list-map-keys:
+                                          - name
+                                          x-kubernetes-list-type: map
                                         limits:
                                           additionalProperties:
                                             anyOf:
@@ -2395,9 +2420,23 @@ spec:
                   options:
                     type: object
                     x-kubernetes-preserve-unknown-fields: true
+                  priorityClassName:
+                    type: string
                   resources:
                     nullable: true
                     properties:
+                      claims:
+                        items:
+                          properties:
+                            name:
+                              type: string
+                          required:
+                          - name
+                          type: object
+                        type: array
+                        x-kubernetes-list-map-keys:
+                        - name
+                        x-kubernetes-list-type: map
                       limits:
                         additionalProperties:
                           anyOf:
@@ -2778,13 +2817,26 @@ spec:
                                           type: string
                                         name:
                                           type: string
+                                        namespace:
+                                          type: string
                                       required:
                                       - kind
                                       - name
                                       type: object
-                                      x-kubernetes-map-type: atomic
                                     resources:
                                       properties:
+                                        claims:
+                                          items:
+                                            properties:
+                                              name:
+                                                type: string
+                                            required:
+                                            - name
+                                            type: object
+                                          type: array
+                                          x-kubernetes-list-map-keys:
+                                          - name
+                                          x-kubernetes-list-type: map
                                         limits:
                                           additionalProperties:
                                             anyOf:
@@ -3802,6 +3854,11 @@ spec:
                   minReplicas:
                     format: int32
                     type: integer
+                  nodeSelector:
+                    additionalProperties:
+                      type: string
+                    nullable: true
+                    type: object
                   options:
                     type: object
                     x-kubernetes-preserve-unknown-fields: true
@@ -3813,6 +3870,18 @@ spec:
                   resources:
                     nullable: true
                     properties:
+                      claims:
+                        items:
+                          properties:
+                            name:
+                              type: string
+                          required:
+                          - name
+                          type: object
+                        type: array
+                        x-kubernetes-list-map-keys:
+                        - name
+                        x-kubernetes-list-type: map
                       limits:
                         additionalProperties:
                           anyOf:
@@ -4193,13 +4262,26 @@ spec:
                                           type: string
                                         name:
                                           type: string
+                                        namespace:
+                                          type: string
                                       required:
                                       - kind
                                       - name
                                       type: object
-                                      x-kubernetes-map-type: atomic
                                     resources:
                                       properties:
+                                        claims:
+                                          items:
+                                            properties:
+                                              name:
+                                                type: string
+                                            required:
+                                            - name
+                                            type: object
+                                          type: array
+                                          x-kubernetes-list-map-keys:
+                                          - name
+                                          x-kubernetes-list-type: map
                                         limits:
                                           additionalProperties:
                                             anyOf:
@@ -5284,6 +5366,11 @@ spec:
                   minReplicas:
                     format: int32
                     type: integer
+                  nodeSelector:
+                    additionalProperties:
+                      type: string
+                    nullable: true
+                    type: object
                   options:
                     type: object
                     x-kubernetes-preserve-unknown-fields: true
@@ -5293,6 +5380,18 @@ spec:
                   resources:
                     nullable: true
                     properties:
+                      claims:
+                        items:
+                          properties:
+                            name:
+                              type: string
+                          required:
+                          - name
+                          type: object
+                        type: array
+                        x-kubernetes-list-map-keys:
+                        - name
+                        x-kubernetes-list-type: map
                       limits:
                         additionalProperties:
                           anyOf:
@@ -5671,13 +5770,26 @@ spec:
                                           type: string
                                         name:
                                           type: string
+                                        namespace:
+                                          type: string
                                       required:
                                       - kind
                                       - name
                                       type: object
-                                      x-kubernetes-map-type: atomic
                                     resources:
                                       properties:
+                                        claims:
+                                          items:
+                                            properties:
+                                              name:
+                                                type: string
+                                            required:
+                                            - name
+                                            type: object
+                                          type: array
+                                          x-kubernetes-list-map-keys:
+                                          - name
+                                          x-kubernetes-list-type: map
                                         limits:
                                           additionalProperties:
                                             anyOf:
@@ -6703,6 +6815,18 @@ spec:
                   resources:
                     nullable: true
                     properties:
+                      claims:
+                        items:
+                          properties:
+                            name:
+                              type: string
+                          required:
+                          - name
+                          type: object
+                        type: array
+                        x-kubernetes-list-map-keys:
+                        - name
+                        x-kubernetes-list-type: map
                       limits:
                         additionalProperties:
                           anyOf:
@@ -7080,13 +7204,26 @@ spec:
                                           type: string
                                         name:
                                           type: string
+                                        namespace:
+                                          type: string
                                       required:
                                       - kind
                                       - name
                                       type: object
-                                      x-kubernetes-map-type: atomic
                                     resources:
                                       properties:
+                                        claims:
+                                          items:
+                                            properties:
+                                              name:
+                                                type: string
+                                            required:
+                                            - name
+                                            type: object
+                                          type: array
+                                          x-kubernetes-list-map-keys:
+                                          - name
+                                          x-kubernetes-list-type: map
                                         limits:
                                           additionalProperties:
                                             anyOf:
@@ -8179,6 +8316,11 @@ spec:
                   nodePort:
                     format: int32
                     type: integer
+                  nodeSelector:
+                    additionalProperties:
+                      type: string
+                    nullable: true
+                    type: object
                   options:
                     type: object
                     x-kubernetes-preserve-unknown-fields: true
@@ -8190,6 +8332,18 @@ spec:
                   resources:
                     nullable: true
                     properties:
+                      claims:
+                        items:
+                          properties:
+                            name:
+                              type: string
+                          required:
+                          - name
+                          type: object
+                        type: array
+                        x-kubernetes-list-map-keys:
+                        - name
+                        x-kubernetes-list-type: map
                       limits:
                         additionalProperties:
                           anyOf:
@@ -8572,13 +8726,26 @@ spec:
                                           type: string
                                         name:
                                           type: string
+                                        namespace:
+                                          type: string
                                       required:
                                       - kind
                                       - name
                                       type: object
-                                      x-kubernetes-map-type: atomic
                                     resources:
                                       properties:
+                                        claims:
+                                          items:
+                                            properties:
+                                              name:
+                                                type: string
+                                            required:
+                                            - name
+                                            type: object
+                                          type: array
+                                          x-kubernetes-list-map-keys:
+                                          - name
+                                          x-kubernetes-list-type: map
                                         limits:
                                           additionalProperties:
                                             anyOf:
@@ -9053,6 +9220,18 @@ spec:
               resources:
                 nullable: true
                 properties:
+                  claims:
+                    items:
+                      properties:
+                        name:
+                          type: string
+                      required:
+                      - name
+                      type: object
+                    type: array
+                    x-kubernetes-list-map-keys:
+                    - name
+                    x-kubernetes-list-type: map
                   limits:
                     additionalProperties:
                       anyOf:
@@ -10073,6 +10252,18 @@ spec:
                       resources:
                         nullable: true
                         properties:
+                          claims:
+                            items:
+                              properties:
+                                name:
+                                  type: string
+                              required:
+                              - name
+                              type: object
+                            type: array
+                            x-kubernetes-list-map-keys:
+                            - name
+                            x-kubernetes-list-type: map
                           limits:
                             additionalProperties:
                               anyOf:
@@ -10443,13 +10634,26 @@ spec:
                                               type: string
                                             name:
                                               type: string
+                                            namespace:
+                                              type: string
                                           required:
                                           - kind
                                           - name
                                           type: object
-                                          x-kubernetes-map-type: atomic
                                         resources:
                                           properties:
+                                            claims:
+                                              items:
+                                                properties:
+                                                  name:
+                                                    type: string
+                                                required:
+                                                - name
+                                                type: object
+                                              type: array
+                                              x-kubernetes-list-map-keys:
+                                              - name
+                                              x-kubernetes-list-type: map
                                             limits:
                                               additionalProperties:
                                                 anyOf:
@@ -10938,6 +11142,18 @@ spec:
                         type: object
                       proxyResources:
                         properties:
+                          claims:
+                            items:
+                              properties:
+                                name:
+                                  type: string
+                              required:
+                              - name
+                              type: object
+                            type: array
+                            x-kubernetes-list-map-keys:
+                            - name
+                            x-kubernetes-list-type: map
                           limits:
                             additionalProperties:
                               anyOf:
@@ -10964,6 +11180,18 @@ spec:
                         type: string
                       resources:
                         properties:
+                          claims:
+                            items:
+                              properties:
+                                name:
+                                  type: string
+                              required:
+                              - name
+                              type: object
+                            type: array
+                            x-kubernetes-list-map-keys:
+                            - name
+                            x-kubernetes-list-type: map
                           limits:
                             additionalProperties:
                               anyOf:
@@ -11552,6 +11780,18 @@ spec:
                       resources:
                         nullable: true
                         properties:
+                          claims:
+                            items:
+                              properties:
+                                name:
+                                  type: string
+                              required:
+                              - name
+                              type: object
+                            type: array
+                            x-kubernetes-list-map-keys:
+                            - name
+                            x-kubernetes-list-type: map
                           limits:
                             additionalProperties:
                               anyOf:
@@ -11920,13 +12160,26 @@ spec:
                                               type: string
                                             name:
                                               type: string
+                                            namespace:
+                                              type: string
                                           required:
                                           - kind
                                           - name
                                           type: object
-                                          x-kubernetes-map-type: atomic
                                         resources:
                                           properties:
+                                            claims:
+                                              items:
+                                                properties:
+                                                  name:
+                                                    type: string
+                                                required:
+                                                - name
+                                                type: object
+                                              type: array
+                                              x-kubernetes-list-map-keys:
+                                              - name
+                                              x-kubernetes-list-type: map
                                             limits:
                                               additionalProperties:
                                                 anyOf:
@@ -12936,6 +13189,18 @@ spec:
                       resources:
                         nullable: true
                         properties:
+                          claims:
+                            items:
+                              properties:
+                                name:
+                                  type: string
+                              required:
+                              - name
+                              type: object
+                            type: array
+                            x-kubernetes-list-map-keys:
+                            - name
+                            x-kubernetes-list-type: map
                           limits:
                             additionalProperties:
                               anyOf:
@@ -13304,13 +13569,26 @@ spec:
                                               type: string
                                             name:
                                               type: string
+                                            namespace:
+                                              type: string
                                           required:
                                           - kind
                                           - name
                                           type: object
-                                          x-kubernetes-map-type: atomic
                                         resources:
                                           properties:
+                                            claims:
+                                              items:
+                                                properties:
+                                                  name:
+                                                    type: string
+                                                required:
+                                                - name
+                                                type: object
+                                              type: array
+                                              x-kubernetes-list-map-keys:
+                                              - name
+                                              x-kubernetes-list-type: map
                                             limits:
                                               additionalProperties:
                                                 anyOf:
@@ -14080,13 +14358,26 @@ spec:
                                       type: string
                                     name:
                                       type: string
+                                    namespace:
+                                      type: string
                                   required:
                                   - kind
                                   - name
                                   type: object
-                                  x-kubernetes-map-type: atomic
                                 resources:
                                   properties:
+                                    claims:
+                                      items:
+                                        properties:
+                                          name:
+                                            type: string
+                                        required:
+                                        - name
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-map-keys:
+                                      - name
+                                      x-kubernetes-list-type: map
                                     limits:
                                       additionalProperties:
                                         anyOf:

charts/jaeger-operator/templates/deployment.yaml

@@ -9,7 +9,7 @@ metadata:
 {{ . | toYaml | indent 4 }}
 {{- end }}
 spec:
-  replicas: 1
+  replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
 {{ include "jaeger-operator.labels" . | indent 6 }}
@@ -55,7 +55,21 @@ spec:
           - mountPath: /tmp/k8s-webhook-server/serving-certs
             name: cert
             readOnly: true
-          args: ["start"]
+          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 }}
@@ -99,5 +113,9 @@ spec:
     {{- end }}
     {{- with .Values.tolerations }}
       tolerations:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.topologySpreadConstraints }}
+      topologySpreadConstraints:
 {{ toYaml . | indent 8 }}
     {{- end }}

charts/jaeger-operator/templates/role.yaml

@@ -233,6 +233,13 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - networking.k8s.io
+  resources:
+  - ingressclasses
+  verbs:
+  - list
+  - watch
 - apiGroups:
   - rbac.authorization.k8s.io
   resources:

charts/jaeger-operator/values.yaml

@@ -4,7 +4,7 @@
 
 image:
   repository: jaegertracing/jaeger-operator
-  tag: 1.43.0
+  tag: 1.61.0
   pullPolicy: IfNotPresent
   imagePullSecrets: []
 
@@ -61,6 +61,10 @@ serviceAccount:
   # 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:
@@ -75,6 +79,9 @@ extraLabels: {}
   # Specifies extra labels for the operator deployment:
   # foo: bar
 
+# Specifies desired number of operator pods
+replicaCount: 1
+
 resources: {}
   # limits:
   #  cpu: 100m
@@ -87,6 +94,8 @@ nodeSelector: {}
 
 tolerations: []
 
+topologySpreadConstraints: []
+
 affinity: {}
 
 securityContext: {}

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"

charts/jaeger/Chart.yaml

@@ -1,18 +1,18 @@
 apiVersion: v2
-appVersion: 1.42.0
+appVersion: 1.53.0
 description: A Jaeger Helm chart for Kubernetes
 name: jaeger
 type: application
-version: 0.69.1
+version: 3.4.1
 # CronJobs require v1.21
-kubeVersion: '>= 1.21-0'
+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:
@@ -26,19 +26,21 @@ maintainers:
     email: naseem@transit.app
   - name: pavelnikolov
     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: ^7.11.1
+    version: 20.0.4
-    repository: https://helm.elastic.co
+    repository: https://charts.bitnami.com/bitnami
     condition: provisionDataStore.elasticsearch
   - name: kafka
-    version: ^19.1.5
+    version: 26.6.2
     repository: https://charts.bitnami.com/bitnami
     condition: provisionDataStore.kafka
   - name: common
     repository: https://charts.bitnami.com/bitnami
-    version: 1.16.0
+    version: 2.x.x

charts/jaeger/README.md

@@ -56,7 +56,7 @@ helm show values incubator/cassandra
 ```
 
 ```console
-helm repo add bitnami
+helm repo add bitnami https://charts.bitnami.com/bitnami
 helm show values bitnami/kafka
 ```
 
@@ -302,7 +302,7 @@ provisionDataStore:
 allInOne:
   enabled: true
 storage:
-  type: none
+  type: memory
 agent:
   enabled: false
 collector:
@@ -311,7 +311,7 @@ query:
   enabled: false
 ```
 
-It's possible to specify resources and extra environment variables for the all in one deployment:
+It's possible to specify resources, extra environment variables, and extra secrets for the all in one deployment:
 
 ```yaml
 allInOne:
@@ -325,6 +325,12 @@ allInOne:
     requests:
       cpu: 256m
       memory: 128Mi
+  extraSecretMounts:
+    - name: jaeger-tls
+      mountPath: /tls
+      subPath: ""
+      secretName: jaeger-tls
+      readOnly: true
 ```
 
 ```bash
@@ -345,7 +351,11 @@ query:
   enabled: true
   oAuthSidecar:
     enabled: true
-    image: quay.io/oauth2-proxy/oauth2-proxy:v7.3.0
+    resources: {}
+    image:
+      registry: quay.io
+      repository: oauth2-proxy/oauth2-proxy
+      tag: v7.6.0
     pullPolicy: IfNotPresent
     containerPort: 4180
     args:
@@ -389,7 +399,7 @@ extraObjects:
   - apiVersion: rbac.authorization.k8s.io/v1
     kind: RoleBinding
     metadata:
-      name: {{ .Release.Name }}-someRoleBinding
+      name: "{{ .Release.Name }}-someRoleBinding"
     roleRef:
       apiGroup: rbac.authorization.k8s.io
       kind: Role
@@ -398,3 +408,45 @@ extraObjects:
       - 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.

charts/jaeger/templates/_helpers.tpl

@@ -31,13 +31,6 @@ Create chart name and version as used by the chart label.
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
-{{/*
-Create image tag value which defaults to .Chart.AppVersion.
-*/}}
-{{- define "jaeger.image.tag" -}}
-{{- .Values.tag | default .Chart.AppVersion }}
-{{- end -}}
-
 {{/*
 Common labels
 */}}
@@ -275,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" -}}
@@ -365,7 +362,7 @@ Elasticsearch related environment variables
 - name: ES_TLS_ENABLED
   value: "true"
 - name: ES_TLS_CA
-  value: /es-tls/ca-cert.pem
+  value: {{ .Values.storage.elasticsearch.tls.ca }}
 {{- end }}
 {{- if .Values.storage.elasticsearch.indexPrefix }}
 - name: ES_INDEX_PREFIX
@@ -390,15 +387,46 @@ grpcPlugin related environment variables
 {{- end -}}
 
 {{/*
-Cassandra, Elasticsearch, or grpc-plugin related environment variables depending on which is used
+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 eq .Values.storage.type "grpc-plugin" -}}
+{{- 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 -}}
 
@@ -523,3 +551,187 @@ spec:
   {{- 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 }}

charts/jaeger/templates/agent-ds.yaml

@@ -42,10 +42,7 @@ spec:
       priorityClassName: {{ . }}
       {{- end }}
       serviceAccountName: {{ template "jaeger.agent.serviceAccountName" . }}
-      {{- with .Values.agent.imagePullSecrets }}
+      {{- include "agent.imagePullSecrets" . | nindent 6 }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
       {{- if .Values.agent.initContainers }}
       initContainers:
         {{- toYaml .Values.agent.initContainers | nindent 8 }}
@@ -54,8 +51,8 @@ spec:
       - name: {{ template "jaeger.agent.name" . }}
         securityContext:
           {{- toYaml .Values.agent.securityContext | nindent 10 }}
-        image: {{ .Values.agent.image }}:{{- .Values.agent.tag | default (include "jaeger.image.tag" .) }}
+        image: {{ include "agent.image" . }}
-        imagePullPolicy: {{ .Values.agent.pullPolicy }}
+        imagePullPolicy: {{ .Values.agent.image.pullPolicy }}
         args:
           {{ include "extra.cmdArgs" ( dict "cmdlineParams" .Values.agent.cmdlineParams ) | nindent 10  }}
         env:
@@ -66,6 +63,9 @@ spec:
           - name: REPORTER_GRPC_HOST_PORT
             value: {{ include "jaeger.collector.name" . }}:{{ .Values.collector.service.grpc.port }}
         {{- end }}
+      {{- with .Values.agent.envFrom }}
+        envFrom: {{- toYaml . | nindent 10 }}
+      {{- end }}
         ports:
         - name: zipkin-compact
           containerPort: {{ .Values.agent.service.zipkinThriftPort }}

charts/jaeger/templates/allinone-collector-svc.yaml

@@ -7,26 +7,41 @@ metadata:
     {{- include "jaeger.labels" . | nindent 4 }}
     app.kubernetes.io/component: service-collector
 spec:
-  clusterIP: None
+  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
-    - name: otlp-grpc
+      {{- if semverCompare ">=1.20" .Capabilities.KubeVersion.Version }}
+      appProtocol: http
+      {{- end }}
+    - name: {{ .Values.allInOne.service.collector.otlp.grpc.name }}
       port: 4317
       targetPort: 0
-    - name: otlp-http
+      {{- 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

charts/jaeger/templates/allinone-deploy.yaml

@@ -9,7 +9,9 @@ metadata:
     prometheus.io/port: "14269"
     prometheus.io/scrape: "true"
 spec:
-  replicas: 1
+  {{- if hasKey .Values.allInOne "replicas" }}
+  replicas: {{ .Values.allInOne.replicas }}
+  {{- end }}
   strategy:
     type: Recreate
   selector:
@@ -28,13 +30,15 @@ spec:
         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: memory
+              value: {{ .Values.storage.type }}
+            {{- include "storage.env" . | nindent 12 }}
             - name: COLLECTOR_ZIPKIN_HOST_PORT
               value: :9411
             - name: JAEGER_DISABLED
@@ -45,8 +49,13 @@ spec:
             - name: SAMPLING_STRATEGIES_FILE
               value: /etc/conf/strategies.json
             {{- end }}
-          image: {{ .Values.allInOne.image }}:{{- .Values.allInOne.tag | default (include "jaeger.image.tag" .) }}
+        {{- with .Values.allInOne.envFrom }}
-          imagePullPolicy: {{ .Values.allInOne.pullPolicy }}
+          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 }}
@@ -95,21 +104,54 @@ spec:
           resources:
         {{- toYaml . | nindent 12 }}
       {{- end }}
-
-        {{- if .Values.allInOne.samplingConfig}}
           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" . }}
-    {{- if .Values.allInOne.samplingConfig}}
       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 -}}

charts/jaeger/templates/allinone-sa.yaml

@@ -6,4 +6,9 @@ metadata:
   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 -}}

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

@@ -29,14 +29,11 @@ spec:
       securityContext:
         {{- toYaml .Values.schema.podSecurityContext | nindent 8 }}
       serviceAccountName: {{ template "jaeger.cassandraSchema.serviceAccountName" . }}
-      {{- with .Values.schema.imagePullSecrets }}
+      {{- include "schema.imagePullSecrets" . | nindent 6 }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
       containers:
       - name: {{ include "jaeger.fullname" . }}-cassandra-schema
-        image: {{ .Values.schema.image }}:{{- include "jaeger.image.tag" . }}
+        image: {{ include "schema.image" . }}
-        imagePullPolicy: {{ .Values.schema.pullPolicy }}
+        imagePullPolicy: {{ .Values.schema.image.pullPolicy }}
         securityContext:
           {{- toYaml .Values.schema.securityContext | nindent 10 }}
         env:
@@ -99,6 +96,14 @@ spec:
           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 -}}

charts/jaeger/templates/collector-deploy.yaml

@@ -32,16 +32,27 @@ spec:
         {{- 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 | nindent 8 }}
       serviceAccountName: {{ template "jaeger.collector.serviceAccountName" . }}
-      {{- with .Values.collector.imagePullSecrets }}
+      {{- include "collector.imagePullSecrets" . | nindent 6 }} 
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
       {{- if .Values.collector.initContainers }}
       initContainers:
         {{- toYaml .Values.collector.initContainers | nindent 8 }}
@@ -50,8 +61,8 @@ spec:
       - name: {{ template "jaeger.collector.name" . }}
         securityContext:
           {{- toYaml .Values.collector.securityContext | nindent 10 }}
-        image: {{ .Values.collector.image }}:{{- .Values.collector.tag | default (include "jaeger.image.tag" .) }}
+        image: {{ include "collector.image" . }}
-        imagePullPolicy: {{ .Values.collector.pullPolicy }}
+        imagePullPolicy: {{ .Values.collector.image.pullPolicy }}
         args:
           {{ include "extra.cmdArgs" ( dict "cmdlineParams" .Values.collector.cmdlineParams ) | nindent 10  }}
           {{- if not .Values.ingester.enabled -}}
@@ -68,7 +79,6 @@ spec:
           {{- if or .Values.collector.service.otlp.grpc .Values.collector.service.otlp.http }}
           - name: COLLECTOR_OTLP_ENABLED
             value: "true"
-          {{- end }}
           {{- 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 }}
@@ -77,6 +87,7 @@ spec:
           - name: COLLECTOR_OTLP_HTTP_HOST_PORT
             value: {{ .Values.collector.service.otlp.http.port | quote }}
           {{- end }}
+          {{- end }}
           {{- if .Values.ingester.enabled }}
           - name: SPAN_STORAGE_TYPE
             value: kafka
@@ -102,6 +113,9 @@ spec:
           - name: SAMPLING_STRATEGIES_FILE
             value: /etc/conf/strategies.json
           {{- end }}
+      {{- with .Values.collector.envFrom }}
+        envFrom: {{- toYaml . | nindent 10 }}
+      {{- end }}
         ports:
         - containerPort: {{ .Values.collector.service.grpc.port }}
           name: grpc
@@ -119,10 +133,10 @@ spec:
         {{- end }}
         {{- if or .Values.collector.service.otlp.grpc .Values.collector.service.otlp.http }}
         - containerPort: {{ default 4317 .Values.collector.service.otlp.grpc.port }}
-          name: otlp-grpc
+          name: {{ .Values.collector.service.otlp.grpc.name }}
           protocol: TCP
         - containerPort: {{ default 4318 .Values.collector.service.otlp.http.port }}
-          name: otlp-http
+          name: {{ .Values.collector.service.otlp.http.name }}
           protocol: TCP
         {{- end }}
         readinessProbe:
@@ -164,8 +178,8 @@ spec:
         {{- end }}
         {{- if .Values.storage.elasticsearch.tls.enabled }}
           - name: {{ .Values.storage.elasticsearch.tls.secretName }}
-            mountPath: "/es-tls/ca-cert.pem"
+            mountPath: {{ .Values.storage.elasticsearch.tls.mountPath }}
-            subPath: "ca-cert.pem"
+            subPath: {{ .Values.storage.elasticsearch.tls.subPath }}
             readOnly: true
         {{- end }}
         {{- if .Values.collector.samplingConfig}}
@@ -208,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 }}

charts/jaeger/templates/collector-hpa.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.collector.autoscaling.enabled }}
+{{- if and .Values.collector.enabled .Values.collector.autoscaling.enabled }}
 apiVersion: {{ include "common.capabilities.hpa.apiVersion" ( dict "context" $ ) }}
 kind: HorizontalPodAutoscaler
 metadata:

charts/jaeger/templates/collector-ing.yaml

@@ -22,7 +22,7 @@ spec:
   {{- end }}
   rules:
     {{- range .Values.collector.ingress.hosts }}
-    - host: {{ include "jaeger.collector.ingressHost" . }}
+    - host: {{ include "jaeger.collector.ingressHost" . | quote }}
       http:
         paths:
           - path: {{ $basePath }}

charts/jaeger/templates/collector-svc.yaml

@@ -19,6 +19,9 @@ spec:
 {{- end }}
     protocol: TCP
     targetPort: grpc
+    {{- if semverCompare ">=1.20" .Capabilities.KubeVersion.Version }}
+    appProtocol: grpc
+    {{- end }}
   - name: http
     port: {{ .Values.collector.service.http.port }}
 {{- if and (eq .Values.collector.service.type "NodePort") (.Values.collector.service.http.nodePort) }}
@@ -26,6 +29,9 @@ spec:
 {{- end }}
     protocol: TCP
     targetPort: http
+    {{- if semverCompare ">=1.20" .Capabilities.KubeVersion.Version }}
+    appProtocol: http
+    {{- end }}
 {{- if .Values.collector.service.zipkin }}
   - name: zipkin
     port: {{ .Values.collector.service.zipkin.port }}
@@ -34,26 +40,29 @@ spec:
 {{- 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: otlp-grpc
+  - 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: otlp-grpc
+    targetPort: {{ .Values.collector.service.otlp.grpc.name }}
-  - name: otlp-http
+  - 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: otlp-http
+    targetPort: {{ .Values.collector.service.otlp.http.name }}
 {{- end }}
-  - name: admin
+  - name: {{ .Values.collector.service.admin.name }}
     port: 14269
-    targetPort: admin
+    targetPort: {{ .Values.collector.service.admin.targetPort }}
   selector:
     {{- include "jaeger.selectorLabels" . | nindent 4 }}
     app.kubernetes.io/component: collector
@@ -61,5 +70,8 @@ spec:
   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 -}}

charts/jaeger/templates/es-index-cleaner-cronjob.yaml

@@ -38,18 +38,15 @@ spec:
             {{- end }}
         spec:
           serviceAccountName: {{ template "jaeger.esIndexCleaner.serviceAccountName" . }}
-          {{- with .Values.esIndexCleaner.imagePullSecrets }}
+          {{- include "esIndexCleaner.imagePullSecrets" . | nindent 10 }}
-          imagePullSecrets:
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
           securityContext:
             {{- toYaml .Values.esIndexCleaner.podSecurityContext | nindent 12 }}
           containers:
           - name: {{ include "jaeger.fullname" . }}-es-index-cleaner
             securityContext:
               {{- toYaml .Values.esIndexCleaner.securityContext | nindent 14 }}
-            image: {{ .Values.esIndexCleaner.image }}:{{- .Values.esIndexCleaner.tag | default (include "jaeger.image.tag" .) }}
+            image: {{ include "esIndexCleaner.image" . }}
-            imagePullPolicy: {{ .Values.esIndexCleaner.pullPolicy }}
+            imagePullPolicy: {{ .Values.esIndexCleaner.image.pullPolicy }}
             args:
               - {{ .Values.esIndexCleaner.numberOfDays | quote }}
               - {{ include "elasticsearch.client.url" . }}
@@ -76,8 +73,8 @@ spec:
             {{- end }}
             {{- if .Values.storage.elasticsearch.tls.enabled }}
               - name: {{ .Values.storage.elasticsearch.tls.secretName }}
-                mountPath: "/es-tls/ca-cert.pem"
+                mountPath: {{ .Values.storage.elasticsearch.tls.mountPath }}
-                subPath: "ca-cert.pem"
+                subPath: {{ .Values.storage.elasticsearch.tls.subPath }}
                 readOnly: true
             {{- end }}
           restartPolicy: OnFailure

charts/jaeger/templates/es-index-cleaner-sa.yaml

@@ -6,5 +6,9 @@ metadata:
   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 -}}

charts/jaeger/templates/es-lookback-cronjob.yaml

@@ -38,10 +38,7 @@ spec:
             {{- end }}
         spec:
           serviceAccountName: {{ template "jaeger.esLookback.serviceAccountName" . }}
-          {{- with .Values.esLookback.imagePullSecrets }}
+          {{- include "esLookback.imagePullSecrets" . | nindent 10 }}  
-          imagePullSecrets:
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
           securityContext:
             {{- toYaml .Values.esLookback.podSecurityContext | nindent 12 }}
           restartPolicy: OnFailure
@@ -62,8 +59,8 @@ spec:
           - name: {{ include "jaeger.fullname" . }}-es-lookback
             securityContext:
               {{- toYaml .Values.esLookback.securityContext | nindent 14 }}
-            image: "{{ .Values.esLookback.image }}:{{- include "jaeger.image.tag" . }}"
+            image: {{ include "esLookback.image" . }}
-            imagePullPolicy: {{ .Values.esLookback.pullPolicy }}
+            imagePullPolicy: {{ .Values.esLookback.image.pullPolicy }}
             args:
               - lookback
               - {{ include "elasticsearch.client.url" . }}
@@ -90,8 +87,8 @@ spec:
             {{- end }}
             {{- if .Values.storage.elasticsearch.tls.enabled }}
               - name: {{ .Values.storage.elasticsearch.tls.secretName }}
-                mountPath: "/es-tls/ca-cert.pem"
+                mountPath: {{ .Values.storage.elasticsearch.tls.mountPath }}
-                subPath: "ca-cert.pem"
+                subPath: {{ .Values.storage.elasticsearch.tls.subPath }}
                 readOnly: true
             {{- end }}
           volumes:

charts/jaeger/templates/es-lookback-sa.yaml

@@ -6,5 +6,9 @@ metadata:
   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 -}}

charts/jaeger/templates/es-rollover-cronjob.yaml

@@ -38,10 +38,7 @@ spec:
             {{- end }}
         spec:
           serviceAccountName: {{ template "jaeger.esRollover.serviceAccountName" . }}
-          {{- with .Values.esRollover.imagePullSecrets }}
+          {{- include "esRollover.imagePullSecrets" . | nindent 10 }}
-          imagePullSecrets:
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
           securityContext:
             {{- toYaml .Values.esRollover.podSecurityContext | nindent 12 }}
           restartPolicy: OnFailure
@@ -62,8 +59,8 @@ spec:
           - name: {{ include "jaeger.fullname" . }}-es-rollover
             securityContext:
               {{- toYaml .Values.esRollover.securityContext | nindent 14 }}
-            image: "{{ .Values.esRollover.image }}:{{- include "jaeger.image.tag" . }}"
+            image: {{ include "esRollover.image" . }}
-            imagePullPolicy: {{ .Values.esRollover.pullPolicy }}
+            imagePullPolicy: {{ .Values.esRollover.image.pullPolicy }}
             args:
               - rollover
               - {{ include "elasticsearch.client.url" . }}
@@ -90,8 +87,8 @@ spec:
             {{- end }}
             {{- if .Values.storage.elasticsearch.tls.enabled }}
               - name: {{ .Values.storage.elasticsearch.tls.secretName }}
-                mountPath: "/es-tls/ca-cert.pem"
+                mountPath: {{ .Values.storage.elasticsearch.tls.mountPath }}
-                subPath: "ca-cert.pem"
+                subPath: {{ .Values.storage.elasticsearch.tls.subPath }}
                 readOnly: true
             {{- end }}
           volumes:

charts/jaeger/templates/es-rollover-hook.yml

@@ -33,9 +33,7 @@ spec:
         {{- end }}
     spec:
       serviceAccountName: {{ template "jaeger.esRollover.serviceAccountName" . }}
-      {{- with .Values.esRollover.imagePullSecrets }}
+      {{- include "esRollover.imagePullSecrets" . | nindent 6 }}
-      imagePullSecrets: {{- toYaml . | nindent 8 }}
-      {{- end }}
       securityContext: {{- toYaml .Values.esRollover.podSecurityContext | nindent 8 }}
       restartPolicy: OnFailure
       {{- with .Values.esRollover.nodeSelector }}
@@ -51,8 +49,8 @@ spec:
       containers:
         - name: {{ include "jaeger.fullname" . }}-es-rollover-init
           securityContext: {{- toYaml .Values.esRollover.securityContext | nindent 12 }}
-          image: "{{ .Values.esRollover.image }}:{{ .Values.esRollover.tag }}"
+          image: {{ include "esRollover.image" . }}
-          imagePullPolicy: {{ .Values.esRollover.pullPolicy }}
+          imagePullPolicy: {{ .Values.esRollover.image.pullPolicy }}
           args:
             - init
             - {{ include "elasticsearch.client.url" . }}
@@ -76,6 +74,12 @@ spec:
               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 }}
@@ -87,4 +91,9 @@ spec:
           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 -}}

charts/jaeger/templates/hotrod-deploy.yaml

@@ -21,21 +21,26 @@ spec:
       securityContext:
         {{- toYaml .Values.hotrod.podSecurityContext | nindent 8 }}
       serviceAccountName: {{ template "jaeger.hotrod.serviceAccountName" . }}
-      {{- with .Values.hotrod.image.pullSecrets }}
+      {{- include "hotrod.imagePullSecrets" . | nindent 6 }}  
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
       containers:
         - name: {{ include "jaeger.fullname" . }}-hotrod
           securityContext:
             {{- toYaml .Values.hotrod.securityContext | nindent 12 }}
-          image: {{ .Values.hotrod.image.repository }}:{{- include "jaeger.image.tag" . }}
+          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

charts/jaeger/templates/hotrod-ing.yaml

@@ -20,7 +20,7 @@ spec:
   {{- end }}
   rules:
     {{- range $host := .Values.hotrod.ingress.hosts }}
-    - host: {{ $host }}
+    - host: {{ $host | quote}}
       http:
         paths:
           - path: /

charts/jaeger/templates/hotrod-sa.yaml

@@ -6,5 +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 -}}

charts/jaeger/templates/ingester-deploy.yaml

@@ -34,10 +34,7 @@ spec:
       serviceAccountName: {{ include "jaeger.ingester.serviceAccountName" . }}
       securityContext:
         {{- toYaml .Values.ingester.podSecurityContext | nindent 8 }}
-      {{- with .Values.ingester.imagePullSecrets }}
+      {{- include "ingester.imagePullSecrets" . | nindent 6 }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
       {{- with .Values.ingester.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
@@ -46,16 +43,24 @@ spec:
       affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.ingester.topologySpreadConstraints }}
+        topologySpreadConstraints:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       {{- with .Values.ingester.tolerations }}
       tolerations:
         {{- 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 | nindent 10 }}
-        image: {{ .Values.ingester.image }}:{{- include "jaeger.image.tag" . }}
+        image: {{ include "ingester.image" . }}
-        imagePullPolicy: {{ .Values.ingester.pullPolicy }}
+        imagePullPolicy: {{ .Values.ingester.image.pullPolicy }}
         args:
           {{ include "extra.cmdArgs" ( dict "cmdlineParams" .Values.ingester.cmdlineParams ) | nindent 10  }}
           {{- include "storage.cmdArgs" . | nindent 10 }}
@@ -66,12 +71,21 @@ spec:
           - name: SPAN_STORAGE_TYPE
             value: {{ .Values.storage.type }}
           {{- include "storage.env" . | nindent 10 }}
+          {{ if .Values.storage.kafka.brokers }}
           - name: KAFKA_CONSUMER_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 }}
+          {{- end }}
+          {{ 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
           name: admin

charts/jaeger/templates/ingester-hpa.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.ingester.autoscaling.enabled }}
+{{- if and .Values.ingester.enabled .Values.ingester.autoscaling.enabled }}
 apiVersion: {{ include "common.capabilities.hpa.apiVersion" ( dict "context" $ ) }}
 kind: HorizontalPodAutoscaler
 metadata:

charts/jaeger/templates/ingester-sa.yaml

@@ -6,5 +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 -}}

charts/jaeger/templates/query-deploy.yaml

@@ -23,6 +23,9 @@ spec:
       {{- 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 }}
@@ -40,16 +43,32 @@ spec:
       securityContext:
         {{- toYaml .Values.query.podSecurityContext | nindent 8 }}
       serviceAccountName: {{ template "jaeger.query.serviceAccountName" . }}
-      {{- with .Values.query.imagePullSecrets }}
+      {{- include "query.imagePullSecrets" . | nindent 6 }}
-      imagePullSecrets:
+      {{- if or .Values.query.initContainers .Values.provisionDataStore.elasticsearch }}
-        {{- toYaml . | nindent 8 }}
+      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 | nindent 10 }}
-        image: {{ .Values.query.image }}:{{- .Values.query.tag | default (include "jaeger.image.tag" .) }}
+        image: {{ include "query.image" . }}
-        imagePullPolicy: {{ .Values.query.pullPolicy }}
+        imagePullPolicy: {{ .Values.query.image.pullPolicy }}
         args:
           {{ include "extra.cmdArgs" ( dict "cmdlineParams" .Values.query.cmdlineParams ) | nindent 10  }}
           {{- include "storage.cmdArgs" . | nindent 10 }}
@@ -70,6 +89,9 @@ spec:
           - 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
@@ -111,8 +133,8 @@ spec:
         {{- end }}
         {{- if .Values.storage.elasticsearch.tls.enabled }}
           - name: {{ .Values.storage.elasticsearch.tls.secretName }}
-            mountPath: "/es-tls/ca-cert.pem"
+            mountPath: {{ .Values.storage.elasticsearch.tls.mountPath }}
-            subPath: "ca-cert.pem"
+            subPath: {{ .Values.storage.elasticsearch.tls.subPath }}
             readOnly: true
         {{- end }}
         {{- if .Values.query.config}}
@@ -129,8 +151,10 @@ spec:
             port: admin
 {{- if .Values.query.oAuthSidecar.enabled }}
       - name: {{ template "jaeger.agent.name" . }}-oauth2-sidecar
-        image: {{ .Values.query.oAuthSidecar.image }}
+        securityContext:
-        imagePullPolicy: {{ .Values.query.oAuthSidecar.pullPolicy }}
+          {{- toYaml .Values.query.securityContext | nindent 10 }}
+        image: {{ include "oAuthSidecar.image" . }}
+        imagePullPolicy: {{ .Values.query.oAuthSidecar.image.pullPolicy }}
         args:
         {{- range .Values.query.oAuthSidecar.args }}
           - {{ . }}
@@ -159,6 +183,8 @@ spec:
         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 }}
@@ -172,8 +198,8 @@ spec:
       - name: {{ template "jaeger.agent.name" . }}-sidecar
         securityContext:
           {{- toYaml .Values.query.securityContext | nindent 10 }}
-        image: {{ .Values.agent.image }}:{{- include "jaeger.image.tag" . }}
+        image: {{ include "agent.image" . }}
-        imagePullPolicy: {{ .Values.agent.pullPolicy }}
+        imagePullPolicy: {{ .Values.agent.image.pullPolicy }}
         args:
           {{- range $key, $value := .Values.agent.cmdlineParams }}
           {{- if $value }}
@@ -286,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 }}

charts/jaeger/templates/query-ing.yaml

@@ -22,7 +22,7 @@ spec:
   {{- end }}
   rules:
     {{- range $host := .Values.query.ingress.hosts }}
-    - host: {{ $host }}
+    - host: {{ $host | quote }}
       http:
         paths:
           - path: {{ $basePath }}

charts/jaeger/templates/query-svc.yaml

@@ -23,10 +23,10 @@ spec:
     port: 16685
     protocol: TCP
     targetPort: grpc
-  - name: admin
+  - name: {{ .Values.query.service.admin.name }}
     port: 16687
     protocol: TCP
-    targetPort: admin
+    targetPort: {{ .Values.query.service.admin.targetPort }}
   selector:
     {{- include "jaeger.selectorLabels" . | nindent 4 }}
     app.kubernetes.io/component: query

charts/jaeger/templates/spark-cronjob.yaml

@@ -37,14 +37,13 @@ spec:
             {{- end }}
         spec:
           serviceAccountName: {{ template "jaeger.spark.serviceAccountName" . }}
-          {{- with .Values.spark.imagePullSecrets }}
+          {{- include "spark.imagePullSecrets" . | nindent 10 }}
-          imagePullSecrets:
+          securityContext:
-            {{- toYaml . | nindent 12 }}
+            {{- toYaml .Values.spark.podSecurityContext | nindent 12 }}
-          {{- end }}
           containers:
           - name: {{ include "jaeger.fullname" . }}-spark
-            image: {{ .Values.spark.image }}:{{ .Values.spark.tag }}
+            image: {{ include "spark.image" . }}
-            imagePullPolicy: {{ .Values.spark.pullPolicy }}
+            imagePullPolicy: {{ .Values.spark.image.pullPolicy }}
             args:
               {{ include "extra.cmdArgs" ( dict "cmdlineParams" .Values.spark.cmdlineParams ) | nindent 14  }}
             env:
@@ -79,6 +78,8 @@ spec:
                 subPath: {{ .subPath }}
                 readOnly: {{ .readOnly }}
             {{- end }}
+            securityContext:
+              {{- toYaml .Values.spark.securityContext | nindent 14 }}
           restartPolicy: OnFailure
           volumes:
           {{- range .Values.spark.extraConfigmapMounts }}

charts/jaeger/templates/spark-sa.yaml

@@ -6,5 +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 -}}

charts/jaeger/values.yaml

@@ -2,6 +2,9 @@
 # This is a YAML-formatted file.
 # Jaeger values are grouped by component. Cassandra values override subchart values
 
+global:
+  imageRegistry:
+
 provisionDataStore:
   cassandra: true
   elasticsearch: false
@@ -18,9 +21,22 @@ fullnameOverride: ""
 
 allInOne:
   enabled: false
-  image: jaegertracing/all-in-one
+  replicas: 1
-  pullPolicy: IfNotPresent
+  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: []
@@ -31,6 +47,17 @@ allInOne:
   #       "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
@@ -60,9 +87,17 @@ allInOne:
   #     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
@@ -80,7 +115,8 @@ storage:
     ## Use existing secret (ignores previous password)
     # existingSecret:
     ## Cassandra related env vars to be configured on the concerned components
-    extraEnv: []
+    extraEnv:
+      []
       # - name: CASSANDRA_SERVERS
       #   value: cassandra
       # - name: CASSANDRA_PORT
@@ -90,7 +126,8 @@ storage:
       # - name: CASSANDRA_TLS_ENABLED
       #   value: "false"
     ## Cassandra related cmd line opts to be configured on the concerned components
-    cmdlineParams: {}
+    cmdlineParams:
+      {}
       # cassandra.servers: cassandra
       # cassandra.port: 9042
       # cassandra.keyspace: jaeger_v1_test
@@ -110,20 +147,27 @@ storage:
     nodesWanOnly: false
     extraEnv: []
     ## ES related env vars to be configured on the concerned components
-      # - name: ES_SERVER_URLS
+    # - name: ES_SERVER_URLS
-      #   value: http://elasticsearch-master:9200
+    #   value: http://elasticsearch-master:9200
-      # - name: ES_USERNAME
+    # - name: ES_USERNAME
-      #   value: elastic
+    #   value: elastic
-      # - name: ES_INDEX_PREFIX
+    # - name: ES_INDEX_PREFIX
-      #   value: test
+    #   value: test
     ## ES related cmd line opts to be configured on the concerned components
-    cmdlineParams: {}
+    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
@@ -132,6 +176,14 @@ storage:
     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:
@@ -148,12 +200,27 @@ cassandra:
 
 # Begin: Override values on the Kafka subchart to customize for Jaeger
 kafka:
-  replicaCount: 1
+  listeners:
-  autoCreateTopicsEnable: true
+    client:
-  zookeeper:
+      protocol: PLAINTEXT
-    replicaCount: 1
+    controller:
-    serviceAccount:
+      protocol: PLAINTEXT
-      create: true
+    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
 
@@ -165,10 +232,16 @@ kafka:
 # use by Jaeger
 schema:
   annotations: {}
-  image: jaegertracing/jaeger-cassandra-schema
+  tolerations: []
-  imagePullSecrets: []
+  image:
-  pullPolicy: IfNotPresent
+    registry: ""
-  resources: {}
+    repository: jaegertracing/jaeger-cassandra-schema
+    tag: ""
+    digest: ""
+    pullPolicy: IfNotPresent
+    pullSecrets: []
+  resources:
+    {}
     # limits:
     #   cpu: 500m
     #   memory: 512Mi
@@ -184,9 +257,11 @@ schema:
   podLabels: {}
   securityContext: {}
   podSecurityContext: {}
+  nodeSelector: {}
   ## Deadline for cassandra schema creation job
   activeDeadlineSeconds: 300
-  extraEnv: []
+  extraEnv:
+    []
     # - name: MODE
     #   value: prod
     # - name: TRACE_TTL
@@ -195,17 +270,58 @@ schema:
     #   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:
-  imagePullSecrets: []
+    registry: ""
-  pullPolicy: IfNotPresent
+    repository: jaegertracing/jaeger-ingester
+    tag: ""
+    digest: ""
+    pullPolicy: IfNotPresent
+    pullSecrets: []
   dnsPolicy: ClusterFirst
   cmdlineParams: {}
   replicaCount: 1
@@ -221,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
@@ -232,16 +349,21 @@ ingester:
     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
@@ -257,15 +379,19 @@ agent:
   securityContext: {}
   enabled: true
   annotations: {}
-  image: jaegertracing/jaeger-agent
+  image:
-  # tag: 1.22
+    registry: ""
-  imagePullSecrets: []
+    repository: jaegertracing/jaeger-agent
-  pullPolicy: IfNotPresent
+    tag: ""
+    digest: ""
+    pullPolicy: IfNotPresent
+    pullSecrets: []
   cmdlineParams: {}
   extraEnv: []
   daemonset:
     useHostPort: false
-    updateStrategy: {}
+    updateStrategy:
+      {}
       # type: RollingUpdate
       # rollingUpdate:
       #   maxUnavailable: 1
@@ -282,7 +408,8 @@ agent:
     binaryPort: 6832
     # samplingPort: (HTTP) serve configs, sampling strategies
     samplingPort: 5778
-  resources: {}
+  resources:
+    {}
     # limits:
     #   cpu: 500m
     #   memory: 512Mi
@@ -314,6 +441,7 @@ agent:
   #   subPath: ""
   #   configMap: jaeger-config
   #   readOnly: true
+  envFrom: []
   useHostNetwork: false
   dnsPolicy: ClusterFirst
   priorityClassName: ""
@@ -333,12 +461,16 @@ collector:
   securityContext: {}
   enabled: true
   annotations: {}
-  image: jaegertracing/jaeger-collector
+  image:
-  # tag: 1.22
+    registry: ""
-  imagePullSecrets: []
+    repository: jaegertracing/jaeger-collector
-  pullPolicy: IfNotPresent
+    tag: ""
+    digest: ""
+    pullPolicy: IfNotPresent
+    pullSecrets: []
   dnsPolicy: ClusterFirst
   extraEnv: []
+  envFrom: []
   cmdlineParams: {}
   basePath: /
   replicaCount: 1
@@ -352,7 +484,7 @@ collector:
   service:
     annotations: {}
     # The IP to be used by the load balancer (if supported)
-    loadBalancerIP: ''
+    loadBalancerIP: ""
     # List of IP ranges that are allowed to access the load balancer (if supported)
     loadBalancerSourceRanges: []
     type: ClusterIP
@@ -366,16 +498,24 @@ collector:
       port: 14268
       # nodePort:
     # can accept Zipkin spans in JSON or Thrift
-    zipkin: {}
+    zipkin:
+      {}
       # port: 9411
       # nodePort:
     otlp:
-      grpc: {}
+      grpc:
+        {}
+        # name: otlp-grpc
         # port: 4317
         # nodePort:
-      http: {}
+      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
@@ -392,17 +532,18 @@ collector:
     #   - host: chart-example.local
     #     servicePort: grpc
     # annotations:
-      # kubernetes.io/ingress.class: nginx
+    # kubernetes.io/ingress.class: nginx
-      # kubernetes.io/tls-acme: "true"
+    # kubernetes.io/tls-acme: "true"
     # labels:
-      # app: jaeger-collector
+    # app: jaeger-collector
     # tls:
-      # Secrets must be manually created in the namespace.
+    # Secrets must be manually created in the namespace.
-      # - secretName: chart-example-tls
+    # - secretName: chart-example-tls
-      #   hosts:
+    #   hosts:
-      #     - chart-example.local
+    #     - chart-example.local
     pathType:
-  resources: {}
+  resources:
+    {}
     # limits:
     #   cpu: 1
     #   memory: 1Gi
@@ -418,6 +559,7 @@ collector:
   nodeSelector: {}
   tolerations: []
   affinity: {}
+  topologySpreadContraints: []
   podAnnotations: {}
   ## Additional pod labels
   ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
@@ -489,10 +631,24 @@ collector:
 query:
   enabled: true
   basePath: /
+  initContainers: []
   oAuthSidecar:
     enabled: false
-    image: quay.io/oauth2-proxy/oauth2-proxy:v7.1.0
+    resources:
-    pullPolicy: IfNotPresent
+      {}
+      # 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: []
@@ -514,21 +670,25 @@ query:
   securityContext: {}
   agentSidecar:
     enabled: true
-#    resources:
+  #    resources:
-#      limits:
+  #      limits:
-#        cpu: 500m
+  #        cpu: 500m
-#        memory: 512Mi
+  #        memory: 512Mi
-#      requests:
+  #      requests:
-#        cpu: 256m
+  #        cpu: 256m
-#        memory: 128Mi
+  #        memory: 128Mi
   annotations: {}
-  image: jaegertracing/jaeger-query
+  image:
-  # tag: 1.22
+    registry: ""
-  imagePullSecrets: []
+    repository: jaegertracing/jaeger-query
-  pullPolicy: IfNotPresent
+    tag: ""
+    digest: ""
+    pullPolicy: IfNotPresent
+    pullSecrets: []
   dnsPolicy: ClusterFirst
   cmdlineParams: {}
   extraEnv: []
+  envFrom: []
   replicaCount: 1
   service:
     annotations: {}
@@ -540,6 +700,9 @@ query:
     # 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
@@ -551,19 +714,20 @@ query:
     # hosts:
     #   - chart-example.local
     # annotations:
-      # kubernetes.io/ingress.class: nginx
+    # kubernetes.io/ingress.class: nginx
-      # kubernetes.io/tls-acme: "true"
+    # kubernetes.io/tls-acme: "true"
     # labels:
-      # app: jaeger-query
+    # app: jaeger-query
     # tls:
-      # Secrets must be manually created in the namespace.
+    # Secrets must be manually created in the namespace.
-      # - secretName: chart-example-tls
+    # - secretName: chart-example-tls
-      #   hosts:
+    #   hosts:
-      #     - chart-example.local
+    #     - chart-example.local
     pathType:
     health:
       exposed: false
-  resources: {}
+  resources:
+    {}
     # limits:
     #   cpu: 500m
     #   memory: 512Mi
@@ -579,6 +743,7 @@ query:
   nodeSelector: {}
   tolerations: []
   affinity: {}
+  topologySpreadContraints: []
   podAnnotations: {}
   ## Additional pod labels
   ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
@@ -630,18 +795,24 @@ query:
 
 spark:
   enabled: false
+  securityContext: {}
+  podSecurityContext: {}
   annotations: {}
-  image: jaegertracing/spark-dependencies
+  image:
-  imagePullSecrets: []
+    registry: ""
-  tag: latest
+    repository: jaegertracing/spark-dependencies
-  pullPolicy: IfNotPresent
+    tag: latest
+    digest: ""
+    pullPolicy: IfNotPresent
+    pullSecrets: []
   cmdlineParams: {}
   extraEnv: []
   schedule: "49 23 * * *"
   successfulJobsHistoryLimit: 5
   failedJobsHistoryLimit: 5
   concurrencyPolicy: Forbid
-  resources: {}
+  resources:
+    {}
     # limits:
     #   cpu: 500m
     #   memory: 512Mi
@@ -650,6 +821,7 @@ spark:
     #   memory: 128Mi
   serviceAccount:
     create: true
+    annotations: {}
     # Explicitly mounts the API credentials for the Service Account
     automountServiceAccountToken: false
     name:
@@ -671,18 +843,24 @@ esIndexCleaner:
   podSecurityContext:
     runAsUser: 1000
   annotations: {}
-  image: jaegertracing/jaeger-es-index-cleaner
+  image:
-  imagePullSecrets: []
+    registry: ""
-  pullPolicy: IfNotPresent
+    repository: jaegertracing/jaeger-es-index-cleaner
+    tag: ""
+    digest: ""
+    pullPolicy: IfNotPresent
+    pullSecrets: []
   cmdlineParams: {}
-  extraEnv: []
+  extraEnv:
+    []
     # - name: ROLLOVER
     #   value: 'true'
   schedule: "55 23 * * *"
   successfulJobsHistoryLimit: 3
   failedJobsHistoryLimit: 3
   concurrencyPolicy: Forbid
-  resources: {}
+  resources:
+    {}
     # limits:
     #   cpu: 500m
     #   memory: 512Mi
@@ -692,6 +870,7 @@ esIndexCleaner:
   numberOfDays: 7
   serviceAccount:
     create: true
+    annotations: {}
     # Explicitly mounts the API credentials for the Service Account
     automountServiceAccountToken: false
     name:
@@ -712,10 +891,13 @@ esRollover:
   podSecurityContext:
     runAsUser: 1000
   annotations: {}
-  image: jaegertracing/jaeger-es-rollover
+  image:
-  imagePullSecrets: []
+    registry: ""
-  tag: latest
+    repository: jaegertracing/jaeger-es-rollover
-  pullPolicy: IfNotPresent
+    tag: ""
+    digest: ""
+    pullPolicy: IfNotPresent
+    pullSecrets: []
   cmdlineParams: {}
   extraEnv:
     - name: CONDITIONS
@@ -724,7 +906,8 @@ esRollover:
   successfulJobsHistoryLimit: 3
   failedJobsHistoryLimit: 3
   concurrencyPolicy: Forbid
-  resources: {}
+  resources:
+    {}
     # limits:
     #   cpu: 500m
     #   memory: 512Mi
@@ -747,7 +930,8 @@ esRollover:
   podLabels: {}
   # ttlSecondsAfterFinished: 120
   initHook:
-    extraEnv: []
+    extraEnv:
+      []
       # - name: SHARDS
       #   value: "3"
     annotations: {}
@@ -761,21 +945,25 @@ esLookback:
   podSecurityContext:
     runAsUser: 1000
   annotations: {}
-  image: jaegertracing/jaeger-es-rollover
+  image:
-  imagePullSecrets: []
+    registry: ""
-  tag: latest
+    repository: jaegertracing/jaeger-es-rollover
-  pullPolicy: IfNotPresent
+    tag: ""
+    digest: ""
+    pullPolicy: IfNotPresent
+    pullSecrets: []
   cmdlineParams: {}
   extraEnv:
     - name: UNIT
       value: days
     - name: UNIT_COUNT
-      value: '7'
+      value: "7"
-  schedule: '5 0 * * *'
+  schedule: "5 0 * * *"
   successfulJobsHistoryLimit: 3
   failedJobsHistoryLimit: 3
   concurrencyPolicy: Forbid
-  resources: {}
+  resources:
+    {}
     # limits:
     #   cpu: 500m
     #   memory: 512Mi
@@ -784,6 +972,7 @@ esLookback:
     #   memory: 128Mi
   serviceAccount:
     create: true
+    annotations: {}
     # Explicitly mounts the API credentials for the Service Account
     automountServiceAccountToken: false
     name:
@@ -804,8 +993,22 @@ 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
+    tag: ""
+    digest: ""
     pullPolicy: IfNotPresent
     pullSecrets: []
   service:
@@ -823,7 +1026,8 @@ hotrod:
     # 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:
@@ -832,7 +1036,8 @@ hotrod:
       #   hosts:
       #     - chart-example.local
     pathType:
-  resources: {}
+  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
@@ -847,6 +1052,7 @@ hotrod:
     create: true
     # Explicitly mounts the API credentials for the Service Account
     automountServiceAccountToken: false
+    annotations: {}
     name:
   nodeSelector: {}
   tolerations: []