Remove elasticsearch and cassandra deps. Clean up unused helpers. Simplify.

Signed-off-by: Steven Erb <stevenpc3@live.com>

Author: Stevenpc3

Makefile

@@ -8,22 +8,3 @@ lint:
 .PHONY: test
 test:
 	ct install --config ct.yaml
-
-# This test will spin up the local provisioned elasticsearch and then connect jaeger to it not using memory store
-# it disables the built-in elasticsearch test since it just checks if it's up and jaeger connecting does the same
-# elasticsearch test also requires ssl and jaeger is configured to not require that for local connection
-.PHONY: test-jaeger-connect-elasticsearch
-test-jaeger-connect-elasticsearch:
-	ct install --config ct.yaml \
-		--charts charts/jaeger \
-		--helm-extra-set-args " \
-		--set provisionDataStore.elasticsearch=true \
-		--set storage.type=elasticsearch \
-		--set elasticsearch.tests.enabled=false \
-		--set elasticsearch.readinessProbe.initialDelaySeconds=60 \
-		--set elasticsearch.readinessProbe.failureThreshold=10 \
-		--set elasticsearch.volumeClaimTemplate.resources.requests.storage=5Gi \
-		--set elasticsearch.protocol=http \
-		--set config.extensions.jaeger_query.storage.traces=primary_store_elasticsearch \
-		--set config.extensions.jaeger_query.storage.traces_archive=archive_store_elasticsearch \
-		--set config.exporters.jaeger_storage_exporter.trace_storage=primary_store_elasticsearch "

charts/jaeger/Chart.yaml

@@ -27,14 +27,6 @@ maintainers:
   - 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: 8.5.1
-    repository: https://helm.elastic.co
-    condition: provisionDataStore.elasticsearch
   - name: common
     repository: https://charts.bitnami.com/bitnami
     version: 2.x.x

charts/jaeger/README.md

@@ -12,15 +12,18 @@ This release is a refactor designed to simplify operation and configuration.
 - **Configuration**: Storage is configured via the `config.extensions.jaeger_storage` section using native Jaeger/OTEL config syntax.
 - **Cassandra Schema**: Jaeger v2 handles schema creation internally. The legacy schema job has been removed.
 - **Service Consolidation**: A single Service now exposes all ports (agent, collector, query).
+- **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 
 
 ## Architecture
 
 This chart uses the **All-In-One** deployment model.
 - **Single Binary**: Runs as a `Deployment` scalable to multiple replicas.
 - **Stateless**: Can connect to external persistent storage (Elasticsearch, Cassandra) for production use.
 - **Default**: Memory storage (ephemeral), suitable for testing.
+- **Scalable**: Increase replica count to scale horizontally
 
-## Overriding the Jaeger Version
+## Overriding the Jaeger Version 
+##### (chart only supports Jaever v2+)
 
 You can customize the Jaeger image and tag using the following values:
 
@@ -61,37 +64,16 @@ helm install jaeger jaegertracing/jaeger
 ```
 
 ### 2. Elasticsearch (Production Recommended)
-Configure Jaeger to connect to Elasticsearch using the native config syntax.
 
-You can either use the internal provisioned elasticsearch or point to an external elasticsearch.
+This chart does not provision an ElasticSearch instance.
 
-The internal elasticsearch is configured to __NOT__ require a password or username by default.
+To use ElasticSearch storage, you must provide your own ElasticSearch instance and configure Jaeger via the native config syntax:
 
-#### Internal Provisioned Elasticsearch example:
+#### Elasticsearch example:
 
 **values.yaml**
 ```yaml
-# Use the provisioned Elasticsearch subchart
-provisionDataStore:
-  elasticsearch: true
-
-config:
-  extensions:
-    jaeger_query:
-      storage:
-        traces: primary_store_elasticsearch
-        traces_archive: archive_store_elasticsearch
-  exporters:
-    jaeger_storage_exporter:
-      trace_storage: primary_store_elasticsearch
-```
-
-#### External Elasticsearch example:
-
-**values.yaml**
-```yaml
-# External is very similar but you need to configure the urls
-config:
+userconfig:
   extensions:
     jaeger_query:
       storage:
