commit 6936a0690e7ebce9cb4cf721655cf55d9c3c74b0
parent 8af63f7b9bb368088fa076685a2b1fecc4e275c3
Author: MTRNord <MTRNord@users.noreply.github.com>
Date: Sat, 29 Nov 2025 13:54:38 +0100
fix env
Signed-off-by: MTRNord <MTRNord@users.noreply.github.com>
Diffstat:
2 files changed, 653 insertions(+), 625 deletions(-)
diff --git a/apps/talos_cluster/bookwyrm/deployment.yaml b/apps/talos_cluster/bookwyrm/deployment.yaml
@@ -37,578 +37,602 @@ spec:
volumes:
- name: bookwyrm-script
configMap:
- name: bookwyrm-script
+ name: bookwyrm-script
- name: bookwyrm-data
persistentVolumeClaim:
- claimName: bookwyrm-pvc
+ claimName: bookwyrm-pvc
initContainers:
- name: bookwyrm-update
image: ghcr.io/mtrnord/bookwyrm:v0.8.2
imagePullPolicy: Always
command: ["bash"]
args:
- - /hl/bookwyrm.sh
- - update
+ - /hl/bookwyrm.sh
+ - update
volumeMounts:
- - name: bookwyrm-script
- mountPath: /hl
- readOnly: true
- - name: bookwyrm-data
- mountPath: /app/static
- subPath: static
- - name: bookwyrm-data
- mountPath: /app/media
- subPath: media
- - name: bookwyrm-data
- mountPath: /app/exports
- subPath: exports
+ - name: bookwyrm-script
+ mountPath: /hl
+ readOnly: true
+ - name: bookwyrm-data
+ mountPath: /app/static
+ subPath: static
+ - name: bookwyrm-data
+ mountPath: /app/media
+ subPath: media
+ - name: bookwyrm-data
+ mountPath: /app/exports
+ subPath: exports
env:
- - name: POD_IP
- valueFrom:
- fieldRef:
- fieldPath: status.podIP
- - name: DEBUG
- value: "false"
- - name: ALLOWED_HOSTS
- value: "books.mtrnord.blog,localhost,$(POD_IP)"
- - name: SECRET_KEY
- valueFrom:
- secretKeyRef:
- name: bookwyrm-secrets
- key: SECRET_KEY
- - name: DOMAIN
- value: "books.mtrnord.blog"
- - name: USE_HTTPS
- value: "true"
- - name: PGPORT
- value: "5432"
- - name: POSTGRES_PASSWORD
- valueFrom:
- secretKeyRef:
- name: bookwyrm-secrets
- key: POSTGRES_PASSWORD
- - name: POSTGRES_USER
- value: "bookwyrm"
- - name: POSTGRES_DB
- value: "bookwyrm"
- - name: POSTGRES_HOST
- value: "pg-cluster-v2-rw.postgres-cluster.svc.cluster.local"
- # TODO: Setup Redis
- - name: REDIS_ACTIVITY_URL
- value: "redis://bookwyrm-keydb.bookwyrm.svc.cluster.local:6379/0"
- - name: REDIS_BROKER_URL
- value: "redis://bookwyrm-keydb.bookwyrm.svc.cluster.local:6379/1"
- - name: FLOWER_USER
- value: "bookwyrm"
- - name: FLOWER_PASSWORD
- valueFrom:
- secretKeyRef:
- name: bookwyrm-secrets
- key: FLOWER_PASSWORD
- - name: FLOWER_BASIC_AUTH
- value: "$(FLOWER_USER):$(FLOWER_PASSWORD)"
- - name: FLOWER_PORT
- value: "5555"
- - name: EMAIL_HOST
- value: "mail.midnightthoughts.space"
- - name: EMAIL_PORT
- value: "465"
- - name: EMAIL_HOST_USER
- value: "support@midnightthoughts.space"
- - name: EMAIL_HOST_PASSWORD
- valueFrom:
- secretKeyRef:
- name: bookwyrm-secrets
- key: EMAIL_HOST_PASSWORD
- - name: USE_S3
- value: "false"
- - name: AWS_ACCESS_KEY_ID
- valueFrom:
- secretKeyRef:
- name: bookwyrm-secrets
- key: AWS_ACCESS_KEY_ID
- - name: AWS_SECRET_ACCESS_KEY
- valueFrom:
- secretKeyRef:
- name: bookwyrm-secrets
- key: AWS_SECRET_ACCESS_KEY
- - name: AWS_STORAGE_BUCKET_NAME
- valueFrom:
- secretKeyRef:
- name: bookwyrm-secrets
- key: AWS_STORAGE_BUCKET_NAME
- - name: AWS_S3_CUSTOM_DOMAIN
- valueFrom:
- secretKeyRef:
- name: bookwyrm-secrets
- key: AWS_S3_CUSTOM_DOMAIN
- - name: AWS_S3_ENDPOINT_URL
- valueFrom:
- secretKeyRef:
- name: bookwyrm-secrets
- key: AWS_S3_ENDPOINT_URL
- - name: ENABLETHUMBNAIL_GENERATION
- value: "true"
+ - name: POD_IP
+ valueFrom:
+ fieldRef:
+ fieldPath: status.podIP
+ - name: DEBUG
+ value: "false"
+ - name: ALLOWED_HOSTS
+ value: "books.mtrnord.blog,localhost,$(POD_IP)"
+ - name: SECRET_KEY
+ valueFrom:
+ secretKeyRef:
+ name: bookwyrm-secrets
+ key: SECRET_KEY
+ - name: DOMAIN
+ value: "books.mtrnord.blog"
+ - name: USE_HTTPS
+ value: "true"
+ - name: PGPORT
+ value: "5432"
+ - name: POSTGRES_PASSWORD
+ valueFrom:
+ secretKeyRef:
+ name: bookwyrm-secrets
+ key: POSTGRES_PASSWORD
+ - name: POSTGRES_USER
+ value: "bookwyrm"
+ - name: POSTGRES_DB
+ value: "bookwyrm"
+ - name: POSTGRES_HOST
+ value: "pg-cluster-v2-rw.postgres-cluster.svc.cluster.local"
+ # TODO: Setup Redis
+ - name: REDIS_ACTIVITY_URL
+ value: "redis://bookwyrm-keydb.bookwyrm.svc.cluster.local:6379/0"
+ - name: REDIS_BROKER_URL
+ value: "redis://bookwyrm-keydb.bookwyrm.svc.cluster.local:6379/1"
+ - name: FLOWER_USER
+ value: "bookwyrm"
+ - name: FLOWER_PASSWORD
+ valueFrom:
+ secretKeyRef:
+ name: bookwyrm-secrets
+ key: FLOWER_PASSWORD
+ - name: FLOWER_BASIC_AUTH
+ value: "$(FLOWER_USER):$(FLOWER_PASSWORD)"
+ - name: FLOWER_PORT
+ value: "5555"
+ - name: EMAIL_HOST
+ value: "mail.midnightthoughts.space"
+ - name: EMAIL_PORT
+ value: "465"
+ - name: EMAIL_HOST_USER
+ value: "support@midnightthoughts.space"
+ - name: EMAIL_HOST_PASSWORD
+ valueFrom:
+ secretKeyRef:
+ name: bookwyrm-secrets
+ key: EMAIL_HOST_PASSWORD
+ - name: EMAIL_SENDER_NAME
+ value: "support"
+ - name: EMAIL_SENDER_DOMAIN
+ value: "midnightthoughts.space"
+ - name: USE_S3
+ value: "false"
+ - name: AWS_ACCESS_KEY_ID
+ valueFrom:
+ secretKeyRef:
+ name: bookwyrm-secrets
+ key: AWS_ACCESS_KEY_ID
+ - name: AWS_SECRET_ACCESS_KEY
+ valueFrom:
+ secretKeyRef:
+ name: bookwyrm-secrets
+ key: AWS_SECRET_ACCESS_KEY
+ - name: AWS_STORAGE_BUCKET_NAME
+ valueFrom:
+ secretKeyRef:
+ name: bookwyrm-secrets
+ key: AWS_STORAGE_BUCKET_NAME
+ - name: AWS_S3_CUSTOM_DOMAIN
+ valueFrom:
+ secretKeyRef:
+ name: bookwyrm-secrets
+ key: AWS_S3_CUSTOM_DOMAIN
+ - name: AWS_S3_ENDPOINT_URL
+ valueFrom:
+ secretKeyRef:
+ name: bookwyrm-secrets
+ key: AWS_S3_ENDPOINT_URL
+ - name: ENABLE_THUMBNAIL_GENERATION
+ value: "true"
containers:
- name: bookwyrm-web
image: ghcr.io/mtrnord/bookwyrm:v0.8.2
imagePullPolicy: Always
command: ["python"]
args:
- - "manage.py"
- - "runserver"
- - "0.0.0.0:8080"
+ - "manage.py"
+ - "runserver"
+ - "0.0.0.0:8080"
resources:
- requests:
- cpu: 200m
- memory: 500Mi
+ requests:
+ cpu: 200m
+ memory: 500Mi
volumeMounts:
- - name: bookwyrm-data
- mountPath: /app/static
- subPath: static
- - name: bookwyrm-data
- mountPath: /app/media
- subPath: media
- - name: bookwyrm-data
- mountPath: /app/exports
- subPath: exports
+ - name: bookwyrm-data
+ mountPath: /app/static
+ subPath: static
+ - name: bookwyrm-data
+ mountPath: /app/media
+ subPath: media
+ - name: bookwyrm-data
+ mountPath: /app/exports
+ subPath: exports
env:
- - name: POD_IP
- valueFrom:
- fieldRef:
- fieldPath: status.podIP
- - name: DEBUG
- value: "false"
- - name: ALLOWED_HOSTS
- value: "books.mtrnord.blog,localhost,$(POD_IP)"
- - name: SECRET_KEY
- valueFrom:
- secretKeyRef:
- name: bookwyrm-secrets
- key: SECRET_KEY
- - name: DOMAIN
- value: "books.mtrnord.blog"
- - name: USE_HTTPS
- value: "true"
- - name: PGPORT
- value: "5432"
- - name: POSTGRES_PASSWORD
- valueFrom:
- secretKeyRef:
- name: bookwyrm-secrets
- key: POSTGRES_PASSWORD
- - name: POSTGRES_USER
- value: "bookwyrm"
- - name: POSTGRES_DB
- value: "bookwyrm"
- - name: POSTGRES_HOST
- value: "pg-cluster-v2-rw.postgres-cluster.svc.cluster.local"
- # TODO: Setup Redis
- - name: REDIS_ACTIVITY_URL
- value: "redis://bookwyrm-keydb.bookwyrm.svc.cluster.local:6379/0"
- - name: REDIS_BROKER_URL
- value: "redis://bookwyrm-keydb.bookwyrm.svc.cluster.local:6379/1"
- - name: FLOWER_USER
- value: "bookwyrm"
- - name: FLOWER_PASSWORD
- valueFrom:
- secretKeyRef:
- name: bookwyrm-secrets
- key: FLOWER_PASSWORD
- - name: FLOWER_BASIC_AUTH
- value: "$(FLOWER_USER):$(FLOWER_PASSWORD)"
- - name: FLOWER_PORT
- value: "5555"
- - name: EMAIL_HOST
- value: "mail.midnightthoughts.space"
- - name: EMAIL_PORT
- value: "465"
- - name: EMAIL_HOST_USER
- value: "support@midnightthoughts.space"
- - name: EMAIL_HOST_PASSWORD
- valueFrom:
- secretKeyRef:
- name: bookwyrm-secrets
- key: EMAIL_HOST_PASSWORD
- - name: USE_S3
- value: "false"
- - name: AWS_ACCESS_KEY_ID
- valueFrom:
- secretKeyRef:
- name: bookwyrm-secrets
- key: AWS_ACCESS_KEY_ID
- - name: AWS_SECRET_ACCESS_KEY
- valueFrom:
- secretKeyRef:
- name: bookwyrm-secrets
- key: AWS_SECRET_ACCESS_KEY
- - name: AWS_STORAGE_BUCKET_NAME
- valueFrom:
- secretKeyRef:
- name: bookwyrm-secrets
- key: AWS_STORAGE_BUCKET_NAME
- - name: AWS_S3_CUSTOM_DOMAIN
- valueFrom:
- secretKeyRef:
- name: bookwyrm-secrets
- key: AWS_S3_CUSTOM_DOMAIN
- - name: AWS_S3_ENDPOINT_URL
- valueFrom:
- secretKeyRef:
- name: bookwyrm-secrets
- key: AWS_S3_ENDPOINT_URL
- - name: ENABLETHUMBNAIL_GENERATION
- value: "true"
+ - name: POD_IP
+ valueFrom:
+ fieldRef:
+ fieldPath: status.podIP
+ - name: DEBUG
+ value: "false"
+ - name: ALLOWED_HOSTS
+ value: "books.mtrnord.blog,localhost,$(POD_IP)"
+ - name: SECRET_KEY
+ valueFrom:
+ secretKeyRef:
+ name: bookwyrm-secrets
+ key: SECRET_KEY
+ - name: DOMAIN
+ value: "books.mtrnord.blog"
+ - name: USE_HTTPS
+ value: "true"
+ - name: PGPORT
+ value: "5432"
+ - name: POSTGRES_PASSWORD
+ valueFrom:
+ secretKeyRef:
+ name: bookwyrm-secrets
+ key: POSTGRES_PASSWORD
+ - name: POSTGRES_USER
+ value: "bookwyrm"
+ - name: POSTGRES_DB
+ value: "bookwyrm"
+ - name: POSTGRES_HOST
+ value: "pg-cluster-v2-rw.postgres-cluster.svc.cluster.local"
+ # TODO: Setup Redis
+ - name: REDIS_ACTIVITY_URL
+ value: "redis://bookwyrm-keydb.bookwyrm.svc.cluster.local:6379/0"
+ - name: REDIS_BROKER_URL
+ value: "redis://bookwyrm-keydb.bookwyrm.svc.cluster.local:6379/1"
+ - name: FLOWER_USER
+ value: "bookwyrm"
+ - name: FLOWER_PASSWORD
+ valueFrom:
+ secretKeyRef:
+ name: bookwyrm-secrets
+ key: FLOWER_PASSWORD
+ - name: FLOWER_BASIC_AUTH
+ value: "$(FLOWER_USER):$(FLOWER_PASSWORD)"
+ - name: FLOWER_PORT
+ value: "5555"
+ - name: EMAIL_HOST
+ value: "mail.midnightthoughts.space"
+ - name: EMAIL_PORT
+ value: "465"
+ - name: EMAIL_HOST_USER
+ value: "support@midnightthoughts.space"
+ - name: EMAIL_HOST_PASSWORD
+ valueFrom:
+ secretKeyRef:
+ name: bookwyrm-secrets
+ key: EMAIL_HOST_PASSWORD
+ - name: EMAIL_SENDER_NAME
+ value: "support"
+ - name: EMAIL_SENDER_DOMAIN
+ value: "midnightthoughts.space"
+ - name: USE_S3
+ value: "false"
+ - name: AWS_ACCESS_KEY_ID
+ valueFrom:
+ secretKeyRef:
+ name: bookwyrm-secrets
+ key: AWS_ACCESS_KEY_ID
+ - name: AWS_SECRET_ACCESS_KEY
+ valueFrom:
+ secretKeyRef:
+ name: bookwyrm-secrets
+ key: AWS_SECRET_ACCESS_KEY
+ - name: AWS_STORAGE_BUCKET_NAME
+ valueFrom:
+ secretKeyRef:
+ name: bookwyrm-secrets
+ key: AWS_STORAGE_BUCKET_NAME
+ - name: AWS_S3_CUSTOM_DOMAIN
+ valueFrom:
+ secretKeyRef:
+ name: bookwyrm-secrets
+ key: AWS_S3_CUSTOM_DOMAIN
+ - name: AWS_S3_ENDPOINT_URL
+ valueFrom:
+ secretKeyRef:
+ name: bookwyrm-secrets
+ key: AWS_S3_ENDPOINT_URL
+ - name: ENABLE_THUMBNAIL_GENERATION
+ value: "true"
livenessProbe:
- httpGet:
- port: 8080
- path: "/"
- initialDelaySeconds: 15
- periodSeconds: 30
+ httpGet:
+ port: 8080
+ path: "/"
+ initialDelaySeconds: 15
+ periodSeconds: 30
ports:
- - name: bookwyrm-http
- containerPort: 8080
- protocol: TCP
+ - name: bookwyrm-http
+ containerPort: 8080
+ protocol: TCP
- name: bookwyrm-celery-worker
image: ghcr.io/mtrnord/bookwyrm:v0.8.2
imagePullPolicy: Always
command: ["celery"]
args:
- - "-A"
- - "celerywyrm"
- - "worker"
- - "-l"
- - "info"
- - "-Q"
- - "high_priority,medium_priority,low_priority,streams,images,suggested_users,email,connectors,lists,inbox,imports,import_triggered,broadcast,misc"
+ - "-A"
+ - "celerywyrm"
+ - "worker"
+ - "-l"
+ - "info"
+ - "-Q"
+ - "high_priority,medium_priority,low_priority,streams,images,suggested_users,email,connectors,lists,inbox,imports,import_triggered,broadcast,misc"
resources:
- requests:
- cpu: 200m
- memory: 200Mi
+ requests:
+ cpu: 200m
+ memory: 200Mi
volumeMounts:
- - name: bookwyrm-data
- mountPath: /app/static
- subPath: static
- - name: bookwyrm-data
- mountPath: /app/media
- subPath: media
- - name: bookwyrm-data
- mountPath: /app/exports
- subPath: exports
+ - name: bookwyrm-data
+ mountPath: /app/static
+ subPath: static
+ - name: bookwyrm-data
+ mountPath: /app/media
+ subPath: media
+ - name: bookwyrm-data
+ mountPath: /app/exports
+ subPath: exports
env:
- - name: POD_IP
- valueFrom:
- fieldRef:
- fieldPath: status.podIP
- - name: DEBUG
- value: "false"
- - name: ALLOWED_HOSTS
- value: "books.mtrnord.blog,localhost,$(POD_IP)"
- - name: SECRET_KEY
- valueFrom:
- secretKeyRef:
- name: bookwyrm-secrets
- key: SECRET_KEY
- - name: DOMAIN
- value: "books.mtrnord.blog"
- - name: USE_HTTPS
- value: "true"
- - name: PGPORT
- value: "5432"
- - name: POSTGRES_PASSWORD
- valueFrom:
- secretKeyRef:
- name: bookwyrm-secrets
- key: POSTGRES_PASSWORD
- - name: POSTGRES_USER
- value: "bookwyrm"
- - name: POSTGRES_DB
- value: "bookwyrm"
- - name: POSTGRES_HOST
- value: "pg-cluster-v2-rw.postgres-cluster.svc.cluster.local"
- # TODO: Setup Redis
- - name: REDIS_ACTIVITY_URL
- value: "redis://bookwyrm-keydb.bookwyrm.svc.cluster.local:6379/0"
- - name: REDIS_BROKER_URL
- value: "redis://bookwyrm-keydb.bookwyrm.svc.cluster.local:6379/1"
- - name: FLOWER_USER
- value: "bookwyrm"
- - name: FLOWER_PASSWORD
- valueFrom:
- secretKeyRef:
- name: bookwyrm-secrets
- key: FLOWER_PASSWORD
- - name: FLOWER_BASIC_AUTH
- value: "$(FLOWER_USER):$(FLOWER_PASSWORD)"
- - name: FLOWER_PORT
- value: "5555"
- - name: EMAIL_HOST
- value: "mail.midnightthoughts.space"
- - name: EMAIL_PORT
- value: "465"
- - name: EMAIL_HOST_USER
- value: "support@midnightthoughts.space"
- - name: EMAIL_HOST_PASSWORD
- valueFrom:
- secretKeyRef:
- name: bookwyrm-secrets
- key: EMAIL_HOST_PASSWORD
- - name: USE_S3
- value: "false"
- - name: AWS_ACCESS_KEY_ID
- valueFrom:
- secretKeyRef:
- name: bookwyrm-secrets
- key: AWS_ACCESS_KEY_ID
- - name: AWS_SECRET_ACCESS_KEY
- valueFrom:
- secretKeyRef:
- name: bookwyrm-secrets
- key: AWS_SECRET_ACCESS_KEY
- - name: AWS_STORAGE_BUCKET_NAME
- valueFrom:
- secretKeyRef:
- name: bookwyrm-secrets
- key: AWS_STORAGE_BUCKET_NAME
- - name: AWS_S3_CUSTOM_DOMAIN
- valueFrom:
- secretKeyRef:
- name: bookwyrm-secrets
- key: AWS_S3_CUSTOM_DOMAIN
- - name: AWS_S3_ENDPOINT_URL
- valueFrom:
- secretKeyRef:
- name: bookwyrm-secrets
- key: AWS_S3_ENDPOINT_URL
- - name: ENABLETHUMBNAIL_GENERATION
- value: "true"
+ - name: POD_IP
+ valueFrom:
+ fieldRef:
+ fieldPath: status.podIP
+ - name: DEBUG
+ value: "false"
+ - name: ALLOWED_HOSTS
+ value: "books.mtrnord.blog,localhost,$(POD_IP)"
+ - name: SECRET_KEY
+ valueFrom:
+ secretKeyRef:
+ name: bookwyrm-secrets
+ key: SECRET_KEY
+ - name: DOMAIN
+ value: "books.mtrnord.blog"
+ - name: USE_HTTPS
+ value: "true"
+ - name: PGPORT
+ value: "5432"
+ - name: POSTGRES_PASSWORD
+ valueFrom:
+ secretKeyRef:
+ name: bookwyrm-secrets
+ key: POSTGRES_PASSWORD
+ - name: POSTGRES_USER
+ value: "bookwyrm"
+ - name: POSTGRES_DB
+ value: "bookwyrm"
+ - name: POSTGRES_HOST
+ value: "pg-cluster-v2-rw.postgres-cluster.svc.cluster.local"
+ # TODO: Setup Redis
+ - name: REDIS_ACTIVITY_URL
+ value: "redis://bookwyrm-keydb.bookwyrm.svc.cluster.local:6379/0"
+ - name: REDIS_BROKER_URL
+ value: "redis://bookwyrm-keydb.bookwyrm.svc.cluster.local:6379/1"
+ - name: FLOWER_USER
+ value: "bookwyrm"
+ - name: FLOWER_PASSWORD
+ valueFrom:
+ secretKeyRef:
+ name: bookwyrm-secrets
+ key: FLOWER_PASSWORD
+ - name: FLOWER_BASIC_AUTH
+ value: "$(FLOWER_USER):$(FLOWER_PASSWORD)"
+ - name: FLOWER_PORT
+ value: "5555"
+ - name: EMAIL_HOST
+ value: "mail.midnightthoughts.space"
+ - name: EMAIL_PORT
+ value: "465"
+ - name: EMAIL_HOST_USER
+ value: "support@midnightthoughts.space"
+ - name: EMAIL_HOST_PASSWORD
+ valueFrom:
+ secretKeyRef:
+ name: bookwyrm-secrets
+ key: EMAIL_HOST_PASSWORD
+ - name: EMAIL_SENDER_NAME
+ value: "support"
+ - name: EMAIL_SENDER_DOMAIN
+ value: "midnightthoughts.space"
+ - name: USE_S3
+ value: "false"
+ - name: AWS_ACCESS_KEY_ID
+ valueFrom:
+ secretKeyRef:
+ name: bookwyrm-secrets
+ key: AWS_ACCESS_KEY_ID
+ - name: AWS_SECRET_ACCESS_KEY
+ valueFrom:
+ secretKeyRef:
+ name: bookwyrm-secrets
+ key: AWS_SECRET_ACCESS_KEY
+ - name: AWS_STORAGE_BUCKET_NAME
+ valueFrom:
+ secretKeyRef:
+ name: bookwyrm-secrets
+ key: AWS_STORAGE_BUCKET_NAME
+ - name: AWS_S3_CUSTOM_DOMAIN
+ valueFrom:
+ secretKeyRef:
+ name: bookwyrm-secrets
+ key: AWS_S3_CUSTOM_DOMAIN
+ - name: AWS_S3_ENDPOINT_URL
+ valueFrom:
+ secretKeyRef:
+ name: bookwyrm-secrets
+ key: AWS_S3_ENDPOINT_URL
+ - name: ENABLE_THUMBNAIL_GENERATION
+ value: "true"
- name: bookwyrm-celery-beat
image: ghcr.io/mtrnord/bookwyrm:v0.8.2
imagePullPolicy: Always
command: ["celery"]
args:
- - "-A"
- - "celerywyrm"
- - "beat"
- - "-l"
- - "INFO"
- - "--scheduler"
- - "django_celery_beat.schedulers:DatabaseScheduler"
+ - "-A"
+ - "celerywyrm"
+ - "beat"
+ - "-l"
+ - "INFO"
+ - "--scheduler"
+ - "django_celery_beat.schedulers:DatabaseScheduler"
resources:
- requests:
- cpu: 200m
- memory: 200Mi
+ requests:
+ cpu: 200m
+ memory: 200Mi
volumeMounts:
- - name: bookwyrm-data
- mountPath: /app/static
- subPath: static
- - name: bookwyrm-data
- mountPath: /app/media
- subPath: media
- - name: bookwyrm-data
- mountPath: /app/exports
- subPath: exports
+ - name: bookwyrm-data
+ mountPath: /app/static
+ subPath: static
+ - name: bookwyrm-data
+ mountPath: /app/media
+ subPath: media
+ - name: bookwyrm-data
+ mountPath: /app/exports
+ subPath: exports
env:
- - name: POD_IP
- valueFrom:
- fieldRef:
- fieldPath: status.podIP
- - name: DEBUG
- value: "false"
- - name: ALLOWED_HOSTS
- value: "books.mtrnord.blog,localhost,$(POD_IP)"
- - name: SECRET_KEY
- valueFrom:
- secretKeyRef:
- name: bookwyrm-secrets
- key: SECRET_KEY
- - name: DOMAIN
- value: "books.mtrnord.blog"
- - name: USE_HTTPS
- value: "true"
- - name: PGPORT
- value: "5432"
- - name: POSTGRES_PASSWORD
- valueFrom:
- secretKeyRef:
- name: bookwyrm-secrets
- key: POSTGRES_PASSWORD
- - name: POSTGRES_USER
- value: "bookwyrm"
- - name: POSTGRES_DB
- value: "bookwyrm"
- - name: POSTGRES_HOST
- value: "pg-cluster-v2-rw.postgres-cluster.svc.cluster.local"
- # TODO: Setup Redis
- - name: REDIS_ACTIVITY_URL
- value: "redis://bookwyrm-keydb.bookwyrm.svc.cluster.local:6379/0"
- - name: REDIS_BROKER_URL
- value: "redis://bookwyrm-keydb.bookwyrm.svc.cluster.local:6379/1"
- - name: FLOWER_USER
- value: "bookwyrm"
- - name: FLOWER_PASSWORD
- valueFrom:
- secretKeyRef:
- name: bookwyrm-secrets
- key: FLOWER_PASSWORD
- - name: FLOWER_BASIC_AUTH
- value: "$(FLOWER_USER):$(FLOWER_PASSWORD)"
- - name: FLOWER_PORT
- value: "5555"
- - name: EMAIL_HOST
- value: "mail.midnightthoughts.space"
- - name: EMAIL_PORT
- value: "465"
- - name: EMAIL_HOST_USER
- value: "support@midnightthoughts.space"
- - name: EMAIL_HOST_PASSWORD
- valueFrom:
- secretKeyRef:
- name: bookwyrm-secrets
- key: EMAIL_HOST_PASSWORD
- - name: USE_S3
- value: "false"
- - name: AWS_ACCESS_KEY_ID
- valueFrom:
- secretKeyRef:
- name: bookwyrm-secrets
- key: AWS_ACCESS_KEY_ID
- - name: AWS_SECRET_ACCESS_KEY
- valueFrom:
- secretKeyRef:
- name: bookwyrm-secrets
- key: AWS_SECRET_ACCESS_KEY
- - name: AWS_STORAGE_BUCKET_NAME
- valueFrom:
- secretKeyRef:
- name: bookwyrm-secrets
- key: AWS_STORAGE_BUCKET_NAME
- - name: AWS_S3_CUSTOM_DOMAIN
- valueFrom:
- secretKeyRef:
- name: bookwyrm-secrets
- key: AWS_S3_CUSTOM_DOMAIN
- - name: AWS_S3_ENDPOINT_URL
- valueFrom:
- secretKeyRef:
- name: bookwyrm-secrets
- key: AWS_S3_ENDPOINT_URL
- - name: ENABLETHUMBNAIL_GENERATION
- value: "true"
+ - name: POD_IP
+ valueFrom:
+ fieldRef:
+ fieldPath: status.podIP
+ - name: DEBUG
+ value: "false"
+ - name: ALLOWED_HOSTS
+ value: "books.mtrnord.blog,localhost,$(POD_IP)"
+ - name: SECRET_KEY
+ valueFrom:
+ secretKeyRef:
+ name: bookwyrm-secrets
+ key: SECRET_KEY
+ - name: DOMAIN
+ value: "books.mtrnord.blog"
+ - name: USE_HTTPS
+ value: "true"
+ - name: PGPORT
+ value: "5432"
+ - name: POSTGRES_PASSWORD
+ valueFrom:
+ secretKeyRef:
+ name: bookwyrm-secrets
+ key: POSTGRES_PASSWORD
+ - name: POSTGRES_USER
+ value: "bookwyrm"
+ - name: POSTGRES_DB
+ value: "bookwyrm"
+ - name: POSTGRES_HOST
+ value: "pg-cluster-v2-rw.postgres-cluster.svc.cluster.local"
+ # TODO: Setup Redis
+ - name: REDIS_ACTIVITY_URL
+ value: "redis://bookwyrm-keydb.bookwyrm.svc.cluster.local:6379/0"
+ - name: REDIS_BROKER_URL
+ value: "redis://bookwyrm-keydb.bookwyrm.svc.cluster.local:6379/1"
+ - name: FLOWER_USER
+ value: "bookwyrm"
+ - name: FLOWER_PASSWORD
+ valueFrom:
+ secretKeyRef:
+ name: bookwyrm-secrets
+ key: FLOWER_PASSWORD
+ - name: FLOWER_BASIC_AUTH
+ value: "$(FLOWER_USER):$(FLOWER_PASSWORD)"
+ - name: FLOWER_PORT
+ value: "5555"
+ - name: EMAIL_HOST
+ value: "mail.midnightthoughts.space"
+ - name: EMAIL_PORT
+ value: "465"
+ - name: EMAIL_HOST_USER
+ value: "support@midnightthoughts.space"
+ - name: EMAIL_HOST_PASSWORD
+ valueFrom:
+ secretKeyRef:
+ name: bookwyrm-secrets
+ key: EMAIL_HOST_PASSWORD
+ - name: EMAIL_SENDER_NAME
+ value: "support"
+ - name: EMAIL_SENDER_DOMAIN
+ value: "midnightthoughts.space"
+ - name: EMAIL_SENDER_NAME
+ value: "support"
+ - name: EMAIL_SENDER_DOMAIN
+ value: "midnightthoughts.space"
+ - name: USE_S3
+ value: "false"
+ - name: AWS_ACCESS_KEY_ID
+ valueFrom:
+ secretKeyRef:
+ name: bookwyrm-secrets
+ key: AWS_ACCESS_KEY_ID
+ - name: AWS_SECRET_ACCESS_KEY
+ valueFrom:
+ secretKeyRef:
+ name: bookwyrm-secrets
+ key: AWS_SECRET_ACCESS_KEY
+ - name: AWS_STORAGE_BUCKET_NAME
+ valueFrom:
+ secretKeyRef:
+ name: bookwyrm-secrets
+ key: AWS_STORAGE_BUCKET_NAME
+ - name: AWS_S3_CUSTOM_DOMAIN
+ valueFrom:
+ secretKeyRef:
+ name: bookwyrm-secrets
+ key: AWS_S3_CUSTOM_DOMAIN
+ - name: AWS_S3_ENDPOINT_URL
+ valueFrom:
+ secretKeyRef:
+ name: bookwyrm-secrets
+ key: AWS_S3_ENDPOINT_URL
+ - name: ENABLE_THUMBNAIL_GENERATION
+ value: "true"
- name: bookwyrm-flower
image: ghcr.io/mtrnord/bookwyrm:v0.8.2
imagePullPolicy: Always
command: ["celery"]
args:
- - "-A"
- - "celerywyrm"
- - "flower"
- - "--url_prefix=flower"
+ - "-A"
+ - "celerywyrm"
+ - "flower"
+ - "--url_prefix=flower"
resources:
- requests:
- cpu: 200m
- memory: 200Mi
+ requests:
+ cpu: 200m
+ memory: 200Mi
volumeMounts:
- - name: bookwyrm-data
- mountPath: /app/static
- subPath: static
- - name: bookwyrm-data
- mountPath: /app/media
- subPath: media
- - name: bookwyrm-data
- mountPath: /app/exports
- subPath: exports
+ - name: bookwyrm-data
+ mountPath: /app/static
+ subPath: static
+ - name: bookwyrm-data
+ mountPath: /app/media
+ subPath: media
+ - name: bookwyrm-data
+ mountPath: /app/exports
+ subPath: exports
env:
- - name: POD_IP
- valueFrom:
- fieldRef:
- fieldPath: status.podIP
- - name: DEBUG
- value: "false"
- - name: ALLOWED_HOSTS
- value: "books.mtrnord.blog,localhost,$(POD_IP)"
- - name: SECRET_KEY
- valueFrom:
- secretKeyRef:
- name: bookwyrm-secrets
- key: SECRET_KEY
- - name: DOMAIN
- value: "books.mtrnord.blog"
- - name: USE_HTTPS
- value: "true"
- - name: PGPORT
- value: "5432"
- - name: POSTGRES_PASSWORD
- valueFrom:
- secretKeyRef:
- name: bookwyrm-secrets
- key: POSTGRES_PASSWORD
- - name: POSTGRES_USER
- value: "bookwyrm"
- - name: POSTGRES_DB
- value: "bookwyrm"
- - name: POSTGRES_HOST
- value: "pg-cluster-v2-rw.postgres-cluster.svc.cluster.local"
- # TODO: Setup Redis
- - name: REDIS_ACTIVITY_URL
- value: "redis://bookwyrm-keydb.bookwyrm.svc.cluster.local:6379/0"
- - name: REDIS_BROKER_URL
- value: "redis://bookwyrm-keydb.bookwyrm.svc.cluster.local:6379/1"
- - name: FLOWER_USER
- value: "bookwyrm"
- - name: FLOWER_PASSWORD
- valueFrom:
- secretKeyRef:
- name: bookwyrm-secrets
- key: FLOWER_PASSWORD
- - name: FLOWER_BASIC_AUTH
- value: "$(FLOWER_USER):$(FLOWER_PASSWORD)"
- - name: FLOWER_PORT
- value: "5555"
- - name: EMAIL_HOST
- value: "mail.midnightthoughts.space"
- - name: EMAIL_PORT
- value: "465"
- - name: EMAIL_HOST_USER
- value: "support@midnightthoughts.space"
- - name: EMAIL_HOST_PASSWORD
- valueFrom:
- secretKeyRef:
- name: bookwyrm-secrets
- key: EMAIL_HOST_PASSWORD
- - name: USE_S3
- value: "false"
- - name: AWS_ACCESS_KEY_ID
- valueFrom:
- secretKeyRef:
- name: bookwyrm-secrets
- key: AWS_ACCESS_KEY_ID
- - name: AWS_SECRET_ACCESS_KEY
- valueFrom:
- secretKeyRef:
- name: bookwyrm-secrets
- key: AWS_SECRET_ACCESS_KEY
- - name: AWS_STORAGE_BUCKET_NAME
- valueFrom:
- secretKeyRef:
- name: bookwyrm-secrets
- key: AWS_STORAGE_BUCKET_NAME
- - name: AWS_S3_CUSTOM_DOMAIN
- valueFrom:
- secretKeyRef:
- name: bookwyrm-secrets
- key: AWS_S3_CUSTOM_DOMAIN
- - name: AWS_S3_ENDPOINT_URL
- valueFrom:
- secretKeyRef:
- name: bookwyrm-secrets
- key: AWS_S3_ENDPOINT_URL
- - name: ENABLETHUMBNAIL_GENERATION
- value: "true"
+ - name: POD_IP
+ valueFrom:
+ fieldRef:
+ fieldPath: status.podIP
+ - name: DEBUG
+ value: "false"
+ - name: ALLOWED_HOSTS
+ value: "books.mtrnord.blog,localhost,$(POD_IP)"
+ - name: SECRET_KEY
+ valueFrom:
+ secretKeyRef:
+ name: bookwyrm-secrets
+ key: SECRET_KEY
+ - name: DOMAIN
+ value: "books.mtrnord.blog"
+ - name: USE_HTTPS
+ value: "true"
+ - name: PGPORT
+ value: "5432"
+ - name: POSTGRES_PASSWORD
+ valueFrom:
+ secretKeyRef:
+ name: bookwyrm-secrets
+ key: POSTGRES_PASSWORD
+ - name: POSTGRES_USER
+ value: "bookwyrm"
+ - name: POSTGRES_DB
+ value: "bookwyrm"
+ - name: POSTGRES_HOST
+ value: "pg-cluster-v2-rw.postgres-cluster.svc.cluster.local"
+ # TODO: Setup Redis
+ - name: REDIS_ACTIVITY_URL
+ value: "redis://bookwyrm-keydb.bookwyrm.svc.cluster.local:6379/0"
+ - name: REDIS_BROKER_URL
+ value: "redis://bookwyrm-keydb.bookwyrm.svc.cluster.local:6379/1"
+ - name: FLOWER_USER
+ value: "bookwyrm"
+ - name: FLOWER_PASSWORD
+ valueFrom:
+ secretKeyRef:
+ name: bookwyrm-secrets
+ key: FLOWER_PASSWORD
+ - name: FLOWER_BASIC_AUTH
+ value: "$(FLOWER_USER):$(FLOWER_PASSWORD)"
+ - name: FLOWER_PORT
+ value: "5555"
+ - name: EMAIL_HOST
+ value: "mail.midnightthoughts.space"
+ - name: EMAIL_PORT
+ value: "465"
+ - name: EMAIL_HOST_USER
+ value: "support@midnightthoughts.space"
+ - name: EMAIL_HOST_PASSWORD
+ valueFrom:
+ secretKeyRef:
+ name: bookwyrm-secrets
+ key: EMAIL_HOST_PASSWORD
+ - name: EMAIL_SENDER_NAME
+ value: "support"
+ - name: EMAIL_SENDER_DOMAIN
+ value: "midnightthoughts.space"
+ - name: USE_S3
+ value: "false"
+ - name: AWS_ACCESS_KEY_ID
+ valueFrom:
+ secretKeyRef:
+ name: bookwyrm-secrets
+ key: AWS_ACCESS_KEY_ID
+ - name: AWS_SECRET_ACCESS_KEY
+ valueFrom:
+ secretKeyRef:
+ name: bookwyrm-secrets
+ key: AWS_SECRET_ACCESS_KEY
+ - name: AWS_STORAGE_BUCKET_NAME
+ valueFrom:
+ secretKeyRef:
+ name: bookwyrm-secrets
+ key: AWS_STORAGE_BUCKET_NAME
+ - name: AWS_S3_CUSTOM_DOMAIN
+ valueFrom:
+ secretKeyRef:
+ name: bookwyrm-secrets
+ key: AWS_S3_CUSTOM_DOMAIN
+ - name: AWS_S3_ENDPOINT_URL
+ valueFrom:
+ secretKeyRef:
+ name: bookwyrm-secrets
+ key: AWS_S3_ENDPOINT_URL
+ - name: ENABLE_THUMBNAIL_GENERATION
+ value: "true"
ports:
- - name: flower-http
- containerPort: 5555
- protocol: TCP
+ - name: flower-http
+ containerPort: 5555
+ protocol: TCP
---
# Service for BookWyrm
apiVersion: v1
@@ -641,12 +665,12 @@ spec:
rules:
- name: bookwyrm-traffic
matches:
- - path:
- type: PathPrefix
- value: /
+ - path:
+ type: PathPrefix
+ value: /
backendRefs:
- - name: bookwyrm
- port: 8080
+ - name: bookwyrm
+ port: 8080
timeouts:
- request: 240s
- backendRequest: 0s
+ request: 240s
+ backendRequest: 0s
diff --git a/apps/talos_cluster/bookwyrm/initJob.yaml b/apps/talos_cluster/bookwyrm/initJob.yaml
@@ -20,100 +20,104 @@ spec:
imagePullPolicy: Always
command: ["bash"]
args:
- - /hl/bookwyrm.sh
- - init
+ - /hl/bookwyrm.sh
+ - init
volumeMounts:
- - name: bookwyrm-script
- mountPath: /hl
- readOnly: true
+ - name: bookwyrm-script
+ mountPath: /hl
+ readOnly: true
env:
- - name: POD_IP
- valueFrom:
- fieldRef:
- fieldPath: status.podIP
- - name: DEBUG
- value: "false"
- - name: ALLOWED_HOSTS
- value: "books.mtrnord.blog,localhost,$(POD_IP)"
- - name: SECRET_KEY
- valueFrom:
- secretKeyRef:
- name: bookwyrm-secrets
- key: SECRET_KEY
- - name: DOMAIN
- value: "books.mtrnord.blog"
- - name: USE_HTTPS
- value: "true"
- - name: PGPORT
- value: "5432"
- - name: POSTGRES_PASSWORD
- valueFrom:
- secretKeyRef:
- name: bookwyrm-secrets
- key: POSTGRES_PASSWORD
- - name: POSTGRES_USER
- value: "bookwyrm"
- - name: POSTGRES_DB
- value: "bookwyrm"
- - name: POSTGRES_HOST
- value: "pg-cluster-v2-rw.postgres-cluster.svc.cluster.local"
- # TODO: Setup Redis
- - name: REDIS_ACTIVITY_URL
- value: "redis://bookwyrm-keydb.bookwyrm.svc.cluster.local:6379/0"
- - name: REDIS_BROKER_URL
- value: "redis://bookwyrm-keydb.bookwyrm.svc.cluster.local:6379/1"
- - name: FLOWER_USER
- value: "bookwyrm"
- - name: FLOWER_PASSWORD
- valueFrom:
- secretKeyRef:
- name: bookwyrm-secrets
- key: FLOWER_PASSWORD
- - name: FLOWER_BASIC_AUTH
- value: "$(FLOWER_USER):$(FLOWER_PASSWORD)"
- - name: FLOWER_PORT
- value: "5555"
- - name: EMAIL_HOST
- value: "mail.midnightthoughts.space"
- - name: EMAIL_PORT
- value: "465"
- - name: EMAIL_HOST_USER
- value: "support@midnightthoughts.space"
- - name: EMAIL_HOST_PASSWORD
- valueFrom:
- secretKeyRef:
- name: bookwyrm-secrets
- key: EMAIL_HOST_PASSWORD
- - name: USE_S3
- value: "false"
- - name: AWS_ACCESS_KEY_ID
- valueFrom:
- secretKeyRef:
- name: bookwyrm-secrets
- key: AWS_ACCESS_KEY_ID
- - name: AWS_SECRET_ACCESS_KEY
- valueFrom:
- secretKeyRef:
- name: bookwyrm-secrets
- key: AWS_SECRET_ACCESS_KEY
- - name: AWS_STORAGE_BUCKET_NAME
- valueFrom:
- secretKeyRef:
- name: bookwyrm-secrets
- key: AWS_STORAGE_BUCKET_NAME
- - name: AWS_S3_CUSTOM_DOMAIN
- valueFrom:
- secretKeyRef:
- name: bookwyrm-secrets
- key: AWS_S3_CUSTOM_DOMAIN
- - name: AWS_S3_ENDPOINT_URL
- valueFrom:
- secretKeyRef:
- name: bookwyrm-secrets
- key: AWS_S3_ENDPOINT_URL
- - name: ENABLETHUMBNAIL_GENERATION
- value: "true"
+ - name: POD_IP
+ valueFrom:
+ fieldRef:
+ fieldPath: status.podIP
+ - name: DEBUG
+ value: "false"
+ - name: ALLOWED_HOSTS
+ value: "books.mtrnord.blog,localhost,$(POD_IP)"
+ - name: SECRET_KEY
+ valueFrom:
+ secretKeyRef:
+ name: bookwyrm-secrets
+ key: SECRET_KEY
+ - name: DOMAIN
+ value: "books.mtrnord.blog"
+ - name: USE_HTTPS
+ value: "true"
+ - name: PGPORT
+ value: "5432"
+ - name: POSTGRES_PASSWORD
+ valueFrom:
+ secretKeyRef:
+ name: bookwyrm-secrets
+ key: POSTGRES_PASSWORD
+ - name: POSTGRES_USER
+ value: "bookwyrm"
+ - name: POSTGRES_DB
+ value: "bookwyrm"
+ - name: POSTGRES_HOST
+ value: "pg-cluster-v2-rw.postgres-cluster.svc.cluster.local"
+ # TODO: Setup Redis
+ - name: REDIS_ACTIVITY_URL
+ value: "redis://bookwyrm-keydb.bookwyrm.svc.cluster.local:6379/0"
+ - name: REDIS_BROKER_URL
+ value: "redis://bookwyrm-keydb.bookwyrm.svc.cluster.local:6379/1"
+ - name: FLOWER_USER
+ value: "bookwyrm"
+ - name: FLOWER_PASSWORD
+ valueFrom:
+ secretKeyRef:
+ name: bookwyrm-secrets
+ key: FLOWER_PASSWORD
+ - name: FLOWER_BASIC_AUTH
+ value: "$(FLOWER_USER):$(FLOWER_PASSWORD)"
+ - name: FLOWER_PORT
+ value: "5555"
+ - name: EMAIL_HOST
+ value: "mail.midnightthoughts.space"
+ - name: EMAIL_PORT
+ value: "465"
+ - name: EMAIL_HOST_USER
+ value: "support@midnightthoughts.space"
+ - name: EMAIL_HOST_PASSWORD
+ valueFrom:
+ secretKeyRef:
+ name: bookwyrm-secrets
+ key: EMAIL_HOST_PASSWORD
+ - name: EMAIL_SENDER_NAME
+ value: "support"
+ - name: EMAIL_SENDER_DOMAIN
+ value: "midnightthoughts.space"
+ - name: USE_S3
+ value: "false"
+ - name: AWS_ACCESS_KEY_ID
+ valueFrom:
+ secretKeyRef:
+ name: bookwyrm-secrets
+ key: AWS_ACCESS_KEY_ID
+ - name: AWS_SECRET_ACCESS_KEY
+ valueFrom:
+ secretKeyRef:
+ name: bookwyrm-secrets
+ key: AWS_SECRET_ACCESS_KEY
+ - name: AWS_STORAGE_BUCKET_NAME
+ valueFrom:
+ secretKeyRef:
+ name: bookwyrm-secrets
+ key: AWS_STORAGE_BUCKET_NAME
+ - name: AWS_S3_CUSTOM_DOMAIN
+ valueFrom:
+ secretKeyRef:
+ name: bookwyrm-secrets
+ key: AWS_S3_CUSTOM_DOMAIN
+ - name: AWS_S3_ENDPOINT_URL
+ valueFrom:
+ secretKeyRef:
+ name: bookwyrm-secrets
+ key: AWS_S3_ENDPOINT_URL
+ - name: ENABLE_THUMBNAIL_GENERATION
+ value: "true"
volumes:
- name: bookwyrm-script
configMap:
- name: bookwyrm-script-d4kgf6b8fg
+ name: bookwyrm-script-d4kgf6b8fg
