[bitnami/jaeger] Add support for cassandra existingSecret #26563
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Miguel Ruiz <[email protected]>
Signed-off-by: Bitnami Containers <[email protected]>
Signed-off-by: Bitnami Containers <[email protected]>
juan131
requested changes
May 31, 2024
| @@ -142,10 +142,10 @@ ref. https://github.com/jaegertracing/jaeger-operator/issues/1158 | |||
| Create the cassandra secret name | |||
| */}} | |||
| {{- define "jaeger.cassandra.secretName" -}} | |||
| {{- if not .Values.cassandra.enabled -}} | |||
| {{- .Values.externalDatabase.existingSecret -}} | |||
| {{- if (not .Values.cassandra.enabled) -}} | |||
There was a problem hiding this comment.
There's no reason for adding these parenthesis
| {{- else -}} | ||
| {{- printf "%s-cassandra" (include "common.names.fullname" .) -}} | ||
| {{- default (printf "%s-cassandra" .Release.Name) .Values.cassandra.dbUser.existingSecret -}} |
There was a problem hiding this comment.
Create another helper that returns the Cassandra fullname:
{{/*
Return the proper Jaeger Cassandra database fullname
*/}}
{{- define "jaeger.cassandra.fullname" -}}
{{- include "common.names.dependency.fullname" (dict "chartName" "cassandra" "chartValues" .Values.cassandra "context" $) -}}
{{- end -}}
Then, use it here:
Suggested change
| {{- default (printf "%s-cassandra" .Release.Name) .Values.cassandra.dbUser.existingSecret -}} | |
| {{- default (include "jaeger.cassandra.fullname" .) .Values.cassandra.dbUser.existingSecret -}} |
|
This Pull Request has been automatically marked as "stale" because it has not had recent activity (for 15 days). It will be closed if no further activity occurs. Thank you for your contribution. |
Signed-off-by: Carlos Rodríguez Hernández <[email protected]>
Signed-off-by: Bitnami Containers <[email protected]>
Signed-off-by: Miguel Ruiz <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of the change
Fixes an issue where Jaeger would not use the provided Cassandra existingSecret value.
Applicable issues
Checklist
Chart.yamlaccording to semver. This is not necessary when the changes only affect README.md files.README.mdusing readme-generator-for-helm