diff --git a/charts/mastodon/Chart.yaml b/charts/mastodon/Chart.yaml index 26c8149a761e2b32f1e64b40a7bba1888bda49ae..06d7945f59c334c41bf38f134dc2b46ce9452032 100644 --- a/charts/mastodon/Chart.yaml +++ b/charts/mastodon/Chart.yaml @@ -17,7 +17,7 @@ annotations: - name: support url: https://matrix.to/#/#mastodon-on-kubernetes:shivering-isles.com type: application -version: 7.2.1 +version: 7.2.2 kubeVersion: ">= 1.23" # renovate: image=ghcr.io/mastodon/mastodon appVersion: "v4.1.9" diff --git a/charts/mastodon/README.md b/charts/mastodon/README.md index e0fa65141386d645ee3ee4c55193f0697d091cc4..8494e21d6e4d5ee23c6648ef5768a0d9f18d9821 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. @@ -76,7 +76,7 @@ Kubernetes: `>= 1.23` | mastodon.sidekiq.podSecurityContext | object | `{}` | Pod security context for all Sidekiq Pods, overwrites .Values.podSecurityContext | | mastodon.sidekiq.resources | object | `{}` | Resources for all Sidekiq Deployments unless overwritten | | mastodon.sidekiq.securityContext | Sidekiq Container | `{"readOnlyRootFilesystem":true}` | Security Context for all Pods, overwrites .Values.securityContext | -| mastodon.sidekiq.temporaryVolumeTemplate | object | `{"emptydir":{"medium":"Memory"}}` | temporary volume template required for read-only root filesystem | +| mastodon.sidekiq.temporaryVolumeTemplate | object | `{"emptyDir":{"medium":"Memory"}}` | temporary volume template required for read-only root filesystem | | 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"` | | diff --git a/charts/mastodon/tests/50_sidekiq_test.yaml b/charts/mastodon/tests/50_sidekiq_test.yaml index 919fe733641bf139f18e64498530cbd54626e21c..d111efe17e2fda115280e685328989ed45990c95 100644 --- a/charts/mastodon/tests/50_sidekiq_test.yaml +++ b/charts/mastodon/tests/50_sidekiq_test.yaml @@ -100,7 +100,7 @@ tests: mastodon: sidekiq: temporaryVolumeTemplate: - emptydir: null + emptyDir: null ephemeral: volumeClaimTemplate: spec: diff --git a/charts/mastodon/tests/50_web_test.yaml b/charts/mastodon/tests/50_web_test.yaml index 8b6ff3d69cfa5496cceeebe543b3ed8b5a685be8..8e98ee2c33213879a45f7e31c733a8946bb09f85 100644 --- a/charts/mastodon/tests/50_web_test.yaml +++ b/charts/mastodon/tests/50_web_test.yaml @@ -62,14 +62,14 @@ tests: - mocks/dev.yaml set: mastodon: - # sidekiq: - # temporaryVolumeTemplate: - # emptydir: null - # some: - # nonsense: true - web: + sidekiq: temporaryVolumeTemplate: emptydir: null + some: + nonsense: true + web: + temporaryVolumeTemplate: + emptyDir: null ephemeral: volumeClaimTemplate: spec: diff --git a/charts/mastodon/tests/__snapshot__/50_sidekiq_test.yaml.snap b/charts/mastodon/tests/__snapshot__/50_sidekiq_test.yaml.snap index 7391e342caa89bb920b642084803d41df913f301..20d95c7d9a465222f9396d52f53455daa6c47d05 100644 --- a/charts/mastodon/tests/__snapshot__/50_sidekiq_test.yaml.snap +++ b/charts/mastodon/tests/__snapshot__/50_sidekiq_test.yaml.snap @@ -417,7 +417,7 @@ renders temporaryVolumeTemplate correctly: type: RuntimeDefault serviceAccountName: RELEASE-NAME-mastodon volumes: - - emptydir: + - emptyDir: medium: Memory name: tmp 3: | @@ -499,7 +499,7 @@ renders temporaryVolumeTemplate correctly: type: RuntimeDefault serviceAccountName: RELEASE-NAME-mastodon volumes: - - emptydir: + - emptyDir: medium: Memory name: tmp 4: | @@ -702,7 +702,7 @@ should match basic snapshot: - name: system persistentVolumeClaim: claimName: RELEASE-NAME-mastodon-system - - emptydir: + - emptyDir: medium: Memory name: tmp 3: | diff --git a/charts/mastodon/tests/__snapshot__/50_web_test.yaml.snap b/charts/mastodon/tests/__snapshot__/50_web_test.yaml.snap index a756aed63cf66be2d42671ad08fb5fd7fd0fda54..e7bf6bd2fa05d9070c7e0c86031ced676f8b6d19 100644 --- a/charts/mastodon/tests/__snapshot__/50_web_test.yaml.snap +++ b/charts/mastodon/tests/__snapshot__/50_web_test.yaml.snap @@ -139,7 +139,10 @@ should allow manipulating the temporaryVolumeTemplate: - name: system persistentVolumeClaim: claimName: RELEASE-NAME-mastodon-system - - ephemeral: + - emptyDir: null + emptydir: + medium: Memory + ephemeral: volumeClaimTemplate: spec: accessModes: diff --git a/charts/mastodon/tests/__snapshot__/80_subchart_redis_test.yaml.snap b/charts/mastodon/tests/__snapshot__/80_subchart_redis_test.yaml.snap index dbe8f20cc12e96c95acb92f1909c0175d193762c..207cee42f0f1997149d359eddbb5385324a8b446 100644 --- a/charts/mastodon/tests/__snapshot__/80_subchart_redis_test.yaml.snap +++ b/charts/mastodon/tests/__snapshot__/80_subchart_redis_test.yaml.snap @@ -95,7 +95,7 @@ should allow disabling redis auth: - name: system persistentVolumeClaim: claimName: RELEASE-NAME-mastodon-system - - emptydir: + - emptyDir: medium: Memory name: tmp 2: | diff --git a/charts/mastodon/tests/__snapshot__/98_snapshot_test.yaml.snap b/charts/mastodon/tests/__snapshot__/98_snapshot_test.yaml.snap index e2228b3ce5917dabcc774442239edb8dcc0e5ebd..af762e200329caff5f04e0f3b27b3d232015d92c 100644 --- a/charts/mastodon/tests/__snapshot__/98_snapshot_test.yaml.snap +++ b/charts/mastodon/tests/__snapshot__/98_snapshot_test.yaml.snap @@ -217,7 +217,7 @@ should match basic snapshot: - name: system persistentVolumeClaim: claimName: RELEASE-NAME-mastodon-system - - emptydir: + - emptyDir: medium: Memory name: tmp 4: | @@ -1191,7 +1191,7 @@ should match basic snapshot without dependencies: - name: system persistentVolumeClaim: claimName: RELEASE-NAME-mastodon-system - - emptydir: + - emptyDir: medium: Memory name: tmp 4: | diff --git a/charts/mastodon/values.yaml b/charts/mastodon/values.yaml index d21c542333260c63dd91f9a8b72dc6298cfe5a90..24904d7c90aa3f43dc8f48c9ad103c170a3b747a 100644 --- a/charts/mastodon/values.yaml +++ b/charts/mastodon/values.yaml @@ -87,7 +87,7 @@ mastodon: # -- temporary volume template required for read-only root filesystem temporaryVolumeTemplate: # emptydir is currently limited to medium Memory due to a Ruby special handling of temporary directories, alternatively use a generic ephemeral volume: https://shivering-isles.com/about-read-only-containers-ruby-and-emptydir - emptydir: + emptyDir: medium: Memory # ephemeral: # volumeClaimTemplate: