From 826d6e945f80f5618f3455c978f1a40a230e3060 Mon Sep 17 00:00:00 2001 From: James Hammett Date: Fri, 2 Feb 2024 06:03:35 -0700 Subject: [PATCH 01/13] add tolerations specific to web deployment to template (#100) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Norman <85173861+norman-zon@users.noreply.github.com> Co-authored-by: Alex Nordlund Co-authored-by: Effy Elden Co-authored-by: Sheogorath Co-authored-by: Chris Funderburg Co-authored-by: Roberto Santalla Co-authored-by: Radim Dostál Co-authored-by: Jim Myhrberg Co-authored-by: David Sanftenberg Co-authored-by: Alexander "Ananace" Olofsson Co-authored-by: Renaud Chaput Co-authored-by: Varac Co-authored-by: Cees-Jan Kiewiet Co-authored-by: Tim Campbell --- templates/deployment-web.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/deployment-web.yaml b/templates/deployment-web.yaml index 47aa0f6..b8e8533 100644 --- a/templates/deployment-web.yaml +++ b/templates/deployment-web.yaml @@ -202,7 +202,7 @@ spec: topologySpreadConstraints: {{- toYaml . | nindent 8 }} {{- end }} - {{- with .Values.tolerations }} + {{- with (default .Values.tolerations .Values.mastodon.web.tolerations) }} tolerations: {{- toYaml . | nindent 8 }} {{- end }} From f5c9cdc36482b094fcb536206c5c9f609af0fe19 Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Sat, 3 Feb 2024 13:36:54 +0100 Subject: [PATCH 02/13] feat(app): upgrade Mastodon to 4.2.5 The default `image.tag` value has been changed from `v4.2` to the exact `v4.2.5` version. With the non-exact version tag, patch upgrades on existing installs would be missed unless `image.pullPolicy` has been customized to `Always`. --- Chart.yaml | 4 ++-- values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Chart.yaml b/Chart.yaml index cae84cd..0809c9a 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: 4.1.0 +version: 4.1.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.2.3 +appVersion: v4.2.5 dependencies: - name: elasticsearch diff --git a/values.yaml b/values.yaml index 237ace5..352c203 100644 --- a/values.yaml +++ b/values.yaml @@ -6,7 +6,7 @@ image: # built from the most recent commit # # tag: latest - tag: "v4.2" + tag: "v4.2.5" # use `Always` when using `latest` tag pullPolicy: IfNotPresent From ef9e071c386ab860170be75d7e8ce0e6bde4b99c Mon Sep 17 00:00:00 2001 From: lleyton Date: Wed, 14 Feb 2024 09:08:13 -0800 Subject: [PATCH 03/13] Use unique annotation key for smtp secret checksum (#48) (#51) --- templates/deployment-sidekiq.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/deployment-sidekiq.yaml b/templates/deployment-sidekiq.yaml index 8cae4f3..c6ba2eb 100644 --- a/templates/deployment-sidekiq.yaml +++ b/templates/deployment-sidekiq.yaml @@ -36,7 +36,7 @@ spec: {{- end }} # roll the pods to pick up any db migrations or other changes {{- include "mastodon.rollingPodAnnotations" $context | nindent 8 }} - checksum/config-secrets: {{ include ( print $.Template.BasePath "/secret-smtp.yaml" ) $context | sha256sum | quote }} + checksum/config-secrets-smtp: {{ include ( print $.Template.BasePath "/secret-smtp.yaml" ) $context | sha256sum | quote }} labels: {{- include "mastodon.globalLabels" $context | nindent 8 }} {{- include "mastodon.selectorLabels" $context | nindent 8 }} From d7dea06a2e7be89172ea16a96d2a32a394d0f63c Mon Sep 17 00:00:00 2001 From: Daniel Jilg Date: Wed, 14 Feb 2024 18:14:03 +0100 Subject: [PATCH 04/13] Fix a typo in values.yaml (#123) --- values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/values.yaml b/values.yaml index 352c203..39e1ff9 100644 --- a/values.yaml +++ b/values.yaml @@ -48,7 +48,7 @@ mastodon: singleUserMode: false # -- Enables "Secure Mode" for more details see: https://docs.joinmastodon.org/admin/config/#authorized_fetch authorizedFetch: false - # -- Enables "Limited Federation Mode" for more detauls see: https://docs.joinmastodon.org/admin/config/#limited_federation_mode + # -- Enables "Limited Federation Mode" for more details see: https://docs.joinmastodon.org/admin/config/#limited_federation_mode limitedFederationMode: false persistence: assets: From 84f04add25d4e3ba6de6b4623ee0bd5eed451349 Mon Sep 17 00:00:00 2001 From: Alistair Young Date: Fri, 16 Feb 2024 01:59:05 -0600 Subject: [PATCH 05/13] Enable supplementary environment variables. (#69) Co-authored-by: Tim Campbell --- templates/deployment-sidekiq.yaml | 4 ++++ templates/deployment-streaming.yaml | 4 ++++ templates/deployment-web.yaml | 4 ++++ values.yaml | 9 ++++++++- 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/templates/deployment-sidekiq.yaml b/templates/deployment-sidekiq.yaml index c6ba2eb..cb98dc2 100644 --- a/templates/deployment-sidekiq.yaml +++ b/templates/deployment-sidekiq.yaml @@ -100,6 +100,10 @@ spec: name: {{ include "mastodon.fullname" $context }}-env - secretRef: name: {{ template "mastodon.secretName" $context }} + {{- if $context.Values.mastodon.extraEnvFrom }} + - configMapRef: + name: {{ $context.Values.mastodon.extraEnvFrom }} + {{- end}} env: - name: "DB_PASS" valueFrom: diff --git a/templates/deployment-streaming.yaml b/templates/deployment-streaming.yaml index 1e4acaa..b3c26bd 100644 --- a/templates/deployment-streaming.yaml +++ b/templates/deployment-streaming.yaml @@ -51,6 +51,10 @@ spec: envFrom: - configMapRef: name: {{ include "mastodon.fullname" . }}-env + {{- if .Values.mastodon.extraEnvFrom }} + - configMapRef: + name: {{ .Values.mastodon.extraEnvFrom }} + {{- end}} env: - name: "DB_PASS" valueFrom: diff --git a/templates/deployment-web.yaml b/templates/deployment-web.yaml index b8e8533..28490a7 100644 --- a/templates/deployment-web.yaml +++ b/templates/deployment-web.yaml @@ -77,6 +77,10 @@ spec: name: {{ include "mastodon.fullname" . }}-env - secretRef: name: {{ template "mastodon.secretName" . }} + {{- if .Values.mastodon.extraEnvFrom }} + - configMapRef: + name: {{ .Values.mastodon.extraEnvFrom }} + {{- end}} env: - name: "DB_PASS" valueFrom: diff --git a/values.yaml b/values.yaml index 39e1ff9..8378928 100644 --- a/values.yaml +++ b/values.yaml @@ -274,8 +274,15 @@ mastodon: # Sets the PREPARED_STATEMENTS environment variable: https://docs.joinmastodon.org/admin/config/#prepared_statements preparedStatements: true - # Additional env vars defined in all pods + + # Specify extra environment variables to be added to all Mastodon pods. + # These can be used for configuration not included in this chart (including configuration for Mastodon varietals.) extraEnvVars: {} + + # Alternatively specify extra environment variables stored in a ConfigMap. + # The specified ConfigMap should contain the additional environment variables in key-value format. + # extraEnvFrom: + ingress: enabled: true From e5b256d45c82eac3d94f46717748643586920368 Mon Sep 17 00:00:00 2001 From: Alexandra Catalina Date: Fri, 16 Feb 2024 02:21:29 -0800 Subject: [PATCH 06/13] move changes into separate CHANGELOG, add notes for 4.x (#124) --- CHANGELOG.md | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 54 ------------------------------- 2 files changed, 90 insertions(+), 54 deletions(-) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..8ef3161 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,90 @@ +# [4.0.0](https://github.com/mastodon/chart/compare/920cf37..ae892d5) + +- adds support for multiple Sidekiq deployments to be configured to manage + different sets of queues. + +- smtp: replaces `enable_starttls_auto` boolean with `enable_starttls` setting + that defaults to `auto`. + +- adds support for statsd publishing: + ``` + mastodon: + metrics: + statsd: + address: + ``` + +- allows disabling the included redis deployment in order to use an existing external redis server: + ``` + redis: + enabled: false + ``` + +- adds support for [authorized + fetch](https://docs.joinmastodon.org/admin/config/#authorized_fetch): + ``` + mastodon: + authorizedFetch: true + ``` + +- removed the `HorizontalPodAutoscaler` and the global autoscaling configuration. + +A number of other configuration options have been added, see [values.yaml](./values.yaml). + +# 3.0.0 + +skipped + +# 2.1.0 + +## ingressClassName and tls-acme changes +The annotations previously defaulting to nginx have been removed and support + for ingressClassName has been added. +```yaml +ingress: + annotations: + kubernetes.io/ingress.class: nginx + kubernetes.io/tls-acme: "true" +``` + +To restore the old functionality simply add the above snippet to your `values.yaml`, +but the recommendation is to replace these with `ingress.ingressClassName` and use +cert-manager's issuer/cluster-issuer instead of tls-acme. +If you're uncertain about your current setup leave `ingressClassName` empty and add +`kubernetes.io/tls-acme` to `ingress.annotations` in your `values.yaml`. + +# 2.0.0 + +## Fixed labels +Because of the changes in [#19706](https://github.com/mastodon/mastodon/pull/19706) the upgrade may fail with the following error: +```Error: UPGRADE FAILED: cannot patch "mastodon-sidekiq"``` + +If you want an easy upgrade and you're comfortable with some downtime then +simply delete the -sidekiq, -web, and -streaming Deployments manually. + +If you require a no-downtime upgrade then: +1. run `helm template` instead of `helm upgrade` +2. Copy the new -web and -streaming services into `services.yml` +3. Copy the new -web and -streaming deployments into `deployments.yml` +4. Append -temp to the name of each deployment in `deployments.yml` +5. `kubectl apply -f deployments.yml` then wait until all pods are ready +6. `kubectl apply -f services.yml` +7. Delete the old -sidekiq, -web, and -streaming deployments manually +8. `helm upgrade` like normal +9. `kubectl delete -f deployments.yml` to clear out the temporary deployments + +## PostgreSQL passwords +If you've previously installed the chart and you're having problems with +postgres not accepting your password then make sure to set `username` to +`postgres` and `password` and `postgresPassword` to the same passwords. +```yaml +postgresql: + auth: + username: postgres + password: + postgresPassword: +``` + +And make sure to set `password` to the same value as `postgres-password` +in your `mastodon-postgresql` secret: +```kubectl edit secret mastodon-postgresql``` diff --git a/README.md b/README.md index 53f9599..a595a4d 100644 --- a/README.md +++ b/README.md @@ -64,57 +64,3 @@ Sidekiq deployments, it’s possible they will occur in the wrong order. After upgrading Mastodon versions, it may sometimes be necessary to manually delete the Rails and Sidekiq pods so that they are recreated against the latest migration. - -# Upgrades in 2.1.0 - -## ingressClassName and tls-acme changes -The annotations previously defaulting to nginx have been removed and support - for ingressClassName has been added. -```yaml -ingress: - annotations: - kubernetes.io/ingress.class: nginx - kubernetes.io/tls-acme: "true" -``` - -To restore the old functionality simply add the above snippet to your `values.yaml`, -but the recommendation is to replace these with `ingress.ingressClassName` and use -cert-manager's issuer/cluster-issuer instead of tls-acme. -If you're uncertain about your current setup leave `ingressClassName` empty and add -`kubernetes.io/tls-acme` to `ingress.annotations` in your `values.yaml`. - -# Upgrades in 2.0.0 - -## Fixed labels -Because of the changes in [#19706](https://github.com/mastodon/mastodon/pull/19706) the upgrade may fail with the following error: -```Error: UPGRADE FAILED: cannot patch "mastodon-sidekiq"``` - -If you want an easy upgrade and you're comfortable with some downtime then -simply delete the -sidekiq, -web, and -streaming Deployments manually. - -If you require a no-downtime upgrade then: -1. run `helm template` instead of `helm upgrade` -2. Copy the new -web and -streaming services into `services.yml` -3. Copy the new -web and -streaming deployments into `deployments.yml` -4. Append -temp to the name of each deployment in `deployments.yml` -5. `kubectl apply -f deployments.yml` then wait until all pods are ready -6. `kubectl apply -f services.yml` -7. Delete the old -sidekiq, -web, and -streaming deployments manually -8. `helm upgrade` like normal -9. `kubectl delete -f deployments.yml` to clear out the temporary deployments - -## PostgreSQL passwords -If you've previously installed the chart and you're having problems with -postgres not accepting your password then make sure to set `username` to -`postgres` and `password` and `postgresPassword` to the same passwords. -```yaml -postgresql: - auth: - username: postgres - password: - postgresPassword: -``` - -And make sure to set `password` to the same value as `postgres-password` -in your `mastodon-postgresql` secret: -```kubectl edit secret mastodon-postgresql``` \ No newline at end of file From 8e5ab7c0682151c6939aab6d6a11869a94c65d5d Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Fri, 16 Feb 2024 10:32:01 +0000 Subject: [PATCH 07/13] feat(deployments): make spec.revisionHistoryLimit configurable (#121) --- templates/deployment-sidekiq.yaml | 4 +++- templates/deployment-streaming.yaml | 4 +++- templates/deployment-web.yaml | 4 +++- values.yaml | 5 +++++ 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/templates/deployment-sidekiq.yaml b/templates/deployment-sidekiq.yaml index cb98dc2..b906149 100644 --- a/templates/deployment-sidekiq.yaml +++ b/templates/deployment-sidekiq.yaml @@ -22,7 +22,9 @@ spec: type: Recreate {{- end }} replicas: {{ .replicas }} - revisionHistoryLimit: 2 + {{- if (ne (toString $context.Values.mastodon.revisionHistoryLimit) "") }} + revisionHistoryLimit: {{ $context.Values.mastodon.revisionHistoryLimit }} + {{- end }} selector: matchLabels: {{- include "mastodon.selectorLabels" $context | nindent 6 }} diff --git a/templates/deployment-streaming.yaml b/templates/deployment-streaming.yaml index b3c26bd..e64d38f 100644 --- a/templates/deployment-streaming.yaml +++ b/templates/deployment-streaming.yaml @@ -10,7 +10,9 @@ metadata: {{- end }} spec: replicas: {{ .Values.mastodon.streaming.replicas }} - revisionHistoryLimit: 2 + {{- if (ne (toString .Values.mastodon.revisionHistoryLimit) "") }} + revisionHistoryLimit: {{ .Values.mastodon.revisionHistoryLimit }} + {{- end }} selector: matchLabels: {{- include "mastodon.selectorLabels" . | nindent 6 }} diff --git a/templates/deployment-web.yaml b/templates/deployment-web.yaml index 28490a7..b1bb0b8 100644 --- a/templates/deployment-web.yaml +++ b/templates/deployment-web.yaml @@ -10,7 +10,9 @@ metadata: {{- end }} spec: replicas: {{ .Values.mastodon.web.replicas }} - revisionHistoryLimit: 2 + {{- if (ne (toString .Values.mastodon.revisionHistoryLimit) "") }} + revisionHistoryLimit: {{ .Values.mastodon.revisionHistoryLimit }} + {{- end }} selector: matchLabels: {{- include "mastodon.selectorLabels" . | nindent 6 }} diff --git a/values.yaml b/values.yaml index 8378928..617e3cd 100644 --- a/values.yaml +++ b/values.yaml @@ -101,6 +101,11 @@ mastodon: # with keys SECRET_KEY_BASE and OTP_SECRET and # VAPID_PRIVATE_KEY and VAPID_PUBLIC_KEY existingSecret: "" + + # -- The number of old revisions to keep for each Deployment in Kubernetes. + # See https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#clean-up-policy + revisionHistoryLimit: 2 + sidekiq: # -- Pod security context for all Sidekiq Pods, overwrites .Values.podSecurityContext podSecurityContext: {} From 59fa6f80c5c711e8be3267626d0b1aad6f300b0d Mon Sep 17 00:00:00 2001 From: Tim Campbell Date: Fri, 16 Feb 2024 19:01:46 +0100 Subject: [PATCH 08/13] Update app version to newest mastodon version --- Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Chart.yaml b/Chart.yaml index 0809c9a..3716d39 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -20,7 +20,7 @@ version: 4.1.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.2.5 +appVersion: v4.2.7 dependencies: - name: elasticsearch From 28728a8760fb1c2fcea6a39c86a0871b7fba4bdc Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Mon, 19 Feb 2024 08:26:25 +0000 Subject: [PATCH 09/13] chore(deps): upgrade image tag to v4.2.7 and bump chart version (#127) --- Chart.yaml | 2 +- values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Chart.yaml b/Chart.yaml index 3716d39..91c33d2 100644 --- a/Chart.yaml +++ b/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: 4.1.1 +version: 4.1.2 # 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/values.yaml b/values.yaml index 617e3cd..96d780c 100644 --- a/values.yaml +++ b/values.yaml @@ -6,7 +6,7 @@ image: # built from the most recent commit # # tag: latest - tag: "v4.2.5" + tag: "v4.2.7" # use `Always` when using `latest` tag pullPolicy: IfNotPresent From 3143ab1e34ad17faa87515ac7fa08e1782569061 Mon Sep 17 00:00:00 2001 From: Matthew Abbott Date: Tue, 12 Mar 2024 08:49:53 -0500 Subject: [PATCH 10/13] Add S3_OVERRIDE_PATH_STYLE to mastodon-env ConfigMap (#94) --- templates/configmap-env.yaml | 3 +++ values.yaml | 2 ++ 2 files changed, 5 insertions(+) diff --git a/templates/configmap-env.yaml b/templates/configmap-env.yaml index f2d989e..34fac72 100644 --- a/templates/configmap-env.yaml +++ b/templates/configmap-env.yaml @@ -84,6 +84,9 @@ data: {{- with .Values.mastodon.s3.alias_host }} S3_ALIAS_HOST: {{ . }} {{- end }} + {{- with .Values.mastodon.s3.override_path_style }} + S3_OVERRIDE_PATH_STYLE: "{{ . }}" + {{- end }} {{- end }} {{- with .Values.mastodon.smtp.auth_method }} SMTP_AUTH_METHOD: {{ . }} diff --git a/values.yaml b/values.yaml index 96d780c..3c7d948 100644 --- a/values.yaml +++ b/values.yaml @@ -78,6 +78,8 @@ mastodon: permission: "" # -- If you have a caching proxy, enter its base URL here. alias_host: "" + # -- Set this to true if the storage provider uses domain style 'bucket.endpoint' naming + # override_path_style: "true" deepl: enabled: false plan: From 63a052b6a5c19dabd172c15c1fd74298dcc544b2 Mon Sep 17 00:00:00 2001 From: Alexandra Catalina Date: Tue, 12 Mar 2024 06:50:27 -0700 Subject: [PATCH 11/13] deps: update to latest versions, switch to OCI repo [semver-major] (#125) --- .github/workflows/test-chart.yml | 5 ++++- Chart.lock | 16 ++++++++-------- Chart.yaml | 18 +++++++++--------- README.md | 2 +- 4 files changed, 22 insertions(+), 19 deletions(-) diff --git a/.github/workflows/test-chart.yml b/.github/workflows/test-chart.yml index a4482b6..3e02fc6 100644 --- a/.github/workflows/test-chart.yml +++ b/.github/workflows/test-chart.yml @@ -76,7 +76,10 @@ jobs: # higher. # - k3s-channel: v1.21 - helm-version: v3.6.0 + helm-version: v3.8.0 + + env: + HELM_EXPERIMENTAL_OCI: "1" steps: - uses: actions/checkout@v3 diff --git a/Chart.lock b/Chart.lock index afc2440..e985f1a 100644 --- a/Chart.lock +++ b/Chart.lock @@ -1,12 +1,12 @@ dependencies: - name: elasticsearch - repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami - version: 19.0.1 + repository: oci://registry-1.docker.io/bitnamicharts + version: 19.19.2 - name: postgresql - repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami - version: 11.1.3 + repository: oci://registry-1.docker.io/bitnamicharts + version: 14.2.3 - name: redis - repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami - version: 16.13.2 -digest: sha256:8be2c8069d65f295d0079bdda67c45691370f7bef73393c2e80eedbdd748b9af -generated: "2024-01-19T13:45:12.079125474+01:00" + repository: oci://registry-1.docker.io/bitnamicharts + version: 18.16.1 +digest: sha256:684daaf2067d96e2aa6d93e9d29b7b13fc586f6ae929342e5e9c7c169b1c0748 +generated: "2024-02-23T15:14:47.536480528-08:00" diff --git a/Chart.yaml b/Chart.yaml index 91c33d2..fea5144 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -12,10 +12,10 @@ description: Mastodon is a free, open-source social network server based on Acti # pipeline. Library charts do not define any templates and therefore cannot be deployed. 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. +# 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: 4.1.2 +version: 5.0.0 # 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 @@ -24,14 +24,14 @@ appVersion: v4.2.7 dependencies: - name: elasticsearch - version: 19.0.1 - repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami + version: 19.19.2 + repository: oci://registry-1.docker.io/bitnamicharts condition: elasticsearch.enabled - name: postgresql - version: 11.1.3 - repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami + version: 14.2.3 + repository: oci://registry-1.docker.io/bitnamicharts condition: postgresql.enabled - name: redis - version: 16.13.2 - repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami + version: 18.16.1 + repository: oci://registry-1.docker.io/bitnamicharts condition: redis.enabled diff --git a/README.md b/README.md index a595a4d..c2b6ab1 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Kubernetes cluster. The basic usage is: 1. `helm dep update` 1. `helm install --namespace mastodon --create-namespace my-mastodon ./ -f path/to/additional/values.yaml` -This chart is tested with k8s 1.21+ and helm 3.6.0+. +This chart is tested with k8s 1.21+ and helm 3.8.0+. # Configuration From 41f01b4d6e18c79f45901c0c92353f3f69facaf4 Mon Sep 17 00:00:00 2001 From: Tim Campbell Date: Fri, 23 Feb 2024 10:51:55 +0100 Subject: [PATCH 12/13] Future deprecation notice --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index c2b6ab1..514f2ef 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,12 @@ Kubernetes cluster. The basic usage is: This chart is tested with k8s 1.21+ and helm 3.8.0+. +# NOTICE: Future Deprecation + +We have plans in the very near future to deprecate this chart in favor of a [new git repo](https://github.com/mastodon/helm-charts), which has proper helm repository support (e.g. `helm repo add`), and will contain multiple charts, both for mastodon and for supplementary components that we make use of. + +We still encourage suggestions and PRs to help make this chart better, and this repository will remain available after the new charts are ready to give users time to migrate. However, we will not be approving large PRs, or PRs that change fundamental chart functions, as those changes should be directed to the new charts. + # Configuration The variables that _must_ be configured are: From d91a52bba1ca4851f4c2b27c5a1c20687def7c00 Mon Sep 17 00:00:00 2001 From: Tim Campbell Date: Mon, 26 Feb 2024 21:02:59 +0100 Subject: [PATCH 13/13] Add link to GitHub issue on the subject --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 514f2ef..6bee4a8 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,8 @@ We have plans in the very near future to deprecate this chart in favor of a [new We still encourage suggestions and PRs to help make this chart better, and this repository will remain available after the new charts are ready to give users time to migrate. However, we will not be approving large PRs, or PRs that change fundamental chart functions, as those changes should be directed to the new charts. +Please see the pinned [GitHub issue](https://github.com/mastodon/chart/issues/129) for more info & discussion. + # Configuration The variables that _must_ be configured are: