diff --git a/CHANGELOG.md b/CHANGELOG.md index 89d5c57..f4a01c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,16 @@ -# 6.1.1 +# 6.2.1 - Fixed some situations where disabling all bitnami charts caused it to error. - Fixed a potential null postgresql host value error. +# 6.2.0 + +- Added ability to add pod labels to pods created from Deployment objects at the global level + +# 6.1.1 + +- Updated the Mastodon version to v4.3.6 + # 6.1.0 - Added a new job to re/build elasticsearch indices as a post-upgrade hook: diff --git a/Chart.yaml b/Chart.yaml index b6f844a..1683d61 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -15,12 +15,12 @@ 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: 6.1.1 +version: 6.2.1 # 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 # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: "v4.3.5" +appVersion: "v4.3.6" dependencies: - name: elasticsearch diff --git a/templates/deployment-sidekiq.yaml b/templates/deployment-sidekiq.yaml index 5951bd6..74f6472 100644 --- a/templates/deployment-sidekiq.yaml +++ b/templates/deployment-sidekiq.yaml @@ -53,6 +53,9 @@ spec: {{- include "mastodon.globalLabels" $context | nindent 8 }} {{- include "mastodon.selectorLabels" $context | nindent 8 }} {{- include "mastodon.statsdExporterLabels" $context | nindent 8 }} + {{- with $context.Values.mastodon.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} {{- with $context.Values.mastodon.sidekiq.podLabels }} {{- toYaml . | nindent 8 }} {{- end }} diff --git a/templates/deployment-streaming.yaml b/templates/deployment-streaming.yaml index 1139f9d..6715195 100644 --- a/templates/deployment-streaming.yaml +++ b/templates/deployment-streaming.yaml @@ -40,6 +40,9 @@ spec: labels: {{- include "mastodon.globalLabels" . | nindent 8 }} {{- include "mastodon.selectorLabels" . | nindent 8 }} + {{- with .Values.mastodon.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} {{- with .Values.mastodon.streaming.podLabels }} {{- toYaml . | nindent 8 }} {{- end }} diff --git a/templates/deployment-web.yaml b/templates/deployment-web.yaml index 078bb5f..c62af1a 100644 --- a/templates/deployment-web.yaml +++ b/templates/deployment-web.yaml @@ -42,6 +42,9 @@ spec: {{- include "mastodon.globalLabels" . | nindent 8 }} {{- include "mastodon.selectorLabels" . | nindent 8 }} {{- include "mastodon.statsdExporterLabels" . | nindent 8 }} + {{- with .Values.mastodon.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} {{- with .Values.mastodon.web.podLabels }} {{- toYaml . | nindent 8 }} {{- end }} diff --git a/values.yaml b/values.yaml index 89e637b..26f69be 100644 --- a/values.yaml +++ b/values.yaml @@ -13,6 +13,8 @@ image: mastodon: # Labels added to every Mastodon-related object labels: {} + # Labes added to every deployed mastodon pod + podLabels: {} # -- create an initial administrator user; the password is autogenerated and will # have to be reset