Skip to content

Conversation

@jkowall
Copy link
Contributor

@jkowall jkowall commented Dec 14, 2025

What this PR does

Remove bitnami charts which are dead and not updated
Added charts for Strimzi (Kafka) and Elastic official chart

Which issue this PR fixes

Fixes security issues

Checklist

  • DCO signed
  • Commits are GPG signed
  • Chart Version bumped
  • Title of the PR starts with chart name ([jaeger] or [jaeger-operator])
  • README.md has been updated to match version/contain new values

Signed-off-by: Jonah Kowall <[email protected]>
Signed-off-by: Jonah Kowall <[email protected]>
Signed-off-by: Jonah Kowall <[email protected]>
Signed-off-by: Jonah Kowall <[email protected]>
@yurishkuro
Copy link
Member

We don't support Kafka in the new chart, can remove it. And why not chart from confluence, main contributor?

@jkowall
Copy link
Contributor Author

jkowall commented Dec 14, 2025

We don't support Kafka in the new chart, can remove it. And why not chart from confluence, main contributor?

Okay I will remove it. Strimzi is a CNCF project and is used to run Kafka on Kubernetes so I figured it was the right choice.

ct.yaml Outdated
- elastic=https://helm.elastic.co
- bitnami=https://charts.bitnami.com/bitnami
validate-chart-schema: false
validate-yaml: false
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why would we not want to validate? It's just a recipe for bugs.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah sorry, was debugging but fixed it now.

Signed-off-by: Jonah Kowall <[email protected]>
Signed-off-by: Jonah Kowall <[email protected]>
{{- else -}}
{{- $clusterName := default "elasticsearch" $es.clusterName }}
{{- $host = printf "%s-master" $clusterName }}
{{- end }}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I really don't understand why we need all this complexity. I think it's none of Jaeger's business how users want to provision ES. Just look at this, a dozen files in our chart have to mention ES:

$ rg -l elastic
charts/jaeger/Chart.lock
charts/jaeger/Chart.yaml
charts/jaeger/README.md
ct.yaml
charts/jaeger/values.yaml
charts/jaeger/templates/elasticsearch-secret.yaml
charts/jaeger/templates/es-rollover-cronjob.yaml
charts/jaeger/templates/es-lookback-cronjob.yaml
charts/jaeger/templates/allinone-deploy.yaml
charts/jaeger/templates/es-index-cleaner-cronjob.yaml
charts/jaeger/templates/es-rollover-hook.yml
charts/jaeger/templates/spark-cronjob.yaml
charts/jaeger/templates/_helpers.tpl
charts/jaeger/templates/storage-configmap.yaml

I wouldn't even have any dependency on it in the Jaeger chart. But if we really-really want to make it very easy to setup Jaeger with ES via --set provisionDataStore.elasticsearch=true, fine, we have the default elasticsearch: settings in values.yaml, that is passed through to ES chart. If users want to customize those settings, they can edit that section. Why do we need any other logic? All the convoluted logic above is not tested in the CI, so I have no idea if it works.

This is not helping users, it's making them learn some completely arbitrary rules / DSL instead of relying on standard configs.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Those were already there before; I can clean it up if you want. I didn't try to clean up all of those templates.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know, but this PR is now adding these 10 more lines of some obscure override logic. Are we trying to guess which name ES chart gives to its endpoint?

But to the larger point - yes I think we need to revisit the overall chart organization and remove all custom overrides logic. I think we need to keep it simple - if you want defaults, we provide them. If you want to customize - you provide full configuration.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The challenge is that the Elastic official chart uses different settings than the older Bitnami one, so the goal is to make it work. If we want to fix the fundamental issues, we should revisit all that logic. I can give it a go if you'd like.

@@ -0,0 +1,15 @@
#!/bin/bash
set -e
ct install --config ct.yaml \
Copy link
Member

@yurishkuro yurishkuro Dec 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this different from how lint-test workflow calls this? If not, I would prefer to remove this shell script, add a Makefile with a target test containing this exact command, and change the workflow to call make test-es

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@yurishkuro yurishkuro merged commit 804ee85 into jaegertracing:main Dec 14, 2025
4 checks passed
yurishkuro added a commit that referenced this pull request Dec 14, 2025
@jkowall jkowall deleted the helm-location-updates branch December 15, 2025 13:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants