Compare commits

..

No commits in common. "main" and "jaeger-operator-2.43.0" have entirely different histories.

41 changed files with 297 additions and 1364 deletions

View File

@ -1,51 +0,0 @@
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

View File

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

View File

@ -5,11 +5,6 @@
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.
@ -23,10 +18,6 @@ $ 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.

View File

@ -2,13 +2,6 @@ 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+ |

View File

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

View File

@ -19,7 +19,6 @@ 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
@ -30,7 +29,7 @@ Add the Jaeger Tracing Helm repository:
$ helm repo add jaegertracing https://jaegertracing.github.io/helm-charts
```
To install the chart with the release name `my-release` in `observability` namespace:
To install the chart with the release name `my-release` in `observability` namespace:
```console
$ helm install my-release jaegertracing/jaeger-operator -n observability
@ -55,30 +54,27 @@ The command removes all the Kubernetes components associated with the chart and
The following table lists the configurable parameters of the jaeger-operator chart and their default values.
| Parameter | Description | Default |
| :-------------------------- | :---------------------------------------------------------------------------------------------------------- |:--------------------------------|
| `serviceExtraLabels` | Additional labels to jaeger-operator service | `{}` |
| `extraLabels` | Additional labels to jaeger-operator deployment | `{}` |
| `image.repository` | Controller container image repository | `jaegertracing/jaeger-operator` |
| `image.tag` | Controller container image tag | `1.61.0` |
| `image.pullPolicy` | Controller container image pull policy | `IfNotPresent` |
| `jaeger.create` | Jaeger instance will be created | `false` |
| `jaeger.spec` | Jaeger instance specification | `{}` |
| `rbac.create` | All required roles and rolebindings will be created | `true` |
| `serviceAccount.create` | Service account to use | `true` |
| `rbac.pspEnabled` | Pod security policy for pod will be created and included in rbac role | `false` |
| `rbac.clusterRole` | ClusterRole will be used by operator ServiceAccount | `false` |
| `serviceAccount.name` | Service account name to use. If not set and create is true, a name is generated using the fullname template | `nil` |
| `extraArgs` | Additional command line arguments arguments passed to the operator | `{}` |
| `extraEnv` | Additional environment variables passed to the operator. For example: name: LOG-LEVEL value: debug | `[]` |
| `replicaCount` | Desired number of operator pods | `1` |
| `resources` | K8s pod resources | `None` |
| `nodeSelector` | Node labels for pod assignment | `{}` |
| `tolerations` | Toleration labels for pod assignment | `[]` |
| `topologySpreadConstraints` | Topology Spread Constraints for pod assignment | `[]` |
| `affinity` | Affinity settings for pod assignment | `{}` |
| `securityContext` | Security context for pod | `{}` |
| `containerSecurityContext` | Security context for the container | `{}` |
| `priorityClassName` | Priority class name for the pod | `None` |
|-:--------------------------|-:-----------------------------------------------------------------------------------------------------------|-:-------------------------------|
| `serviceExtraLabels` | Additional labels to jaeger-operator service | `{}` |
| `extraLabels` | Additional labels to jaeger-operator deployment | `{}` |
| `image.repository` | Controller container image repository | `jaegertracing/jaeger-operator` |
| `image.tag` | Controller container image tag | `1.43.0` |
| `image.pullPolicy` | Controller container image pull policy | `IfNotPresent` |
| `jaeger.create` | Jaeger instance will be created | `false` |
| `jaeger.spec` | Jaeger instance specification | `{}` |
| `rbac.create` | All required roles and rolebindings will be created | `true` |
| `serviceAccount.create` | Service account to use | `true` |
| `rbac.pspEnabled` | Pod security policy for pod will be created and included in rbac role | `false` |
| `rbac.clusterRole` | ClusterRole will be used by operator ServiceAccount | `false` |
| `serviceAccount.name` | Service account name to use. If not set and create is true, a name is generated using the fullname template | `nil` |
| `extraEnv` | Additional environment variables passed to the operator. For example: name: LOG-LEVEL value: debug | `[]` |
| `resources` | K8s pod resources | `None` |
| `nodeSelector` | Node labels for pod assignment | `{}` |
| `tolerations` | Toleration labels for pod assignment | `[]` |
| `affinity` | Affinity settings for pod assignment | `{}` |
| `securityContext` | Security context for pod | `{}` |
| `containerSecurityContext` | Security context for the container | `{}` |
| `priorityClassName` | Priority class name for the pod | `None` |
Specify each parameter you'd like to override using a YAML file as described above in the [installation](#installing-the-chart) section.

