Skip to content
Snippets Groups Projects
Verified Commit 289d083d authored by Sheogorath's avatar Sheogorath :european_castle:
Browse files

fix(mastodon): Fix forgotten `emptyDir` vs `emptydir`

parent 80eb3984
No related branches found
No related tags found
No related merge requests found
Pipeline #18403 passed
......@@ -17,7 +17,7 @@ annotations:
- name: support
url: https://matrix.to/#/#mastodon-on-kubernetes:shivering-isles.com
type: application
version: 7.2.2
version: 7.2.3
kubeVersion: ">= 1.23"
# renovate: image=ghcr.io/mastodon/mastodon
appVersion: "v4.1.9"
......
# mastodon
![Version: 7.2.2](https://img.shields.io/badge/Version-7.2.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v4.1.9](https://img.shields.io/badge/AppVersion-v4.1.9-informational?style=flat-square)
![Version: 7.2.3](https://img.shields.io/badge/Version-7.2.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v4.1.9](https://img.shields.io/badge/AppVersion-v4.1.9-informational?style=flat-square)
Mastodon is a free, open-source social network server based on ActivityPub.
......@@ -112,7 +112,7 @@ Kubernetes: `>= 1.23`
| mastodon.web.replicas | int | `1` | Number of Web Pods running |
| mastodon.web.resources | Web Container | `{}` | Resources for Web Pods, overwrites .Values.resources |
| mastodon.web.securityContext | Web Container | `{"readOnlyRootFilesystem":true}` | Security Context for Web Pods, overwrites .Values.securityContext |
| mastodon.web.temporaryVolumeTemplate | object | `{"emptydir":{"medium":"Memory"}}` | temporary volume template required for read-only root filesystem |
| mastodon.web.temporaryVolumeTemplate | object | `{"emptyDir":{"medium":"Memory"}}` | temporary volume template required for read-only root filesystem |
| mastodon.web_domain | string | `nil` | Use of WEB_DOMAIN requires careful consideration: https://docs.joinmastodon.org/admin/config/#federation You must redirect the path LOCAL_DOMAIN/.well-known/ to WEB_DOMAIN/.well-known/ as described Example: mastodon.example.com |
| podAnnotations | object | `{}` | Kubernetes manages pods for jobs and pods for deployments differently, so you might need to apply different annotations to the two different sets of pods. The annotations set with podAnnotations will be added to all deployment-managed pods. |
| podSecurityContext | object | `{"fsGroup":991,"runAsGroup":991,"runAsNonRoot":true,"runAsUser":991,"seccompProfile":{"type":"RuntimeDefault"}}` | base securityContext on Pod-Level. Can be overwritten but more specific contexts. Used to match the Upstream UID/GID |
......
......@@ -64,7 +64,7 @@ tests:
mastodon:
sidekiq:
temporaryVolumeTemplate:
emptydir: null
emptyDir: null
some:
nonsense: true
web:
......@@ -86,3 +86,14 @@ tests:
- networking.k8s.io/v1/Ingress
asserts:
- matchSnapshot: {}
- equal:
path: spec.template.spec.volumes[2].ephemeral
value:
volumeClaimTemplate:
spec:
accessModes:
- ReadWriteOnce
resources:
requests:
storage: 5Gi
template: deployment-web.yaml
......@@ -139,10 +139,7 @@ should allow manipulating the temporaryVolumeTemplate:
- name: system
persistentVolumeClaim:
claimName: RELEASE-NAME-mastodon-system
- emptyDir: null
emptydir:
medium: Memory
ephemeral:
- ephemeral:
volumeClaimTemplate:
spec:
accessModes:
......@@ -386,7 +383,7 @@ should match basic snapshot:
- name: system
persistentVolumeClaim:
claimName: RELEASE-NAME-mastodon-system
- emptydir:
- emptyDir:
medium: Memory
name: tmp
3: |
......
......@@ -271,6 +271,6 @@ should allow disabling redis auth:
- name: system
persistentVolumeClaim:
claimName: RELEASE-NAME-mastodon-system
- emptydir:
- emptyDir:
medium: Memory
name: tmp
......@@ -403,7 +403,7 @@ should match basic snapshot:
- name: system
persistentVolumeClaim:
claimName: RELEASE-NAME-mastodon-system
- emptydir:
- emptyDir:
medium: Memory
name: tmp
6: |
......@@ -1377,7 +1377,7 @@ should match basic snapshot without dependencies:
- name: system
persistentVolumeClaim:
claimName: RELEASE-NAME-mastodon-system
- emptydir:
- emptyDir:
medium: Memory
name: tmp
6: |
......
......@@ -200,8 +200,8 @@ mastodon:
readOnlyRootFilesystem: true
# -- 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 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:
medium: Memory
# ephemeral:
# volumeClaimTemplate:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment