Skip to content

Commit f165c09

Browse files
committed
Upgrade Dawarich with JWT secret
Update the Dawarich web and Sidekiq images to 1.7.7. Add a generated External Secrets password for JWT_SECRET_KEY and expose it to both Dawarich containers so the upgrade does not rely on the old unset JWT behavior.
1 parent d9dd83a commit f165c09

4 files changed

Lines changed: 55 additions & 2 deletions

File tree

kubernetes/dawarich/deploy-sidekiq.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ spec:
2424
spec:
2525
containers:
2626
- name: sidekiq
27-
image: freikin/dawarich:1.6.1@sha256:a884f69f19ce0f66992f3872d24544d1e587e133b8a003e072711aafc1e02429
27+
image: freikin/dawarich:1.7.7@sha256:f7eea22def731ef98f0644b191c477917790bb0e5449b0014bac2f349ce178a7
2828
command: [bundle, exec, sidekiq]
2929
args: []
3030
env:
@@ -36,6 +36,11 @@ spec:
3636
secretKeyRef:
3737
name: dawarich-secrets
3838
key: SECRET_KEY_BASE
39+
- name: JWT_SECRET_KEY
40+
valueFrom:
41+
secretKeyRef:
42+
name: dawarich-jwt-secrets
43+
key: JWT_SECRET_KEY
3944
# Database credentials from CNPG
4045
- name: DATABASE_HOST
4146
value: dawarich-postgres-rw

kubernetes/dawarich/deploy-web.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ spec:
2424
spec:
2525
containers:
2626
- name: web
27-
image: freikin/dawarich:1.6.1@sha256:a884f69f19ce0f66992f3872d24544d1e587e133b8a003e072711aafc1e02429
27+
image: freikin/dawarich:1.7.7@sha256:f7eea22def731ef98f0644b191c477917790bb0e5449b0014bac2f349ce178a7
2828
command: [web-entrypoint.sh]
2929
args: [bin/rails, server, -p, '3000', -b, '::']
3030
ports:
@@ -49,6 +49,11 @@ spec:
4949
secretKeyRef:
5050
name: dawarich-secrets
5151
key: SECRET_KEY_BASE
52+
- name: JWT_SECRET_KEY
53+
valueFrom:
54+
secretKeyRef:
55+
name: dawarich-jwt-secrets
56+
key: JWT_SECRET_KEY
5257
# Database credentials from CNPG
5358
- name: DATABASE_HOST
5459
value: dawarich-postgres-rw

kubernetes/dawarich/externalsecret.yaml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,34 @@ spec:
2828
apiVersion: external-secrets.io/v1
2929
kind: ExternalSecret
3030

31+
metadata:
32+
name: dawarich-jwt-secrets
33+
namespace: dawarich
34+
35+
spec:
36+
secretStoreRef:
37+
name: production
38+
kind: ClusterSecretStore
39+
refreshPolicy: CreatedOnce
40+
target:
41+
name: dawarich-jwt-secrets
42+
creationPolicy: Owner
43+
# Password generators emit a field named `password`; rewrite it to the
44+
# Dawarich env var name so the target Secret key is self-describing.
45+
dataFrom:
46+
- rewrite:
47+
- regexp:
48+
source: password
49+
target: JWT_SECRET_KEY
50+
sourceRef:
51+
generatorRef:
52+
kind: Password
53+
name: dawarich-jwt-secret-key
54+
55+
---
56+
apiVersion: external-secrets.io/v1
57+
kind: ExternalSecret
58+
3159
metadata:
3260
name: dawarich-valkey-config
3361
namespace: dawarich

kubernetes/dawarich/password-generators.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,21 @@ spec:
1717
apiVersion: generators.external-secrets.io/v1alpha1
1818
kind: Password
1919

20+
metadata:
21+
name: dawarich-jwt-secret-key
22+
namespace: dawarich
23+
24+
spec:
25+
length: 64
26+
allowRepeat: true
27+
noUpper: false
28+
digits: 10
29+
symbols: 0
30+
31+
---
32+
apiVersion: generators.external-secrets.io/v1alpha1
33+
kind: Password
34+
2035
metadata:
2136
name: dawarich-valkey
2237
namespace: dawarich

0 commit comments

Comments
 (0)