Skip to content

[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
jessebot:fix/move-all-templating-out-of-values-file
Nov 2, 2023
Merged

[bitnami/mastodon] Move defaultConfig and defaultSecretConfig to default-configmap.yaml and default-secret.yaml respectively and add mastodon secret env vars#19179
fevisera merged 20 commits intobitnami:mainfrom
jessebot:fix/move-all-templating-out-of-values-file

Conversation

@jessebot
Copy link
Copy Markdown
Contributor

@jessebot jessebot commented Sep 7, 2023

Description of the change

Moves the templated values for defaultConfig and defaultSecretConfig into default-configmap.yaml and default-secret.yaml respectively.

Also makes the adminUser, adminEmail, and smtp.server values optional, so that they can be provided via an external secret instead.

Adds new otpSecret, secretBaseKey, vapidPublicKey and vapidPrivateKey as 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 use rake to generate them.

defaultConfig and defaultSecret are 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.secrets param that we nest params like otpSecret, secretBaseKey, vapidPublicKey and vapidPrivateKey under.

Applicable issues

Additional information

Let me know if there's anything you want to change.

Checklist

  • Chart version bumped in Chart.yaml according to semver. This is not necessary when the changes only affect README.md files.
  • Variables are documented in the values.yaml and added to the README.md using readme-generator-for-helm
  • Title of the pull request follows this pattern [bitnami/<name_of_the_chart>] Descriptive title
  • All commits signed off and in agreement of Developer Certificate of Origin (DCO)

Loading
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

mastodon solved verify Execute verification workflow for these changes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[bitnami/mastodon] Use of go templating inside of values.yaml for mastodon chart breaks Argo CD ApplicationSets

4 participants