wildduck: Refined Dragonfly cleanup

This commit is contained in:
Lauri Võsandi 2024-08-15 09:49:48 +03:00
parent b3f1eb069f
commit 4d5c47e21b
7 changed files with 50 additions and 36 deletions

View File

@ -177,8 +177,8 @@ spec:
- name: REDIS_URI - name: REDIS_URI
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: dragonfly-auth name: session-storage
key: REDIS_URI key: REDIS_WILDDUCK_URI
- name: MONGO_URI - name: MONGO_URI
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:

View File

@ -0,0 +1,42 @@
---
apiVersion: codemowers.cloud/v1beta1
kind: SecretClaim
metadata:
name: session-storage
spec:
size: 32
mapping:
- key: password
value: "%(plaintext)s"
- key: REDIS_WILDDUCK_URI
value: "redis://:%(plaintext)s@session-storage/1"
- key: REDIS_WEBMAIL_URI
value: "redis://:%(plaintext)s@session-storage/2"
- key: REDIS_WILDFLOCK_URI
value: "redis://:%(plaintext)s@session-storage/2"
---
apiVersion: dragonflydb.io/v1alpha1
kind: Dragonfly
metadata:
name: session-storage
spec:
authentication:
passwordFromSecret:
key: password
name: session-storage
replicas: 3
resources:
limits:
memory: 1Gi
---
apiVersion: monitoring.coreos.com/v1
kind: PodMonitor
metadata:
name: session-storage
spec:
selector:
matchLabels:
app: session-storage
app.kubernetes.io/part-of: dragonfly
podMetricsEndpoints:
- port: admin

View File

@ -1,28 +0,0 @@
---
apiVersion: codemowers.cloud/v1beta1
kind: SecretClaim
metadata:
name: dragonfly-auth
spec:
size: 32
mapping:
- key: password
value: "%(plaintext)s"
- key: REDIS_WILDDUCK_URI
value: "redis://:%(plaintext)s@dragonfly/1"
- key: REDIS_WILDFLOCK_URI
value: "redis://:%(plaintext)s@dragonfly/2"
---
apiVersion: dragonflydb.io/v1alpha1
kind: Dragonfly
metadata:
name: dragonfly
spec:
authentication:
passwordFromSecret:
key: password
name: dragonfly-auth
replicas: 3
resources:
limits:
memory: 1Gi

View File

@ -88,8 +88,8 @@ spec:
- name: APPCONF_dbs_redis - name: APPCONF_dbs_redis
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: dragonfly-auth name: session-storage
key: REDIS_URI key: REDIS_WEBMAIL_URI
volumes: volumes:
- name: webmail-config - name: webmail-config
projected: projected:

View File

@ -92,7 +92,7 @@ spec:
- name: APPCONF_dbs_redis - name: APPCONF_dbs_redis
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: dragonfly-auth name: session-storage
key: REDIS_WILDDUCK_URI key: REDIS_WILDDUCK_URI
volumeMounts: volumeMounts:
- mountPath: /cert - mountPath: /cert

View File

@ -96,7 +96,7 @@ spec:
- name: REDIS_URL - name: REDIS_URL
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: dragonfly-auth name: session-storage
key: REDIS_WILDFLOCK_URI key: REDIS_WILDFLOCK_URI
- name: CLIENT_URL - name: CLIENT_URL
value: https://wildflock.k-space.ee value: https://wildflock.k-space.ee

View File

@ -125,8 +125,8 @@ spec:
- name: APPCONF_dbs_redis - name: APPCONF_dbs_redis
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: dragonfly-auth name: session-storage
key: REDIS_URI key: REDIS_WILDDUCK_URI
volumeMounts: volumeMounts:
- name: cert - name: cert
mountPath: /cert mountPath: /cert