@@ -119,17 +101,29 @@ config:
 ```
 
 **Running Maintenance Jobs:**
-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.
+
+To run Index Cleaner or Rollover jobs, enable them. 
+They require configuration by adjusting ```storage.elasticsearch``` values.  See that section in values.yaml for more details.
 
 ```yaml
 esIndexCleaner:
   enabled: true
+
+storage:
+  elasticsearch:
+    tls:
+      enabled: false
+    url: http://elasticsearch-master:9200
+    # user: elastic
+    # password: changeme
 ```
 
 * es-rollover __requires__ elasticsearch to be running __BEFORE__ install so the hook job can run.
 
 ### 3. Cassandra
-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:
+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:
 
 **values.yaml Example:**
 ```yaml
@@ -158,7 +152,9 @@ To run the Spark dependencies job (for dependency links graph) set ```spark.enab
 
 Below is an example of how to set overrides.  Please see the values.yaml for more examples:
 
-The values are populated under ```storage.elasticsearch``` Please see comments in values.yaml for more details.
+The values are populated under ```storage.elasticsearch``` and ```storage.casandra``` Please see comments in values.yaml for more details.
+
+You must choose the storage type with ```storage.type=elasticsearch``` or ```storage.type=cassandra```
 
 ```yaml
 spark:
@@ -172,7 +168,11 @@ For a full list of supported environment variables, see the [Spark Dependencies
 
 ### 5. Query UI
 
-To enable the query ui, you need to enable the ingress and fill at least one host:
+To access the ui you can either:
+
+* enable the ingress and fill at least one host
+* provide your own ingress
+* or port forward ```kubectl port-forward --namespace {{ .Release.Namespace }} $POD_NAME 16686:16686 --address 0.0.0.0``` and access at http://localhost:16686/
 
 ```yaml
 jaeger:
@@ -182,6 +182,8 @@ jaeger:
       - <fill a host here>
 ```
 
+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
+
 ## Configuring the Collector
 
 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

@@ -17,6 +17,6 @@ To access the query UI:
   {{- end }}
 {{- else }}
   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}")
-  echo "Visit http://127.0.0.1:16686/"
   kubectl port-forward --namespace {{ .Release.Namespace }} $POD_NAME 16686:16686
+  Visit http://127.0.0.1:16686/
 {{- end }}

charts/jaeger/templates/_helpers.tpl

@@ -95,13 +95,7 @@ Create the name of the esLookback service account to use
 {{- end -}}
 {{- end -}}
 
-
-
-
-
-
 {{- define "cassandra.host" -}}
-{{- if .Values.provisionDataStore.cassandra -}}
 {{- if .Values.storage.cassandra.nameOverride }}
 {{- printf "%s" .Values.storage.cassandra.nameOverride | trunc 63 | trimSuffix "-" }}
 {{- else }}
@@ -114,7 +108,6 @@ Create the name of the esLookback service account to use
 
 {{- define "cassandra.contact_points" -}}
 {{- $port := .Values.storage.cassandra.port | toString }}
-{{- if .Values.provisionDataStore.cassandra -}}
 {{- if .Values.storage.cassandra.nameOverride }}
 {{- $host := printf "%s" .Values.storage.cassandra.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- printf "%s:%s" $host $port }}
@@ -149,6 +142,7 @@ Configure list of IP CIDRs allowed access to load balancer (if supported)
 
 {{/*
 Cassandra related environment variables
+TODO: Is this needed other than spark?
 */}}
 {{- define "cassandra.env" -}}
 - name: CASSANDRA_SERVERS
@@ -190,48 +184,11 @@ Cassandra related environment variables
 {{- end }}
 {{- end -}}
 
