Merge pull request 'tmp/secrets-9' (#6167) from tmp/secrets-9 into main

Reviewed-on: #6167

clusters/cl01tl/helm/grimmory/templates/external-secret.yaml

@@ -1,10 +1,10 @@
 apiVersion: external-secrets.io/v1
 kind: ExternalSecret
 metadata:
-  name: grimmory-database-config
+  name: grimmory-database-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: grimmory-database-config
+    app.kubernetes.io/name: grimmory-database-secret
     {{- include "custom.labels" . | nindent 4 }}
 spec:
   secretStoreRef:
@@ -33,11 +33,11 @@ spec:
     - secretKey: access
       remoteRef:
         key: /digital-ocean/home-infra/mariadb-backups
-        property: access
+        property: AWS_ACCESS_KEY_ID
     - secretKey: secret
       remoteRef:
         key: /digital-ocean/home-infra/mariadb-backups
-        property: secret
+        property: AWS_SECRET_ACCESS_KEY
 
 ---
 apiVersion: external-secrets.io/v1

clusters/cl01tl/helm/grimmory/values.yaml

@@ -27,7 +27,7 @@ grimmory:
             - name: DATABASE_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: grimmory-database-config
+                  name: grimmory-database-secret
                   key: password
             - name: GRIMMORY_PORT
               value: 6060
@@ -98,7 +98,7 @@ mariadb-cluster:
   mariadb:
     rootPasswordSecretKeyRef:
       generate: false
-      name: grimmory-database-config
+      name: grimmory-database-secret
       key: password
     storage:
       size: 5Gi

clusters/cl01tl/helm/matrix-synapse/values.yaml

@@ -118,6 +118,8 @@ matrix-hookshot:
       type: deployment
       replicas: 1
       strategy: Recreate
+      serviceAccount:
+        name: matrix-synapse
       containers:
         main:
           image:

clusters/cl01tl/helm/openbao/templates/external-secret.yaml

@@ -45,19 +45,15 @@ spec:
     - secretKey: ENVIRONMENT
       remoteRef:
         key: /cl01tl/openbao/unseal
-        property: ENVIRONMENT
+        property: environment
     - secretKey: NODES
       remoteRef:
         key: /cl01tl/openbao/unseal
-        property: NODES
+        property: nodes
     - secretKey: TOKENS
       remoteRef:
         key: /cl01tl/openbao/unseal
-        property: TOKENS_1
+        property: tokens-1
-    - secretKey: NOTIFY_QUEUE_URLS
-      remoteRef:
-        key: /cl01tl/openbao/unseal
-        property: NOTIFY_QUEUE_URLS
 
 ---
 apiVersion: external-secrets.io/v1
@@ -76,19 +72,15 @@ spec:
     - secretKey: ENVIRONMENT
       remoteRef:
         key: /cl01tl/openbao/unseal
-        property: ENVIRONMENT
+        property: environment
     - secretKey: NODES
       remoteRef:
         key: /cl01tl/openbao/unseal
-        property: NODES
+        property: nodes
     - secretKey: TOKENS
       remoteRef:
         key: /cl01tl/openbao/unseal
-        property: TOKENS_2
+        property: tokens-2
-    - secretKey: NOTIFY_QUEUE_URLS
-      remoteRef:
-        key: /cl01tl/openbao/unseal
-        property: NOTIFY_QUEUE_URLS
 
 ---
 apiVersion: external-secrets.io/v1
@@ -107,56 +99,41 @@ spec:
     - secretKey: ENVIRONMENT
       remoteRef:
         key: /cl01tl/openbao/unseal
-        property: ENVIRONMENT
+        property: environment
     - secretKey: NODES
       remoteRef:
         key: /cl01tl/openbao/unseal
-        property: NODES
+        property: nodes
     - secretKey: TOKENS
       remoteRef:
         key: /cl01tl/openbao/unseal
-        property: TOKENS_3
+        property: tokens-3
-    - secretKey: NOTIFY_QUEUE_URLS
-      remoteRef:
-        key: /cl01tl/openbao/unseal
-        property: NOTIFY_QUEUE_URLS
 
-# ---
+---
-# apiVersion: external-secrets.io/v1
+apiVersion: external-secrets.io/v1
-# kind: ExternalSecret
+kind: ExternalSecret
-# metadata:
+metadata:
-#   name: openbao-token
+  name: openbao-ntfy-unseal-config
-#   namespace: {{ .Release.Namespace }}
+  namespace: {{ .Release.Namespace }}
-#   labels:
+  labels:
-#     app.kubernetes.io/name: openbao-token
+    app.kubernetes.io/name: openbao-ntfy-unseal-config
-#     app.kubernetes.io/instance: {{ .Release.Name }}
+    {{- include "custom.labels" . | nindent 4 }}
-#     app.kubernetes.io/part-of: {{ .Release.Name }}
+spec:
-# spec:
+  secretStoreRef:
-#   secretStoreRef:
+    kind: ClusterSecretStore
-#     kind: ClusterSecretStore
+    name: openbao
-#     name: openbao
+  target:
-#   data:
+    template:
-#     - secretKey: token
+      mergePolicy: Merge
-#       remoteRef:
+      engineVersion: v2
-#         key: /cl01tl/openbao/token
+      data:
-#         property: token
+        NOTIFY_QUEUE_URLS: "{{ `{{ .endpoint }}` }}/{{ `{{ .topic }}` }}/?priority=4&tags=vault,unseal&title=Vault+Unsealed"
-#     - secretKey: unseal_key_1
+  data:
-#       remoteRef:
+    - secretKey: endpoint
-#         key: /cl01tl/openbao/token
+      remoteRef:
-#         property: unseal_key_1
+        key: /cl01tl/ntfy/users/cl01tl
-#     - secretKey: unseal_key_2
+        property: internal-endpoint-credential
-#       remoteRef:
+    - secretKey: topic
-#         key: /cl01tl/openbao/token
+      remoteRef:
-#         property: unseal_key_2
+        key: /cl01tl/ntfy/topics
-#     - secretKey: unseal_key_3
+        property: openbao
-#       remoteRef:
-#         key: /cl01tl/openbao/token
-#         property: unseal_key_3
-#     - secretKey: unseal_key_4
-#       remoteRef:
-#         key: /cl01tl/openbao/token
-#         property: unseal_key_4
-#     - secretKey: unseal_key_5
-#       remoteRef:
-#         key: /cl01tl/openbao/token
-#         property: unseal_key_5

clusters/cl01tl/helm/openbao/values.yaml

@@ -160,6 +160,8 @@ unseal:
           envFrom:
             - secretRef:
                 name: openbao-unseal-config-1
+            - secretRef:
+                name: openbao-ntfy-unseal-config
           resources:
             requests:
               cpu: 1m
@@ -176,6 +178,8 @@ unseal:
           envFrom:
             - secretRef:
                 name: openbao-unseal-config-2
+            - secretRef:
+                name: openbao-ntfy-unseal-config
           resources:
             requests:
               cpu: 1m
@@ -192,6 +196,8 @@ unseal:
           envFrom:
             - secretRef:
                 name: openbao-unseal-config-3
+            - secretRef:
+                name: openbao-ntfy-unseal-config
           resources:
             requests:
               cpu: 1m

clusters/cl01tl/helm/vault/templates/external-secret.yaml

@@ -93,7 +93,7 @@ spec:
   data:
     - secretKey: BUCKET
       remoteRef:
-        key: /digital-ocean/home-infra/vault-backup
+        key: /digital-ocean/home-infra/vault-backups
         property: BUCKET_PATH
 
 ---
@@ -197,8 +197,8 @@ spec:
         property: token
     - secretKey: NTFY_ENDPOINT
       remoteRef:
-        key: /cl01tl/ntfy/users/cl01tl
+        key: /cl01tl/ntfy/config
-        property: endpoint
+        property: internal-endpoint
     - secretKey: NTFY_TOPIC
       remoteRef:
         key: /cl01tl/ntfy/topics