View File

@ -955,18 +955,6 @@ 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:
@ -1390,26 +1378,13 @@ 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:
@ -2420,23 +2395,9 @@ 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:
@ -2817,26 +2778,13 @@ 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:
@ -3854,11 +3802,6 @@ spec:
minReplicas:
format: int32
type: integer
nodeSelector:
additionalProperties:
type: string
nullable: true
type: object
options:
type: object
x-kubernetes-preserve-unknown-fields: true
@ -3870,18 +3813,6 @@ 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:
@ -4262,26 +4193,13 @@ 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:
@ -5366,11 +5284,6 @@ spec:
minReplicas:
format: int32
type: integer
nodeSelector:
additionalProperties:
type: string
nullable: true
type: object
options:
type: object
x-kubernetes-preserve-unknown-fields: true
@ -5380,18 +5293,6 @@ 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:
@ -5770,26 +5671,13 @@ 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:
@ -6815,18 +6703,6 @@ 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:
@ -7204,26 +7080,13 @@ 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:
@ -8316,11 +8179,6 @@ spec:
nodePort:
format: int32
type: integer
nodeSelector:
additionalProperties:
type: string
nullable: true
type: object
options:
type: object
x-kubernetes-preserve-unknown-fields: true
@ -8332,18 +8190,6 @@ 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:
@ -8726,26 +8572,13 @@ 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:
@ -9220,18 +9053,6 @@ 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:
@ -10252,18 +10073,6 @@ 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:
@ -10634,26 +10443,13 @@ 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:
@ -11142,18 +10938,6 @@ 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:
@ -11180,18 +10964,6 @@ 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:
@ -11780,18 +11552,6 @@ 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:
@ -12160,26 +11920,13 @@ 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:
@ -13189,18 +12936,6 @@ 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:
@ -13569,26 +13304,13 @@ 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:
@ -14358,26 +14080,13 @@ 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:

View File

@ -9,7 +9,7 @@ metadata:
{{ . | toYaml | indent 4 }}
{{- end }}
spec:
replicas: {{ .Values.replicaCount }}
replicas: 1
selector:
matchLabels:
{{ include "jaeger-operator.labels" . | indent 6 }}
@ -50,26 +50,12 @@ spec:
name: metrics
- containerPort: {{ .Values.webhooks.port }}
name: webhook-server
protocol: TCP
protocol: TCP
volumeMounts:
- mountPath: /tmp/k8s-webhook-server/serving-certs
name: cert
readOnly: true
args:
- start
- {{ printf "--metrics-port=%v" .Values.metricsPort }}
- {{ printf "--webhook-bind-port=%v" .Values.webhooks.port }}
{{- $replicaCount := int .Values.replicaCount }}
{{- if gt $replicaCount 1 }}
- --leader-elect
{{- end }}
{{- range $key, $value := .Values.extraArgs }}
{{- if $value }}
- --{{ $key }}={{ $value }}
{{- else }}
- --{{ $key }}
{{- end }}
{{- end }}
args: ["start"]
env:
- name: WATCH_NAMESPACE
{{- if .Values.rbac.clusterRole }}
@ -113,9 +99,5 @@ spec:
{{- end }}
{{- with .Values.tolerations }}
tolerations:
{{ toYaml . | indent 8 }}
{{- end }}
{{- with .Values.topologySpreadConstraints }}
topologySpreadConstraints:
{{ toYaml . | indent 8 }}
{{- end }}

View File

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

View File

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

View File

@ -1,15 +0,0 @@
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"

View File

@ -1,18 +1,18 @@
apiVersion: v2
appVersion: 1.53.0
appVersion: 1.42.0
description: A Jaeger Helm chart for Kubernetes
name: jaeger
type: application
version: 3.4.1
version: 0.69.1
# CronJobs require v1.21
kubeVersion: ">= 1.21-0"
kubeVersion: '>= 1.21-0'
keywords:
- jaeger
- opentracing
- tracing
- instrumentation
home: https://jaegertracing.io
icon: https://www.jaegertracing.io/img/jaeger-icon-reverse-color.svg
icon: https://camo.githubusercontent.com/afa87494e0753b4b1f5719a2f35aa5263859dffb/687474703a2f2f6a61656765722e72656164746865646f63732e696f2f656e2f6c61746573742f696d616765732f6a61656765722d766563746f722e737667
sources:
- https://hub.docker.com/u/jaegertracing/
maintainers:
@ -26,21 +26,19 @@ 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: 20.0.4
repository: https://charts.bitnami.com/bitnami
version: ^7.11.1
repository: https://helm.elastic.co
condition: provisionDataStore.elasticsearch
- name: kafka
version: 26.6.2
version: ^19.1.5
repository: https://charts.bitnami.com/bitnami
condition: provisionDataStore.kafka
- name: common
repository: https://charts.bitnami.com/bitnami
version: 2.x.x
version: 1.16.0

View File

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

View File

@ -31,6 +31,13 @@ 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
*/}}
@ -268,11 +275,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
*/}}
{{- define "elasticsearch.client.url" -}}
{{- $port := .Values.storage.elasticsearch.port | toString -}}
{{- $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 }}
{{- printf "%s://%s:%s" .Values.storage.elasticsearch.scheme .Values.storage.elasticsearch.host $port }}
{{- end -}}
{{- define "jaeger.hotrod.tracing.host" -}}
@ -362,7 +365,7 @@ Elasticsearch related environment variables
- name: ES_TLS_ENABLED
value: "true"
- name: ES_TLS_CA
value: {{ .Values.storage.elasticsearch.tls.ca }}
value: /es-tls/ca-cert.pem
{{- end }}
{{- if .Values.storage.elasticsearch.indexPrefix }}
- name: ES_INDEX_PREFIX
@ -387,46 +390,15 @@ grpcPlugin related environment variables
{{- end -}}
{{/*
badger related environment variables
*/}}
{{- define "badger.env" -}}
- name: BADGER_EPHEMERAL
value: {{ .Values.storage.badger.ephemeral | quote }}
{{- if not .Values.storage.badger.ephemeral }}
- name: BADGER_DIRECTORY_VALUE
value: {{ print .Values.storage.badger.persistence.mountPath "/badger/data" | quote }}
- name: BADGER_DIRECTORY_KEY
value: {{ print .Values.storage.badger.persistence.mountPath "/badger/key" | quote }}
{{- end }}
{{- if .Values.storage.badger.extraEnv }}
{{- toYaml .Values.storage.badger.extraEnv }}
{{- end }}
{{- end -}}
{{/*
memory related environment variables
*/}}
{{- define "memory.env" -}}
{{- if .Values.storage.memory.extraEnv }}
{{- toYaml .Values.storage.memory.extraEnv }}
{{- end }}
{{- end -}}
{{/*
Cassandra, Elasticsearch, or grpc-plugin, badger, memory related environment variables depending on which is used
Cassandra, Elasticsearch, or grpc-plugin related environment variables depending on which is used
*/}}
{{- define "storage.env" -}}
{{- if eq .Values.storage.type "cassandra" -}}
{{ include "cassandra.env" . }}
{{- else if eq .Values.storage.type "elasticsearch" -}}
{{ include "elasticsearch.env" . }}
{{- else if or (eq .Values.storage.type "grpc-plugin") (eq .Values.storage.type "grpc") -}}
{{- else if eq .Values.storage.type "grpc-plugin" -}}
{{ 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 -}}
@ -551,187 +523,3 @@ 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 }}

View File

@ -42,7 +42,10 @@ spec:
priorityClassName: {{ . }}
{{- end }}
serviceAccountName: {{ template "jaeger.agent.serviceAccountName" . }}
{{- include "agent.imagePullSecrets" . | nindent 6 }}
{{- with .Values.agent.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- if .Values.agent.initContainers }}
initContainers:
{{- toYaml .Values.agent.initContainers | nindent 8 }}
@ -51,8 +54,8 @@ spec:
- name: {{ template "jaeger.agent.name" . }}
securityContext:
{{- toYaml .Values.agent.securityContext | nindent 10 }}
image: {{ include "agent.image" . }}
imagePullPolicy: {{ .Values.agent.image.pullPolicy }}
image: {{ .Values.agent.image }}:{{- .Values.agent.tag | default (include "jaeger.image.tag" .) }}
imagePullPolicy: {{ .Values.agent.pullPolicy }}
args:
{{ include "extra.cmdArgs" ( dict "cmdlineParams" .Values.agent.cmdlineParams ) | nindent 10 }}
env:
@ -63,9 +66,6 @@ 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 }}

View File

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

View File

@ -9,9 +9,7 @@ metadata:
prometheus.io/port: "14269"
prometheus.io/scrape: "true"
spec:
{{- if hasKey .Values.allInOne "replicas" }}
replicas: {{ .Values.allInOne.replicas }}
{{- end }}
replicas: 1
strategy:
type: Recreate
selector:
@ -30,15 +28,13 @@ 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: {{ .Values.storage.type }}
{{- include "storage.env" . | nindent 12 }}
value: memory
- name: COLLECTOR_ZIPKIN_HOST_PORT
value: :9411
- name: JAEGER_DISABLED
@ -49,13 +45,8 @@ spec:
- name: SAMPLING_STRATEGIES_FILE
value: /etc/conf/strategies.json
{{- end }}
{{- with .Values.allInOne.envFrom }}
envFrom: {{- toYaml . | nindent 12 }}
{{- end }}
securityContext:
{{- toYaml .Values.allInOne.securityContext | nindent 12 }}
image: {{ include "allInOne.image" . }}
imagePullPolicy: {{ .Values.allInOne.image.pullPolicy }}
image: {{ .Values.allInOne.image }}:{{- .Values.allInOne.tag | default (include "jaeger.image.tag" .) }}
imagePullPolicy: {{ .Values.allInOne.pullPolicy }}
name: jaeger
args:
{{- range $arg := .Values.allInOne.args }}
@ -104,54 +95,21 @@ spec:
resources:
{{- toYaml . | nindent 12 }}
{{- end }}
volumeMounts:
{{- if not .Values.storage.badger.ephemeral }}
- name: badger-data
mountPath: {{ .Values.storage.badger.persistence.mountPath }}
{{- end }}
{{- if .Values.allInOne.samplingConfig}}
volumeMounts:
- name: strategies
mountPath: /etc/conf/
{{- end }}
{{- range .Values.allInOne.extraSecretMounts }}
- name: {{ .name }}
mountPath: {{ .mountPath }}
subPath: {{ .subPath }}
readOnly: {{ .readOnly }}
{{- end }}
securityContext:
{{- toYaml .Values.allInOne.podSecurityContext | nindent 8 }}
serviceAccountName: {{ template "jaeger.fullname" . }}
volumes:
{{- if not .Values.storage.badger.ephemeral }}
- name: badger-data
persistentVolumeClaim:
claimName: {{ .Values.storage.badger.persistence.useExistingPvcName | required "Using badger persistence it is required to set an existing PVC" }}
{{- end }}
{{- if .Values.allInOne.samplingConfig}}
volumes:
- 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 -}}

View File

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

View File

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

View File

@ -32,27 +32,16 @@ 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" . }}
{{- include "collector.imagePullSecrets" . | nindent 6 }}
{{- with .Values.collector.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- if .Values.collector.initContainers }}
initContainers:
{{- toYaml .Values.collector.initContainers | nindent 8 }}
@ -61,8 +50,8 @@ spec:
- name: {{ template "jaeger.collector.name" . }}
securityContext:
{{- toYaml .Values.collector.securityContext | nindent 10 }}
image: {{ include "collector.image" . }}
imagePullPolicy: {{ .Values.collector.image.pullPolicy }}
image: {{ .Values.collector.image }}:{{- .Values.collector.tag | default (include "jaeger.image.tag" .) }}
imagePullPolicy: {{ .Values.collector.pullPolicy }}
args:
{{ include "extra.cmdArgs" ( dict "cmdlineParams" .Values.collector.cmdlineParams ) | nindent 10 }}
{{- if not .Values.ingester.enabled -}}
@ -79,6 +68,7 @@ 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 }}
@ -87,7 +77,6 @@ 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
@ -113,9 +102,6 @@ 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
@ -133,10 +119,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: {{ .Values.collector.service.otlp.grpc.name }}
name: otlp-grpc
protocol: TCP
- containerPort: {{ default 4318 .Values.collector.service.otlp.http.port }}
name: {{ .Values.collector.service.otlp.http.name }}
name: otlp-http
protocol: TCP
{{- end }}
readinessProbe:
@ -178,8 +164,8 @@ spec:
{{- 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 }}
mountPath: "/es-tls/ca-cert.pem"
subPath: "ca-cert.pem"
readOnly: true
{{- end }}
{{- if .Values.collector.samplingConfig}}
@ -222,10 +208,6 @@ spec:
affinity:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.collector.topologySpreadConstraints }}
topologySpreadConstraints:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.collector.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}

View File

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

View File

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

View File

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

View File

