Compare commits

...

2 Commits

3 changed files with 49 additions and 11 deletions

View File

@ -33,9 +33,10 @@ spec:
runAsUser: 991
runAsGroup: 991
fsGroup: 991
fsGroupChangePolicy: "OnRootMismatch"
containers:
- name: mastodon-web
image: ghcr.io/mastodon/mastodon:v4.3.7
image: ghcr.io/mastodon/mastodon:v4.3.8
command: ["bundle", "exec", "puma", "-C", "config/puma.rb"]
ports:
- containerPort: 3000
@ -121,7 +122,7 @@ spec:
- mountPath: "/mastodon/public/system"
name: mastodon-data
- name: mastodon-streaming
image: ghcr.io/mastodon/mastodon-streaming:v4.3.7
image: ghcr.io/mastodon/mastodon-streaming:v4.3.8
command: ["node", "./streaming/index.js"]
ports:
- containerPort: 4000
@ -147,7 +148,7 @@ spec:
- name: REDIS_PORT
value: "6379"
- name: mastodon-sidekiq
image: ghcr.io/mastodon/mastodon:v4.3.7
image: ghcr.io/mastodon/mastodon:v4.3.8
command: ["bundle", "exec", "sidekiq"]
ports:
- containerPort: 9395
@ -215,6 +216,48 @@ spec:
volumeMounts:
- mountPath: "/mastodon/public/system"
name: mastodon-data
volumes:
- name: mastodon-data
persistentVolumeClaim:
claimName: mastodon-pvc
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: redis
namespace: mastodon
spec:
replicas: 1
selector:
matchLabels:
app: redis
template:
metadata:
labels:
app: redis
spec:
affinity:
podAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: cnpg.io/cluster
operator: In
values:
- mastodon-db
- key: cnpg.io/instanceRole
operator: In
values:
- primary
topologyKey: "kubernetes.io/hostname"
securityContext:
runAsUser: 1000
runAsGroup: 1000
fsGroup: 1000
fsGroupChangePolicy: "OnRootMismatch"
containers:
- name: redis
image: redis:7.4.2
ports:
@ -223,9 +266,6 @@ spec:
- mountPath: "/data"
name: redis-data
volumes:
- name: mastodon-data
persistentVolumeClaim:
claimName: mastodon-pvc
- name: redis-data
persistentVolumeClaim:
claimName: redis-pvc

View File

@ -14,14 +14,12 @@ spec:
storage: 50Gi
storageClassName: redundant-storage-class
---
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: redis-pvc
namespace: mastodon
labels:
recurring-job.longhorn.io/source: enabled
recurring-job-group.longhorn.io/standard-pvc: enabled
spec:
accessModes:
- ReadWriteOnce

View File

@ -4,7 +4,7 @@ metadata:
name: redis-svc
namespace: mastodon
labels:
app.kubernetes.io/name: mastodon
app.kubernetes.io/name: redis
spec:
ports:
- name: http
@ -12,4 +12,4 @@ spec:
protocol: TCP
targetPort: 6379
selector:
app: mastodon
app: redis