diff --git a/charts/mastodon/Chart.yaml b/charts/mastodon/Chart.yaml index 02da22d1a3af7f90e318a04f8b2af165a2c41c46..bb850c99964bb2f18bbb73ba2f3545bbf57bf4a5 100644 --- a/charts/mastodon/Chart.yaml +++ b/charts/mastodon/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 3.0.2 +version: 3.0.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/charts/mastodon/README.md b/charts/mastodon/README.md index a66ab4f048e34460b2c66123b39ad7d40fec5d96..6ab99d18af5fc6f46c5a9673beb61dd02b427e69 100644 --- a/charts/mastodon/README.md +++ b/charts/mastodon/README.md @@ -1,6 +1,6 @@ # mastodon -   +   Mastodon is a free, open-source social network server based on ActivityPub. diff --git a/charts/mastodon/templates/deployment-sidekiq.yaml b/charts/mastodon/templates/deployment-sidekiq.yaml index 9675e57017423edf91feb57f2be4399da56a1fbd..8180b62e28b9e29f7855d2c496289ba46acc6f5b 100644 --- a/charts/mastodon/templates/deployment-sidekiq.yaml +++ b/charts/mastodon/templates/deployment-sidekiq.yaml @@ -120,7 +120,7 @@ spec: mountPath: /opt/mastodon/public/system {{- end }} resources: - {{- toYaml .resources | nindent 12 }} + {{- toYaml (default (default $context.resources $context.mastodon.sidekiq.resources) .resources) | nindent 12 }} {{- with $context.Values.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }}