[bitnami/mastodon] Move defaultConfig and defaultSecretConfig to default-configmap.yaml and default-secret.yaml respectively and add mastodon secret env vars#19179
Merged
fevisera merged 20 commits intobitnami:mainfrom Nov 2, 2023
jessebot:fix/move-all-templating-out-of-values-file
Merged
[bitnami/mastodon] Move defaultConfig and defaultSecretConfig to default-configmap.yaml and default-secret.yaml respectively and add mastodon secret env vars#19179fevisera merged 20 commits intobitnami:mainfrom jessebot:fix/move-all-templating-out-of-values-file
defaultConfig and defaultSecretConfig to default-configmap.yaml and default-secret.yaml respectively and add mastodon secret env vars#19179fevisera merged 20 commits intobitnami:mainfrom
jessebot:fix/move-all-templating-out-of-values-file
Conversation
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
Moves the templated values for
defaultConfiganddefaultSecretConfiginto default-configmap.yaml and default-secret.yaml respectively.Also makes the
adminUser,adminEmail, andsmtp.servervalues optional, so that they can be provided via an external secret instead.Adds new
otpSecret,secretBaseKey,vapidPublicKeyandvapidPrivateKeyas parameters, as they did not have them before but are required as per mastodon secrets docs. I didn't see anything in the Bitnami helm chart or Bitnami container for mastodon that actually generates these though, so I put a note that you need to useraketo generate them.defaultConfiganddefaultSecretare currently gone, because you can still specify extra ConfigMap/Secret values, or alternative ConfigMap/Secret.Benefits
This allows users to use external tools that utilize go templating, e.g. Argo CD ApplicationSets using generators, without running into conflicts.
Possible drawbacks
Not sure there are any, as alternative or extra configuration can still be specified for both ConfigMap/Secrets.
There's enough mastodon parameters, perhaps it makes sense to have a
mastodon.secretsparam that we nest params likeotpSecret,secretBaseKey,vapidPublicKeyandvapidPrivateKeyunder.Applicable issues
Additional information
Let me know if there's anything you want to change.
Checklist
Chart.yamlaccording to semver. This is not necessary when the changes only affect README.md files.README.mdusing readme-generator-for-helm