Skip to content

Commit a92a3f7

Browse files
authored
[jaeger] Major refactoring of templates to simplify (#702)
# [jaeger] Major refactoring for Jaeger v2 ## Summary This PR modernizes the Jaeger Helm chart for **Jaeger v2**, which is built on the OpenTelemetry Collector framework. It removes legacy v1 components and consolidates to a single deployment model with simplified, more maintainable templates. ## Breaking Changes ⚠️ ### Values Schema Changes - **`allInOne:` → `jaeger:`** - The main deployment section has been renamed - **`schema:` section removed** - Cassandra schema job no longer needed (Jaeger v2 handles schema internally) - **`hotrod:` section removed** - Demo app removed from chart - **Storage configuration** moved to `config.extensions.jaeger_storage` using native OTel Collector syntax ### Migration Guide ```yaml # Before (v1) allInOne: image: tag: "1.x.x" # After (v2) jaeger: image: tag: "2.13.0" ``` For storage configuration, see the updated README.md examples. ## Changes ### Templates Removed (Legacy v1 Components) - `allinone-agent-svc.yaml`, `allinone-collector-svc.yaml`, `allinone-query-svc.yaml` - Separate services - `cassandra-schema-job.yaml` & `cassandra-schema-sa.yaml` - Schema initialization - `elasticsearch-secret.yaml` - ES secret management - `es-index-cleaner-cronjob.yaml`, `es-rollover-cronjob.yaml`, `es-lookback-cronjob.yaml` & their SA files - Now in es-maintenance.yaml - `hotrod-*.yaml` - Demo application - `spark-sa.yaml` - Merged into spark-dependencies.yaml ### Templates Renamed - allinone-deploy.yaml → jaeger-deploy.yaml - allinone-sa.yaml → `jaeger-sa.yaml` - allinone-ing.yaml → `jaeger-ing.yaml` - allinone-configmap.yaml → `jaeger-configmap.yaml` - `spark-cronjob.yaml` → `spark-dependencies.yaml` ### Templates Added/Consolidated - service.yaml - Unified service exposing all ports (agent, collector, query, OTLP) - `es-maintenance.yaml` - Consolidated ES maintenance jobs with their ServiceAccounts ### Helper Functions Cleaned Up (_helpers.tpl) Removed ~100 lines of unused helpers including schema, hotrod, and legacy ES helpers. ### values.yaml Improvements - Clear section headers distinguishing `storage.*` (connection settings) from top-level `cassandra:`/`elasticsearch:` (subchart provisioning) - Removed deprecated/unused settings - Added documentation comments throughout ### Documentation - Completely rewritten README.md for Jaeger v2 - Added "Overriding the Jaeger Version" section - Added Spark Dependencies README link - Clarified Cassandra is external-only ### Bug Fixes - Fixed duplicate annotations block in service.yaml - Fixed storage-configmap.yaml to render `Values.config` directly ## Stats - **32 files changed** - **+700 insertions, -1,696 deletions** (net ~1,000 lines removed) ## Testing - [x] `helm lint charts/jaeger` passes - [x] `make test` passes (deploys to local k8s) - [x] Templates render correctly for memory, elasticsearch, and cassandra storage types ## Checklist - [x] Chart version bumped (4.1.5 → 4.2.0) - [x] README.md updated - [x] values.yaml documented - [x] .gitignore updated (added .vscode/) - [x] All commits signed off (DCO) --------- Signed-off-by: Jonah Kowall <[email protected]>
1 parent 7137582 commit a92a3f7

32 files changed

+700
-1696
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,6 @@
22
/charts/*/charts
33
/charts/*/requirements.lock
44
/charts/*/*.tgz
5+
6+
# IDE/Editor settings
7+
.vscode/

Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ test-es:
2121
--set elasticsearch.data.replicaCount=0 \
2222
--set elasticsearch.coordinating.replicaCount=0 \
2323
--set elasticsearch.ingest.replicaCount=0 \
24-
--set elasticsearch.clusterHealthCheckParams=wait_for_status=yellow&timeout=1s \
24+
--set elasticsearch.clusterHealthCheckParams=wait_for_status=yellow&timeout=10s \
25+
--set elasticsearch.readinessProbe.initialDelaySeconds=60 \
26+
--set elasticsearch.readinessProbe.failureThreshold=10 \
2527
--set storage.elasticsearch.scheme=https \
2628
--set storage.elasticsearch.tls.insecure=true"

charts/jaeger/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ appVersion: 2.13.0
33
description: A Jaeger Helm chart for Kubernetes
44
name: jaeger
55
type: application
6-
version: 4.1.5
6+
version: 4.2.0
77
# CronJobs require v1.21
88
kubeVersion: ">= 1.21-0"
99
keywords:

0 commit comments

Comments
 (0)