diff --git a/charts/mastodon/Chart.lock b/charts/mastodon/Chart.lock
index 24a0b7d33b660075285cd91041a7a2e904ed4351..25e7b5b7773e35f3af34d2ff7f60f6854aa482c0 100644
--- a/charts/mastodon/Chart.lock
+++ b/charts/mastodon/Chart.lock
@@ -1,12 +1,9 @@
dependencies:
-- name: elasticsearch
- repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
- version: 19.11.1
- name: postgresql
repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
version: 11.9.13
- name: redis
repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
version: 18.1.5
-digest: sha256:3b6e2a25a1fbf85156b91053b5f400e8ece2d5b98f250b82452b0394bc68d8fe
-generated: "2023-10-13T06:10:35.764396563Z"
+digest: sha256:0292277104a83c0cdb894cd845e2605b8c33331261d40a93024cee8f533329f1
+generated: "2023-11-27T18:22:40.968523587Z"
diff --git a/charts/mastodon/Chart.yaml b/charts/mastodon/Chart.yaml
index 91d0f5d8f06ea874c121b81b69e5173d63f0d772..7bed46ca24730d1f6d85f14ddc6aea4911e5257b 100644
--- a/charts/mastodon/Chart.yaml
+++ b/charts/mastodon/Chart.yaml
@@ -3,7 +3,7 @@ name: mastodon
description: |
Mastodon is a free, open-source social network server based on ActivityPub.
- This unofficical Helm chart is maintained to the best of knowledge, with the limitation that migration steps for dependencies are not documented or tested. This is mainly due to the fact that postgresql, redis and elasticsearch in the SI-Production are ran by operators instead of helm dependencies.
+ This unofficical Helm chart is maintained to the best of knowledge, with the limitation that migration steps for dependencies are not documented or tested. This is mainly due to the fact that postgresql and redis in the SI-Production are ran by operators instead of helm dependencies.
home: https://joinmastodon.org
icon: https://avatars.githubusercontent.com/u/24979032?s=200&v=4
keywords:
@@ -17,16 +17,12 @@ annotations:
- name: support
url: https://matrix.to/#/#mastodon-on-kubernetes:shivering-isles.com
type: application
-version: 7.2.4
+version: 8.0.0
kubeVersion: ">= 1.23"
# renovate: image=ghcr.io/mastodon/mastodon
appVersion: "v4.1.10"
dependencies:
- - name: elasticsearch
- version: 19.11.1
- repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
- condition: elasticsearch.enabled
- name: postgresql
version: 11.9.13
repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
diff --git a/charts/mastodon/README.md b/charts/mastodon/README.md
index 55a730d6409eeb850b7ee666c8e266f7da7915d1..76dc3d7c365efd97202ad6f355ded96647cf0166 100644
--- a/charts/mastodon/README.md
+++ b/charts/mastodon/README.md
@@ -1,10 +1,10 @@
# mastodon
-  
+  
Mastodon is a free, open-source social network server based on ActivityPub.
-This unofficical Helm chart is maintained to the best of knowledge, with the limitation that migration steps for dependencies are not documented or tested. This is mainly due to the fact that postgresql, redis and elasticsearch in the SI-Production are ran by operators instead of helm dependencies.
+This unofficical Helm chart is maintained to the best of knowledge, with the limitation that migration steps for dependencies are not documented or tested. This is mainly due to the fact that postgresql and redis in the SI-Production are ran by operators instead of helm dependencies.
**Homepage:** <https://joinmastodon.org>
@@ -19,16 +19,14 @@ Kubernetes: `>= 1.23`
| Repository | Name | Version |
|------------|------|---------|
-| https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami | elasticsearch | 19.11.1 |
| https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami | postgresql | 11.9.13 |
-| https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami | redis | 18.0.4 |
+| https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami | redis | 18.1.5 |
## Values
| Key | Type | Default | Description |
|-----|------|---------|-------------|
| affinity | object | `{}` | Affinity for all pods unless overwritten |
-| elasticsearch | object | `{}` | https://github.com/bitnami/charts/tree/master/bitnami/elasticsearch#parameters |
| externalAuth.cas.enabled | bool | `false` | |
| externalAuth.ldap.enabled | bool | `false` | |
| externalAuth.oauth_global.omniauth_only | bool | `false` | Automatically redirect to OIDC, CAS or SAML, and don't use local account authentication when clicking on Sign-In |
@@ -80,7 +78,7 @@ Kubernetes: `>= 1.23`
| mastodon.sidekiq.workers[0].affinity | object | `{}` | Affinity for this specific deployment, overwrites .Values.affinity and .Values.mastodon.sidekiq.affinity |
| mastodon.sidekiq.workers[0].concurrency | int | `25` | Number of threads / parallel sidekiq jobs that are executed per Pod |
| mastodon.sidekiq.workers[0].name | string | `"all-queues"` | |
-| mastodon.sidekiq.workers[0].queues | list | `["default,8","push,6","ingress,4","mailers,2","pull","scheduler"]` | Sidekiq queues for Mastodon that are handled by this worker. See https://docs.joinmastodon.org/admin/scaling/#concurrency See https://github.com/mperham/sidekiq/wiki/Advanced-Options#queues for how to weight queues as argument |
+| mastodon.sidekiq.workers[0].queues | list | `["default,8","push,6","ingress,4","mailers,2","pull,1","scheduler,1"]` | Sidekiq queues for Mastodon that are handled by this worker. See https://docs.joinmastodon.org/admin/scaling/#concurrency See https://github.com/mperham/sidekiq/wiki/Advanced-Options#queues for how to weight queues as argument |
| mastodon.sidekiq.workers[0].replicas | int | `1` | Number of Pod replicas deployed by the Deployment |
| mastodon.sidekiq.workers[0].resources | object | `{}` | Resources for this specific deployment to allow optimised scaling, overwrites .Values.mastodon.sidekiq.resources |
| mastodon.singleUserMode | bool | `false` | If set to true, the frontpage of your Mastodon server will always redirect to the first profile in the database and registrations will be disabled. |
diff --git a/charts/mastodon/charts/elasticsearch-19.11.1.tgz b/charts/mastodon/charts/elasticsearch-19.11.1.tgz
deleted file mode 100644
index 9029a4efd7e589dc41744cb148a0fbc03948bb55..0000000000000000000000000000000000000000
Binary files a/charts/mastodon/charts/elasticsearch-19.11.1.tgz and /dev/null differ
diff --git a/charts/mastodon/templates/_helpers.tpl b/charts/mastodon/templates/_helpers.tpl
index 11301c750a5f072636ec5700e50cfaa30c6a57c9..ceb3af28f11013cccf25994e5ffa2bce3604f56b 100644
--- a/charts/mastodon/templates/_helpers.tpl
+++ b/charts/mastodon/templates/_helpers.tpl
@@ -70,14 +70,6 @@ Create the name of the service account to use
{{- end }}
{{- end }}
-{{/*
-Create a default fully qualified name for dependent services.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-*/}}
-{{- define "mastodon.elasticsearch.fullname" -}}
-{{- printf "%s-%s" .Release.Name "elasticsearch" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
{{- define "mastodon.redis.fullname" -}}
{{- printf "%s-%s" .Release.Name "redis" | trunc 63 | trimSuffix "-" -}}
{{- end -}}
diff --git a/charts/mastodon/templates/configmap-env.yaml b/charts/mastodon/templates/configmap-env.yaml
index dd1eedd0469fb0d2341dea2eac936e7ec01032bc..9a00febea9242317df592fece92b73c13d09a86c 100644
--- a/charts/mastodon/templates/configmap-env.yaml
+++ b/charts/mastodon/templates/configmap-env.yaml
@@ -17,11 +17,6 @@ data:
DB_USER: {{ .Values.postgresql.auth.username }}
PREPARED_STATEMENTS: {{ .Values.mastodon.preparedStatements | quote }}
DEFAULT_LOCALE: {{ .Values.mastodon.locale }}
- {{- if .Values.elasticsearch.enabled }}
- ES_ENABLED: "true"
- ES_HOST: {{ template "mastodon.elasticsearch.fullname" . }}-master-hl
- ES_PORT: "9200"
- {{- end }}
LOCAL_DOMAIN: {{ .Values.mastodon.local_domain }}
{{- with .Values.mastodon.web_domain }}
WEB_DOMAIN: {{ . }}
diff --git a/charts/mastodon/templates/job-chewy-upgrade.yaml b/charts/mastodon/templates/job-chewy-upgrade.yaml
deleted file mode 100644
index f360e96efe47165c0a4c52f54f99450cc7db129d..0000000000000000000000000000000000000000
--- a/charts/mastodon/templates/job-chewy-upgrade.yaml
+++ /dev/null
@@ -1,71 +0,0 @@
-{{- if .Values.elasticsearch.enabled -}}
-apiVersion: batch/v1
-kind: Job
-metadata:
- name: {{ include "mastodon.fullname" . }}-chewy-upgrade
- labels:
- {{- include "mastodon.labels" . | nindent 4 }}
- annotations:
- "helm.sh/hook": post-install
- "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
- "helm.sh/hook-weight": "-1"
-spec:
- template:
- metadata:
- name: {{ include "mastodon.fullname" . }}-chewy-upgrade
- {{- with .Values.jobAnnotations }}
- annotations:
- {{- toYaml . | nindent 8 }}
- {{- end }}
- spec:
- restartPolicy: Never
- {{- with (default .Values.affinity .Values.mastodon.web.affinity) }}
- affinity:
- {{- toYaml . | nindent 8 }}
- {{- end }}
- {{- if (not .Values.mastodon.s3.enabled) }}
- volumes:
- {{- include "mastodon.nonS3MediaVolumes" . | nindent 8 }}
- {{- end }}
- {{- with .Values.podSecurityContext }}
- securityContext:
- {{- toYaml . | nindent 12 }}
- {{- end }}
- containers:
- - name: {{ include "mastodon.fullname" . }}-chewy-setup
- image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
- imagePullPolicy: {{ .Values.image.pullPolicy }}
- command:
- - bundle
- - exec
- - rake
- - chewy:upgrade
- envFrom:
- - configMapRef:
- name: {{ include "mastodon.fullname" . }}-env
- - secretRef:
- name: {{ template "mastodon.secretName" . }}
- env:
- - name: "DB_PASS"
- valueFrom:
- secretKeyRef:
- name: {{ template "mastodon.postgresql.secretName" . }}
- key: password
- {{- if .Values.redis.auth.enabled }}
- - name: "REDIS_PASSWORD"
- valueFrom:
- secretKeyRef:
- name: {{ template "mastodon.redis.secretName" . }}
- key: {{ .Values.redis.auth.existingSecretPasswordKey | default "redis-password" }}
- {{- end }}
- - name: "PORT"
- value: {{ .Values.mastodon.web.port | quote }}
- {{- with .Values.securityContext }}
- securityContext:
- {{- toYaml . | nindent 12 }}
- {{- end }}
- {{- if (not .Values.mastodon.s3.enabled) }}
- volumeMounts:
- {{- include "mastodon.nonS3MediaMounts" . | nindent 12 }}
- {{- end }}
-{{- end }}
diff --git a/charts/mastodon/tests/30_pss_restricted_test.yaml b/charts/mastodon/tests/30_pss_restricted_test.yaml
index 1bef054cdcd9bf8772f82b51d7623efb19ee39be..55b86bbff3e5601f18c3e527437cdb689251be70 100644
--- a/charts/mastodon/tests/30_pss_restricted_test.yaml
+++ b/charts/mastodon/tests/30_pss_restricted_test.yaml
@@ -4,14 +4,22 @@ templates:
- deployment-streaming.yaml
- deployment-web.yaml
- job-assets-precompile.yaml
- - job-chewy-upgrade.yaml
- job-db-migrate.yaml
- job-db-pre-migrate.yaml
+ - secrets.yaml
+ - configmap-env.yaml
tests:
- it: has allowPrivilegeEscalation set to false
values:
- mocks/dev.yaml
- mocks/sidekiq.yaml
+ templates:
+ - deployment-sidekiq.yaml
+ - deployment-streaming.yaml
+ - deployment-web.yaml
+ - job-assets-precompile.yaml
+ - job-db-migrate.yaml
+ - job-db-pre-migrate.yaml
asserts:
- equal:
path: spec.template.spec.containers[0].securityContext.allowPrivilegeEscalation
diff --git a/charts/mastodon/tests/80_subchart_elasticsearch_test.yaml b/charts/mastodon/tests/80_subchart_elasticsearch_test.yaml
deleted file mode 100644
index 6368b8005570d2d2cd8202d34e1c18bbf099de65..0000000000000000000000000000000000000000
--- a/charts/mastodon/tests/80_subchart_elasticsearch_test.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-suite: elasticsearch
-templates:
- - charts/elasticsearch/templates/master/statefulset.yaml
- - configmap-env.yaml
- - deployment-sidekiq.yaml
- - deployment-streaming.yaml
- - deployment-web.yaml
- - secrets.yaml
-values:
- - mocks/dev.yaml
-chart:
- version: 1.2.3
- appVersion: 4.5.6
-capabilities:
- apiVersions:
- - networking.k8s.io/v1/Ingress
-tests:
- - it: should have correct hostname
- asserts:
- - equal:
- path: data.ES_HOST
- value: RELEASE-NAME-elasticsearch-master-hl
- template: configmap-env.yaml
- - equal:
- path: spec.serviceName
- value: RELEASE-NAME-elasticsearch-master-hl
- template: charts/elasticsearch/templates/master/statefulset.yaml
- - it: should use port 9200
- asserts:
- - equal:
- path: data.ES_PORT
- value: "9200"
- template: configmap-env.yaml
- - contains:
- path: spec.template.spec.containers[0].ports
- content:
- name: rest-api
- containerPort: 9200
- template: charts/elasticsearch/templates/master/statefulset.yaml
\ No newline at end of file
diff --git a/charts/mastodon/tests/98_snapshot_test.yaml b/charts/mastodon/tests/98_snapshot_test.yaml
index 11f06ffaf913b6487ee2cb2831a7a598b5c26cbf..5f5ed840e256ef050a12689840d2301424e0c77e 100644
--- a/charts/mastodon/tests/98_snapshot_test.yaml
+++ b/charts/mastodon/tests/98_snapshot_test.yaml
@@ -7,7 +7,6 @@ templates:
- deployment-web.yaml
- ingress.yaml
- job-assets-precompile.yaml
- - job-chewy-upgrade.yaml
- job-create-admin.yaml
- job-db-migrate.yaml
- job-db-pre-migrate.yaml
diff --git a/charts/mastodon/tests/99_helmlabels_test.yaml b/charts/mastodon/tests/99_helmlabels_test.yaml
index 26d4dcab2ee77ec75875991a36d7f01900c30956..0dbaa86c7d7024ced23e380e6f5b509c2551c41d 100644
--- a/charts/mastodon/tests/99_helmlabels_test.yaml
+++ b/charts/mastodon/tests/99_helmlabels_test.yaml
@@ -7,7 +7,6 @@ templates:
- deployment-web.yaml
- ingress.yaml
- job-assets-precompile.yaml
- - job-chewy-upgrade.yaml
- job-create-admin.yaml
- job-db-migrate.yaml
- job-db-pre-migrate.yaml
diff --git a/charts/mastodon/tests/mocks/dev.yaml b/charts/mastodon/tests/mocks/dev.yaml
index b3a963ea114f9dc7ec7cfe1f3a181a7d25366188..cc5055dac5f6227082ffdaaa392b8bc401d5bb54 100644
--- a/charts/mastodon/tests/mocks/dev.yaml
+++ b/charts/mastodon/tests/mocks/dev.yaml
@@ -12,14 +12,3 @@ mastodon:
redis:
replica:
replicaCount: 1
-
-# ref: https://github.com/bitnami/charts/tree/main/bitnami/elasticsearch#parameters
-elasticsearch:
- master:
- replicaCount: 1
- data:
- replicaCount: 1
- coordinating:
- replicaCount: 1
- ingest:
- replicaCount: 1
diff --git a/charts/mastodon/values.yaml b/charts/mastodon/values.yaml
index c5840c191d545e956dcd9397ca04b1fbcc0866ee..b7459dbb3063eb51eb3331aa1fb3eef38a96efe1 100644
--- a/charts/mastodon/values.yaml
+++ b/charts/mastodon/values.yaml
@@ -124,26 +124,26 @@ mastodon:
- push,6
- ingress,4
- mailers,2
- - pull
- - scheduler # Make sure the scheduler queue only exists once and with a worker that has 1 replica.
+ - pull,1
+ - scheduler,1 # Make sure the scheduler queue only exists once and with a worker that has 1 replica.
#- name: push-pull
# concurrency: 50
# resources: {}
# replicas: 2
# queues:
- # - push
- # - pull
+ # - push,10
+ # - pull,10
#- name: mailers
# concurrency: 25
# replicas: 2
# queues:
- # - mailers
+ # - mailers,2
#- name: default
# concurrency: 25
# replicas: 2
# queues:
- # - default
+ # - default,5
smtp:
auth_method: plain
ca_file: /etc/ssl/certs/ca-certificates.crt
@@ -254,19 +254,6 @@ ingress:
hosts:
- mastodon.local
-# -- https://github.com/bitnami/charts/tree/master/bitnami/elasticsearch#parameters
-elasticsearch:
- # `false` will disable full-text search
- #
- # if you enable ES after the initial install, you will need to manually run
- # RAILS_ENV=production bundle exec rake chewy:sync
- # (https://docs.joinmastodon.org/admin/optional/elasticsearch/)
- # @ignored
- enabled: true
- # @ignored
- image:
- tag: 7
-
# https://github.com/bitnami/charts/tree/master/bitnami/postgresql#parameters
postgresql:
# -- disable if you want to use an existing db; in which case the values below