-
Notifications
You must be signed in to change notification settings - Fork 9.3k
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
[bitnami/kibana] template server.publicBaseUrl in all variants #30807
base: main
Are you sure you want to change the base?
Conversation
Previously, if .Values.extraConfiguration."server.publicBaseUrl" was specified (with a dot in the key), that key was inserted into the configmap twice, causing Kibana to error out. Furthermore, since the introduction of the fallback to the ingress hostname, this setting couldn't be templated anymore (which was possible before). This commit allows the templating as well as specifying it with the dot notation. Signed-off-by: Jan-Philipp Litza <[email protected]>
Signed-off-by: Bitnami Containers <[email protected]>
Signed-off-by: Bitnami Containers <[email protected]>
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. |
Due to the lack of activity in the last 5 days since it was marked as "stale", we proceed to close this Pull Request. Do not hesitate to reopen it later if necessary. |
Wow, auto-closing due to staleness over the holidays... thanks. @carrodher @gongomgra Do you have the permissions to "reopen" this PR, as suggested? Because I don't. |
Signed-off-by: Carlos Rodríguez Hernández <[email protected]>
Signed-off-by: Bitnami Containers <[email protected]>
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.
Thanks for your contribution! I have added a couple of comments to your changes.
{{- if or .Values.configuration.server.publicBaseUrl .Values.ingress.enabled }} | ||
server.publicBaseUrl: {{ default .Values.ingress.hostname .Values.configuration.server.publicBaseUrl }} | ||
{{- if or .Values.configuration.server.publicBaseUrl ( get .Values.configuration "server.publicBaseUrl" ) .Values.ingress.enabled }} | ||
server.publicBaseUrl: {{ include "common.tplvalues.render" ( dict "value" ( or .Values.configuration.server.publicBaseUrl ( get .Values.configuration "server.publicBaseUrl" ) .Values.ingress.hostname ) "context" $ ) }} |
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.
Not sure if we should accept "server.publicBaseUrl"
as a valid value. We would have to accept it (or even add it) for all other parameters in our charts. Can you provide us with more details on why do you need that format to be available? My understanding is that the format of the current values.yaml
file is simple enough.
## @param configuration [object] Kibana configuration
##
configuration:
server:
basePath: ""
host: "0.0.0.0"
publicBaseUrl: ""
rewriteBasePath: false
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.
Sorry, this was supposed to be get .Values.extraConfiguration "server.publicBaseUrl"
I added that because before #28543, that would have been what you set. For example, this is what we had in the values.yaml of our umbrella chart (which broke when updating to 11.2.16 or later):
kibana:
extraConfiguration:
server.publicBaseUrl: http{{ .Values.ingress.tls | ternary "s" "" }}://{{ .Values.ingress.hostname }}
Signed-off-by: Bitnami Containers <[email protected]>
Thank you for initiating this pull request. We appreciate your effort. This is just a friendly reminder that signing your commits is important. Your signature certifies that you either authored the patch or have the necessary rights to contribute to the changes. You can find detailed information on how to do this in the “Sign your work” section of our contributing guidelines. Feel free to reach out if you have any questions or need assistance with the signing process. |
Description of the change
Previously, if
.Values.extraConfiguration."server.publicBaseUrl"
was specified (with a dot in the key), that key was inserted into the configmap twice, causing Kibana to error out.Furthermore, since the introduction of the fallback to the ingress hostname, this setting couldn't be templated anymore (which was possible before).
This commit allows the templating as well as specifying it with the dot notation.
Benefits
Upgrades from old chart versions that specified the dotted extraConfiguration won't break the deployment.
Also, templating the publicBaseUrl is possible again.
Possible drawbacks
None.
Applicable issues
Additional information
Checklist
Chart.yaml
according to semver. This is not necessary when the changes only affect README.md files.README.md
using readme-generator-for-helm