Skip to content

Commit 61f3dcd

Browse files
committed
Remove elasticsearch and cassandra deps. Clean up unused helpers. Simplify.
Signed-off-by: Steven Erb <stevenpc3@live.com>
1 parent d1f96dc commit 61f3dcd

22 files changed

Lines changed: 63 additions & 509 deletions

.github/workflows/lint-test.yaml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,3 @@ jobs:
3636
- uses: ./.github/actions/prepare-k8s
3737

3838
- run: make test
39-
40-
test-with-elasticsearch:
41-
runs-on: ubuntu-latest
42-
steps:
43-
- uses: actions/checkout@v6
44-
with:
45-
fetch-depth: 0
46-
47-
- uses: ./.github/actions/prepare-k8s
48-
49-
- run: make test-jaeger-connect-elasticsearch

Makefile

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,3 @@ lint:
88
.PHONY: test
99
test:
1010
ct install --config ct.yaml
11-
12-
# This test will spin up the local provisioned elasticsearch and then connect jaeger to it not using memory store
13-
# it disables the built-in elasticsearch test since it just checks if it's up and jaeger connecting does the same
14-
# elasticsearch test also requires ssl and jaeger is configured to not require that for local connection
15-
.PHONY: test-jaeger-connect-elasticsearch
16-
test-jaeger-connect-elasticsearch:
17-
ct install --config ct.yaml \
18-
--charts charts/jaeger \
19-
--helm-extra-set-args " \
20-
--set provisionDataStore.elasticsearch=true \
21-
--set storage.type=elasticsearch \
22-
--set elasticsearch.tests.enabled=false \
23-
--set elasticsearch.readinessProbe.initialDelaySeconds=60 \
24-
--set elasticsearch.readinessProbe.failureThreshold=10 \
25-
--set elasticsearch.volumeClaimTemplate.resources.requests.storage=5Gi \
26-
--set elasticsearch.protocol=http \
27-
--set config.extensions.jaeger_query.storage.traces=primary_store_elasticsearch \
28-
--set config.extensions.jaeger_query.storage.traces_archive=archive_store_elasticsearch \
29-
--set config.exporters.jaeger_storage_exporter.trace_storage=primary_store_elasticsearch "

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ To run the chart installation tests locally (simulating the CI environment), use
3333

3434
```bash
3535
make test # default install suite
36-
make test-jaeger-connect-elasticsearch # Elasticsearch-provisioned suite
3736
```
3837

3938

charts/jaeger/Chart.lock

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
dependencies:
2-
- name: cassandra
3-
repository: https://charts.helm.sh/incubator
4-
version: 0.15.3
5-
- name: elasticsearch
6-
repository: https://helm.elastic.co
7-
version: 8.5.1
82
- name: common
93
repository: https://charts.bitnami.com/bitnami
104
version: 2.31.4
11-
digest: sha256:d0beaceb47b883faf8d19180bb382925ffeaa02e6af60852877a5db547435d48
12-
generated: "2025-12-14T12:44:06.776735448-05:00"
5+
digest: sha256:812f9bf703b331dab00cc69ac348f6b1c021e479cbf1bdc0b788da8763c02062
6+
generated: "2026-01-16T23:08:17.260569327Z"

charts/jaeger/Chart.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,6 @@ maintainers:
2727
- name: jkowall
2828
email: jkowall@kowall.net
2929
dependencies:
30-
- name: cassandra
31-
version: 0.15.3
32-
repository: https://charts.helm.sh/incubator
33-
condition: provisionDataStore.cassandra
34-
- name: elasticsearch
35-
version: 8.5.1
36-
repository: https://helm.elastic.co
37-
condition: provisionDataStore.elasticsearch
3830
- name: common
3931
repository: https://charts.bitnami.com/bitnami
4032
version: 2.x.x

charts/jaeger/README.md

Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,18 @@ This release is a refactor designed to simplify operation and configuration.
1212
- **Configuration**: Storage is configured via the `config.extensions.jaeger_storage` section using native Jaeger/OTEL config syntax.
1313
- **Cassandra Schema**: Jaeger v2 handles schema creation internally. The legacy schema job has been removed.
1414
- **Service Consolidation**: A single Service now exposes all ports (agent, collector, query).
15+
- **No provisioned storage**: Dependency charts have been removed. The user must deploy them separately and configure connection using the Otel config Syntax https://github.com/jaegertracing/jaeger/blob/main/cmd/jaeger/config.yaml
1516

1617
## Architecture
1718

1819
This chart uses the **All-In-One** deployment model.
1920
- **Single Binary**: Runs as a `Deployment` scalable to multiple replicas.
2021
- **Stateless**: Can connect to external persistent storage (Elasticsearch, Cassandra) for production use.
2122
- **Default**: Memory storage (ephemeral), suitable for testing.
23+
- **Scalable**: Increase replica count to scale horizontally
2224

23-
## Overriding the Jaeger Version
25+
## Overriding the Jaeger Version
26+
##### (chart only supports Jaever v2+)
2427

2528
You can customize the Jaeger image and tag using the following values:
2629

@@ -61,37 +64,16 @@ helm install jaeger jaegertracing/jaeger
6164
```
6265

6366
### 2. Elasticsearch (Production Recommended)
64-
Configure Jaeger to connect to Elasticsearch using the native config syntax.
6567

66-
You can either use the internal provisioned elasticsearch or point to an external elasticsearch.
68+
This chart does not provision an ElasticSearch instance.
6769

68-
The internal elasticsearch is configured to __NOT__ require a password or username by default.
70+
To use ElasticSearch storage, you must provide your own ElasticSearch instance and configure Jaeger via the native config syntax:
6971

70-
#### Internal Provisioned Elasticsearch example:
72+
#### Elasticsearch example:
7173

7274
**values.yaml**
7375
```yaml
74-
# Use the provisioned Elasticsearch subchart
75-
provisionDataStore:
76-
elasticsearch: true
77-
78-
config:
79-
extensions:
80-
jaeger_query:
81-
storage:
82-
traces: primary_store_elasticsearch
83-
traces_archive: archive_store_elasticsearch
84-
exporters:
85-
jaeger_storage_exporter:
86-
trace_storage: primary_store_elasticsearch
87-
```
88-
89-
#### External Elasticsearch example:
90-
91-
**values.yaml**
92-
```yaml
93-
# External is very similar but you need to configure the urls
94-
config:
76+
userconfig:
9577
extensions:
9678
jaeger_query:
9779
storage:
@@ -119,17 +101,29 @@ config:
119101
```
120102
121103
**Running Maintenance Jobs:**
122-
To run Index Cleaner or Rollover jobs, enable them. They require configuration if using external by setting ```storage.type=elasticsearch``` and adjusting ```storage.elasticsearch``` values. See that section in values.yaml for more details.
104+
105+
To run Index Cleaner or Rollover jobs, enable them.
106+
They require configuration by adjusting ```storage.elasticsearch``` values. See that section in values.yaml for more details.
123107

124108
```yaml
125109
esIndexCleaner:
126110
enabled: true
111+
112+
storage:
113+
elasticsearch:
114+
tls:
115+
enabled: false
116+
url: http://elasticsearch-master:9200
117+
# user: elastic
118+
# password: changeme
127119
```
128120

129121
* es-rollover __requires__ elasticsearch to be running __BEFORE__ install so the hook job can run.
130122

131123
### 3. Cassandra
132-
This chart does not provision a Cassandra cluster. To use Cassandra storage, you must provide your own Cassandra instance and configure Jaeger via the native config syntax:
124+
This chart does not provision a Cassandra cluster.
125+
126+
To use Cassandra storage, you must provide your own Cassandra instance and configure Jaeger via the native config syntax:
133127

134128
**values.yaml Example:**
135129
```yaml
@@ -158,7 +152,9 @@ To run the Spark dependencies job (for dependency links graph) set ```spark.enab
158152

159153
Below is an example of how to set overrides. Please see the values.yaml for more examples:
160154

161-
The values are populated under ```storage.elasticsearch``` Please see comments in values.yaml for more details.
155+
The values are populated under ```storage.elasticsearch``` and ```storage.casandra``` Please see comments in values.yaml for more details.
156+
157+
You must choose the storage type with ```storage.type=elasticsearch``` or ```storage.type=cassandra```
162158

163159
```yaml
164160
spark:
@@ -172,7 +168,11 @@ For a full list of supported environment variables, see the [Spark Dependencies
172168

173169
### 5. Query UI
174170

175-
To enable the query ui, you need to enable the ingress and fill at least one host:
171+
To access the ui you can either:
172+
173+
* enable the ingress and fill at least one host
174+
* provide your own ingress
175+
* or port forward ```kubectl port-forward --namespace {{ .Release.Namespace }} $POD_NAME 16686:16686 --address 0.0.0.0``` and access at http://localhost:16686/
176176

177177
```yaml
178178
jaeger:
@@ -182,6 +182,8 @@ jaeger:
182182
- <fill a host here>
183183
```
184184

185+
You can customize the UI by setting ```uiconfig```. Please see the values.yaml for examples or https://github.com/jaegertracing/jaeger/tree/main/cmd/jaeger
186+
185187
## Configuring the Collector
186188

187189
The Jaeger v2 configuration is defined in `config` using OpenTelemetry Collector syntax. You can override pipelines, receivers, and processors there.

charts/jaeger/templates/NOTES.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ To access the query UI:
1717
{{- end }}
1818
{{- else }}
1919
export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/instance={{ .Release.Name }},app.kubernetes.io/component=all-in-one" -o jsonpath="{.items[0].metadata.name}")
20-
echo "Visit http://127.0.0.1:16686/"
2120
kubectl port-forward --namespace {{ .Release.Namespace }} $POD_NAME 16686:16686
21+
Visit http://127.0.0.1:16686/
2222
{{- end }}

0 commit comments

Comments
 (0)