-
Notifications
You must be signed in to change notification settings - Fork 359
[jaeger] Re-add anonymous Elasticsearch access support #743
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,7 +3,7 @@ appVersion: 2.15.1 | |
| description: A Jaeger Helm chart for Kubernetes | ||
| name: jaeger | ||
| type: application | ||
| version: 4.5.0 | ||
| version: 4.5.1 | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please set a user value and password value in the values.yaml to eliminate this concern. Simply uncomment the values here for user and password. This will ensure the same default values. If anyone wants anonymous they can comment them again or set them to "" in an override
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @domolitom can you please add this to ensure the backwards compatibility is fine |
||
| # Artifact Hub annotations | ||
| # The jaeger image is whitelisted from security scanning because the reported | ||
| # CVEs are in the upstream Alpine base image (OpenSSL libcrypto3/libssl3) and | ||
|
|
||
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -182,17 +182,19 @@ Elasticsearch related environment variables | |||||||||||||||||||||||||||||
| {{- define "elasticsearch.env" -}} | ||||||||||||||||||||||||||||||
| {{- if eq .Values.storage.type "elasticsearch" -}} | ||||||||||||||||||||||||||||||
| {{- $es := .Values.storage.elasticsearch | default dict -}} | ||||||||||||||||||||||||||||||
| {{- $user := $es.user | default "elastic" -}} | ||||||||||||||||||||||||||||||
| {{- $password := $es.password | default "changeme" -}} | ||||||||||||||||||||||||||||||
| {{- $url := $es.url | default "http://elasticsearch-master:9200" -}} | ||||||||||||||||||||||||||||||
| {{- if $es.user }} | ||||||||||||||||||||||||||||||
| - name: ES_USERNAME | ||||||||||||||||||||||||||||||
| value: {{ $es.user | quote }} | ||||||||||||||||||||||||||||||
| {{- end }} | ||||||||||||||||||||||||||||||
| {{- if $es.password }} | ||||||||||||||||||||||||||||||
| - name: ES_PASSWORD | ||||||||||||||||||||||||||||||
| value: {{ $es.password | quote }} | ||||||||||||||||||||||||||||||
|
Comment on lines
+185
to
+191
|
||||||||||||||||||||||||||||||
| {{- if $es.user }} | |
| - name: ES_USERNAME | |
| value: {{ $es.user | quote }} | |
| {{- end }} | |
| {{- if $es.password }} | |
| - name: ES_PASSWORD | |
| value: {{ $es.password | quote }} | |
| {{- if and $es.user $es.password }} | |
| - name: ES_USERNAME | |
| value: {{ $es.user | quote }} | |
| - name: ES_PASSWORD | |
| value: {{ $es.password | quote }} | |
| {{- else if or $es.user $es.password }} | |
| {{- fail "both storage.elasticsearch.user and storage.elasticsearch.password must be set or both omitted" }} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Eh, this might be true only because of how Jaeger creates basic auth, but I think it's beneficial to keep separate as you can create an anonymous user in elastcsearch that takes no password, but does require a user name
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Agreed — keeping them independent makes sense since ES supports users without passwords. No changes needed here.
Uh oh!
There was an error while loading. Please reload this page.