@ -38,15 +38,18 @@ spec:
{{- end }}
spec:
serviceAccountName: {{ template "jaeger.esIndexCleaner.serviceAccountName" . }}
{{- include "esIndexCleaner.imagePullSecrets" . | nindent 10 }}
{{- with .Values.esIndexCleaner.imagePullSecrets }}
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: {{ include "esIndexCleaner.image" . }}
imagePullPolicy: {{ .Values.esIndexCleaner.image.pullPolicy }}
image: {{ .Values.esIndexCleaner.image }}:{{- .Values.esIndexCleaner.tag | default (include "jaeger.image.tag" .) }}
imagePullPolicy: {{ .Values.esIndexCleaner.pullPolicy }}
args:
- {{ .Values.esIndexCleaner.numberOfDays | quote }}
- {{ include "elasticsearch.client.url" . }}
@ -73,8 +76,8 @@ spec:
{{- 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 }}
mountPath: "/es-tls/ca-cert.pem"
subPath: "ca-cert.pem"
readOnly: true
{{- end }}
restartPolicy: OnFailure

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -23,9 +23,6 @@ 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 }}
@ -43,32 +40,16 @@ spec:
securityContext:
{{- toYaml .Values.query.podSecurityContext | nindent 8 }}
serviceAccountName: {{ template "jaeger.query.serviceAccountName" . }}
{{- include "query.imagePullSecrets" . | nindent 6 }}
{{- if or .Values.query.initContainers .Values.provisionDataStore.elasticsearch }}
initContainers:
{{- if .Values.query.initContainers }}
{{- toYaml .Values.query.initContainers | nindent 8 }}
{{- end }}
{{- if .Values.provisionDataStore.elasticsearch }}
- name: elasticsearch-checker
image: {{ include "curl.image" . }}
command:
- sh
- "-c"
- |
url="{{ include "elasticsearch.client.url" . }}"
until [ "$(curl -s -o /dev/null -w '%{http_code}' "$url/_cluster/health")" = "200" ]; do
echo "waiting for Elasticsearch at $url"
sleep 5
done
{{- end }}
{{- end }}
{{- with .Values.query.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers:
- name: {{ template "jaeger.query.name" . }}
securityContext:
{{- toYaml .Values.query.securityContext | nindent 10 }}
image: {{ include "query.image" . }}
imagePullPolicy: {{ .Values.query.image.pullPolicy }}
image: {{ .Values.query.image }}:{{- .Values.query.tag | default (include "jaeger.image.tag" .) }}
imagePullPolicy: {{ .Values.query.pullPolicy }}
args:
{{ include "extra.cmdArgs" ( dict "cmdlineParams" .Values.query.cmdlineParams ) | nindent 10 }}
{{- include "storage.cmdArgs" . | nindent 10 }}
@ -89,9 +70,6 @@ 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
@ -133,8 +111,8 @@ spec:
{{- 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 }}
mountPath: "/es-tls/ca-cert.pem"
subPath: "ca-cert.pem"
readOnly: true
{{- end }}
{{- if .Values.query.config}}
@ -151,10 +129,8 @@ spec:
port: admin
{{- if .Values.query.oAuthSidecar.enabled }}
- name: {{ template "jaeger.agent.name" . }}-oauth2-sidecar
securityContext:
{{- toYaml .Values.query.securityContext | nindent 10 }}
image: {{ include "oAuthSidecar.image" . }}
imagePullPolicy: {{ .Values.query.oAuthSidecar.image.pullPolicy }}
image: {{ .Values.query.oAuthSidecar.image }}
imagePullPolicy: {{ .Values.query.oAuthSidecar.pullPolicy }}
args:
{{- range .Values.query.oAuthSidecar.args }}
- {{ . }}
@ -183,8 +159,6 @@ 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 }}
@ -198,8 +172,8 @@ spec:
- name: {{ template "jaeger.agent.name" . }}-sidecar
securityContext:
{{- toYaml .Values.query.securityContext | nindent 10 }}
image: {{ include "agent.image" . }}
imagePullPolicy: {{ .Values.agent.image.pullPolicy }}
image: {{ .Values.agent.image }}:{{- include "jaeger.image.tag" . }}
imagePullPolicy: {{ .Values.agent.pullPolicy }}
args:
{{- range $key, $value := .Values.agent.cmdlineParams }}
{{- if $value }}
@ -312,10 +286,6 @@ spec:
affinity:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.query.topologySpreadConstraints }}
topologySpreadConstraints:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.query.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}

View File

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

View File

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

View File

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

View File

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

View File

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