-
-{{/*
-grpcPlugin related environment variables
-*/}}
-{{- define "grpcPlugin.env" -}}
-{{- if .Values.storage.grpcPlugin.extraEnv }}
-{{- toYaml .Values.storage.grpcPlugin.extraEnv }}
-{{- end }}
-{{- end -}}
-
-{{/*
-badger related environment variables
-*/}}
-{{- define "badger.env" -}}
-- name: BADGER_EPHEMERAL
-  value: {{ .Values.storage.badger.ephemeral | quote }}
-{{- if not .Values.storage.badger.ephemeral }}
-- name: BADGER_DIRECTORY_VALUE
-  value: {{ print .Values.storage.badger.persistence.mountPath "/badger/data" | quote }}
-- name: BADGER_DIRECTORY_KEY
-  value: {{ print .Values.storage.badger.persistence.mountPath "/badger/key" | quote }}
-{{- end }}
-{{- if .Values.storage.badger.extraEnv }}
-{{- toYaml .Values.storage.badger.extraEnv }}
-{{- end }}
-{{- end -}}
-
-{{/*
-memory related environment variables
-*/}}
-{{- define "memory.env" -}}
-{{- if .Values.storage.memory.extraEnv }}
-{{- toYaml .Values.storage.memory.extraEnv }}
-{{- end }}
-{{- end -}}
-
-
 {{/*
 Elasticsearch related environment variables
 */}}
 {{- define "elasticsearch.env" -}}
-{{- if or .Values.provisionDataStore.elasticsearch (eq .Values.storage.type "elasticsearch") -}}
+{{- if eq .Values.storage.type "elasticsearch" -}}
 {{- $es := .Values.storage.elasticsearch | default dict -}}
 {{- $user := $es.user | default "elastic" -}}
 {{- $password := $es.password | default "changeme" -}}
@@ -253,116 +210,15 @@ Elasticsearch related environment variables
 {{- end -}}
 
 {{/*
-Cassandra, Elasticsearch, or grpc-plugin, badger, memory related environment variables depending on which is used
+Cassandra, Elasticsearch related environment variables depending on which is used
+TODO: storage.env only used in spark
 */}}
 {{- define "storage.env" -}}
 {{- if eq .Values.storage.type "cassandra" -}}
 {{ include "cassandra.env" . }}
-{{- else if or (eq .Values.storage.type "elasticsearch") .Values.provisionDataStore.elasticsearch -}}
-{{ include "elasticsearch.env" . }}
-{{- else if or (eq .Values.storage.type "grpc-plugin") (eq .Values.storage.type "grpc") -}}
-{{ include "grpcPlugin.env" . }}
-{{- else if eq .Values.storage.type "badger" -}}
-{{ include "badger.env" . }}
-{{- else if eq .Values.storage.type "memory" -}}
-{{ include "memory.env" . }}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Cassandra related command line options
-*/}}
-{{- define "cassandra.cmdArgs" -}}
-{{- range $key, $value := .Values.storage.cassandra.cmdlineParams -}}
-{{- if $value }}
-- --{{ $key }}={{ $value }}
-{{- else }}
-- --{{ $key }}
-{{- end -}}
-{{- end -}}
-{{- end -}}
-
-
-{{/*
-Cassandra or Elasticsearch related command line options depending on which is used
-*/}}
-{{- define "storage.cmdArgs" -}}
-{{- if eq .Values.storage.type "cassandra" -}}
-{{- include "cassandra.cmdArgs" . -}}
 {{- else if eq .Values.storage.type "elasticsearch" -}}
-# No specific helper, usage depends on args
-{{- end -}}
-{{- end -}}
-
-
-{{/*
-Provides a basic ingress network policy
-*/}}
-{{- define "jaeger.ingress.networkPolicy" -}}
-apiVersion: {{ include "common.capabilities.networkPolicy.apiVersion" . }}
-kind: NetworkPolicy
-metadata:
-  name: {{ printf "%s-ingress" .Name }}
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app.kubernetes.io/component: {{ .Component }}
-    {{- include "jaeger.labels" . | nindent 4 }}
-spec:
-  podSelector:
-    matchLabels:
-      app.kubernetes.io/component: {{ .Component }}
-  policyTypes:
-  - Ingress
-  ingress:
-  {{- if or .ComponentValues.networkPolicy.ingressRules.namespaceSelector .ComponentValues.networkPolicy.ingressRules.podSelector }}
-  - from:
-    {{- if .ComponentValues.networkPolicy.ingressRules.namespaceSelector }}
-    - namespaceSelector:
-        matchLabels: {{- include "common.tplvalues.render" (dict "value" .ComponentValues.networkPolicy.ingressRules.namespaceSelector "context" $) | nindent 10 }}
-    {{- end }}
-    {{- if .ComponentValues.networkPolicy.ingressRules.podSelector }}
-    - podSelector:
-        matchLabels: {{- include "common.tplvalues.render" (dict "value" .ComponentValues.networkPolicy.ingressRules.podSelector "context" $) | nindent 10 }}
-    {{- end }}
-  {{- end }}
-  {{- if .ComponentValues.networkPolicy.ingressRules.customRules }}
-  {{- include "common.tplvalues.render" (dict "value" .ComponentValues.networkPolicy.ingressRules.customRules "context" $) | nindent 2 }}
-  {{- end }}
+{{ include "elasticsearch.env" . }}
 {{- end -}}
-
-{{/*
-Provides a basic egress network policy
-*/}}
-{{- define "jaeger.egress.networkPolicy" -}}
-apiVersion: {{ include "common.capabilities.networkPolicy.apiVersion" . }}
-kind: NetworkPolicy
-metadata:
-  name: {{ printf "%s-egress" .Name }}
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app.kubernetes.io/component: {{ .Component }}
-    {{- include "jaeger.labels" . | nindent 4 }}
-spec:
-  podSelector:
-    matchLabels:
-      app.kubernetes.io/component: {{ .Component }}
-  policyTypes:
-  - Egress
-  egress:
-  {{- if or .ComponentValues.networkPolicy.egressRules.namespaceSelector .ComponentValues.networkPolicy.egressRules.podSelector }}
-  - to:
-    {{- if .ComponentValues.networkPolicy.egressRules.namespaceSelector }}
-    - namespaceSelector:
-        matchLabels: {{- include "common.tplvalues.render" (dict "value" .ComponentValues.networkPolicy.egressRules.namespaceSelector "context" $) | nindent 10 }}
-    {{- end }}
-    {{- if .ComponentValues.networkPolicy.egressRules.podSelector }}
-    - podSelector:
-        matchLabels: {{- include "common.tplvalues.render" (dict "value" .ComponentValues.networkPolicy.egressRules.podSelector "context" $) | nindent 10 }}
-    {{- end }}
-  {{- end }}
-  {{- if .ComponentValues.networkPolicy.egressRules.customRules }}
-  {{- include "common.tplvalues.render" (dict "value" .ComponentValues.networkPolicy.egressRules.customRules "context" $) | nindent 2 }}
-  {{- end }}
 {{- end -}}
 
 {{/*
@@ -445,15 +301,6 @@ Create pull secrets for esLookback image
 {{- include "common.images.renderPullSecrets" (dict "images" (list .Values.esLookback.image) "context" $) -}}
 {{- end }}
 
-
-{{- define "jaeger.namespace" -}}
-  {{- if .Values.namespaceOverride -}}
-    {{- .Values.namespaceOverride -}}
-  {{- else -}}
-    {{- .Release.Namespace -}}
-  {{- end -}}
-{{- end -}}
-
 {{/*
 Generate command line arguments from a dictionary
 */}}