diff --git a/apps/base/mastodon/release.yaml b/apps/base/mastodon/release.yaml
index b8b4c7f54dbb9484f68462ddb6fec66efbf9748d..cd36cddb6231215e4bf4688bdf90b0a547bb0bec 100644
--- a/apps/base/mastodon/release.yaml
+++ b/apps/base/mastodon/release.yaml
@@ -112,10 +112,11 @@ data:
concurrency: 25
replicas: 2
queues:
- - mailers
- - push
+ - default,8
+ - push,6
+ - ingress,4
+ - mailers,2
- pull
- - default
streaming:
replicas: 2
resources:
diff --git a/apps/k8s01/mastodon/mastodon-values.yaml b/apps/k8s01/mastodon/mastodon-values.yaml
index f9fe77d4faded401b5b48e06f12c59169def7978..fcb943cbec4fb59d21527d66367731c0fe4f5382 100644
--- a/apps/k8s01/mastodon/mastodon-values.yaml
+++ b/apps/k8s01/mastodon/mastodon-values.yaml
@@ -5,15 +5,15 @@ metadata:
namespace: mastodon
type: Opaque
stringData:
- values-overrides.yaml: ENC[AES256_GCM,data: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,iv:ehXfAOMSZ76DJ1E2yUWIxIbSEQQeA+HNWMHBjDIIabI=,tag:lEqkgkdtuW7WDwkvgCtfxg==,type:str]
+ values-overrides.yaml: ENC[AES256_GCM,data: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,iv:zqBIhKz5E2M0kGjfF/9zSXW2mGLxX5D1GRoIZwTCFAg=,tag:YCwDrlYlMakhSfInJ8ImiA==,type:str]
sops:
kms: []
gcp_kms: []
azure_kv: []
hc_vault: []
age: []
- lastmodified: "2022-12-04T09:50:55Z"
- mac: ENC[AES256_GCM,data:PidjnZ9BkiyPHRgQjV6kN8DcBAGzja8swaEw9YhGDy1eHeFXqsezovXdjP0J5pRHnVSwxUMBMAI2vVtQC7cjNANkLTtVnsu4s8yXHMnWlJGXYlivkgBe0g0o/Y9ueBkR68s/+Q7QTmrMeuorRR8yWWrAGh5oZPtwZ2VD03e3LiM=,iv:BnPxi8SneeQ1vWuM9vHUhq19oaWzFlDPr5fiGrtEZzo=,tag:8RMyhmQFWN7JN/Hyb/D+yQ==,type:str]
+ lastmodified: "2023-01-23T12:00:15Z"
+ mac: ENC[AES256_GCM,data:S/p+uP+kuN1m5ZJ7uRzL3jQkLTwpfrfxewZ2xK+yUIzsHDqKvFCTfmae7Tz7ma1hFxFT2xzMWDItw5jtiPFxXXTg8wsGzt+OrTqKD5S03sySytDktIiLAf469DWEaEAlN+jGTip2AtieadKb9Jl/XfZubWbGu+4pPmXz7mH/hxo=,iv:TT7u9+OG5ks2cTFUA6CMNEkeexCeIxKztwo/0X0UA10=,tag:av3eJi9V+3MUSB8GkB8Vkw==,type:str]
pgp:
- created_at: "2022-03-22T22:26:35Z"
enc: |-
diff --git a/charts/mastodon/Chart.yaml b/charts/mastodon/Chart.yaml
index 353dfc77a73d1f1456e45da87fd94e70b216fc49..d503b5a812376444a854124db63dd1372b9972a3 100644
--- a/charts/mastodon/Chart.yaml
+++ b/charts/mastodon/Chart.yaml
@@ -11,9 +11,9 @@ sources:
- https://git.shivering-isles.com/shivering-isles/infrastructure-gitops/-/tree/main/charts/mastodon
type: application
-version: 4.0.2
+version: 5.0.0
# renovate: image=docker.io/tootsuite/mastodon
-appVersion: v3.5.5
+appVersion: v4.0.2
dependencies:
- name: elasticsearch
diff --git a/charts/mastodon/README.md b/charts/mastodon/README.md
index 79280a9feea31b16fc6be3ef81a79633fed6379c..ee34b9cdca1afd72dac71b092dc5c5a416792cc9 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.
@@ -15,9 +15,9 @@ Mastodon is a free, open-source social network server based on ActivityPub.
| Repository | Name | Version |
|------------|------|---------|
-| https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami | elasticsearch | 19.0.1 |
-| https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami | postgresql | 11.1.3 |
-| https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami | redis | 17.3.14 |
+| https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami | elasticsearch | 19.5.6 |
+| 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 | 17.5.1 |
## Values
@@ -45,6 +45,7 @@ Mastodon is a free, open-source social network server based on ActivityPub.
| mastodon.authorizedFetch | bool | `false` | Enables "Secure Mode" for more details see: https://docs.joinmastodon.org/admin/config/#authorized_fetch |
| mastodon.createAdmin | object | `{}` | create an initial administrator user; the password is autogenerated and will have to be reset |
| mastodon.cron.removeMedia | object | `{}` | run `tootctl media remove` every week |
+| mastodon.disallowUnauthenticatedAPIAccess | bool | `false` | Restores previous behaviour of "Secure Mode" |
| mastodon.local_domain | string | `"mastodon.local"` | |
| mastodon.locale | string | `"en"` | available locales: https://github.com/mastodon/mastodon/blob/main/config/application.rb#L71 |
| mastodon.metrics.statsd.address | string | `""` | Enable statsd publishing via STATSD_ADDR environment variable |
@@ -74,7 +75,7 @@ Mastodon is a free, open-source social network server based on ActivityPub.
| 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","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","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].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.0.1.tgz b/charts/mastodon/charts/elasticsearch-19.0.1.tgz
deleted file mode 100644
index 7818f6c590b66abba8f5a6eccaa7f249b2214887..0000000000000000000000000000000000000000
Binary files a/charts/mastodon/charts/elasticsearch-19.0.1.tgz and /dev/null differ
diff --git a/charts/mastodon/charts/elasticsearch-19.5.6.tgz b/charts/mastodon/charts/elasticsearch-19.5.6.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..495dcc896e6f66f908421143ae5310d033fbba6d
Binary files /dev/null and b/charts/mastodon/charts/elasticsearch-19.5.6.tgz differ
diff --git a/charts/mastodon/charts/postgresql-11.1.3.tgz b/charts/mastodon/charts/postgresql-11.1.3.tgz
deleted file mode 100644
index 193ac293cf0218bfddbb105305f19e0662d99221..0000000000000000000000000000000000000000
Binary files a/charts/mastodon/charts/postgresql-11.1.3.tgz and /dev/null differ
diff --git a/charts/mastodon/charts/postgresql-11.9.13.tgz b/charts/mastodon/charts/postgresql-11.9.13.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..2d3ac623a5860d4fcc1255afb5c9ca7c4d9d05e1
Binary files /dev/null and b/charts/mastodon/charts/postgresql-11.9.13.tgz differ
diff --git a/charts/mastodon/charts/redis-16.13.2.tgz b/charts/mastodon/charts/redis-16.13.2.tgz
deleted file mode 100644
index 33b5e967b8cfff007e549c555cb64583606a7f91..0000000000000000000000000000000000000000
Binary files a/charts/mastodon/charts/redis-16.13.2.tgz and /dev/null differ
diff --git a/charts/mastodon/charts/redis-17.5.1.tgz b/charts/mastodon/charts/redis-17.5.1.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..3743858ef8c54be1657225af8b7b911ff3afab6d
Binary files /dev/null and b/charts/mastodon/charts/redis-17.5.1.tgz differ
diff --git a/charts/mastodon/templates/configmap-env.yaml b/charts/mastodon/templates/configmap-env.yaml
index 7c94bb93ae61d976414e15f5b3c32b1200333013..36750daae73b54aaa7df22c137a10be50fce7669 100644
--- a/charts/mastodon/templates/configmap-env.yaml
+++ b/charts/mastodon/templates/configmap-env.yaml
@@ -32,6 +32,9 @@ data:
{{- with .Values.mastodon.authorizedFetch }}
AUTHORIZED_FETCH: {{ . | quote }}
{{- end }}
+ {{- with .Values.mastodon.disallowUnauthenticatedAPIAccess }}
+ DISALLOW_UNAUTHENTICATED_API_ACCESS: {{ . | quote }}
+ {{- end }}
# https://devcenter.heroku.com/articles/tuning-glibc-memory-behavior
MALLOC_ARENA_MAX: "2"
NODE_ENV: "production"
diff --git a/charts/mastodon/values.yaml b/charts/mastodon/values.yaml
index 1615c3b3de6237b738616f63f1b6cd0b6c440778..1540e8b7374fef8fef97ed6db833744d425a6a19 100644
--- a/charts/mastodon/values.yaml
+++ b/charts/mastodon/values.yaml
@@ -38,6 +38,8 @@ mastodon:
singleUserMode: false
# -- Enables "Secure Mode" for more details see: https://docs.joinmastodon.org/admin/config/#authorized_fetch
authorizedFetch: false
+ # -- Restores previous behaviour of "Secure Mode"
+ disallowUnauthenticatedAPIAccess: false
persistence:
assets:
# -- ReadWriteOnce is more widely supported than ReadWriteMany, but limits
@@ -106,9 +108,11 @@ mastodon:
queues:
- default,8
- push,6
+ - ingress,4
- mailers,2
- pull
- scheduler # Make sure the scheduler queue only exists once and with a worker that has 1 replica.
+
#- name: push-pull
# concurrency: 50
# resources: {}