feat: add more

2026-04-23 17:25:56 -05:00
parent 2585444c8a
commit e1b98ccd3c
29 changed files with 293 additions and 229 deletions
--- a/clusters/cl01tl/helm/vault/templates/external-secret.yaml
+++ b/clusters/cl01tl/helm/vault/templates/external-secret.yaml
@@ -1,120 +1,81 @@
 apiVersion: external-secrets.io/v1
 kind: ExternalSecret
 metadata:
-  name: vault-snapshot-agent-token
+  name: vault-snapshot-agent-role
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: vault-snapshot-agent-token
+    app.kubernetes.io/name: vault-snapshot-agent-role
    {{- include "custom.labels" . | nindent 4 }}
 spec:
  secretStoreRef:
    kind: ClusterSecretStore
-    name: vault
+    name: openbao
  data:
    - secretKey: VAULT_APPROLE_ROLE_ID
      remoteRef:
-        key: /cl01tl/vault/snapshot
-        property: VAULT_APPROLE_ROLE_ID
+        key: /cl01tl/vault/role/snapshot
+        property: role-id
    - secretKey: VAULT_APPROLE_SECRET_ID
      remoteRef:
-        key: /cl01tl/vault/snapshot
-        property: VAULT_APPROLE_SECRET_ID
+        key: /cl01tl/vault/role/snapshot
+        property: secret-id

 ---
 apiVersion: external-secrets.io/v1
 kind: ExternalSecret
 metadata:
-  name: vault-s3cmd-local-config
+  name: vault-backup-local-config
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: vault-s3cmd-local-config
+    app.kubernetes.io/name: vault-backup-local-config
    {{- include "custom.labels" . | nindent 4 }}
 spec:
  secretStoreRef:
    kind: ClusterSecretStore
-    name: vault
+    name: openbao
  data:
-    - secretKey: .s3cfg
-      remoteRef:
-        key: /garage/home-infra/vault-backups
-        property: s3cfg-local
    - secretKey: BUCKET
      remoteRef:
        key: /garage/home-infra/vault-backups
-        property: BUCKET
+        property: BUCKET_PATH

 ---
 apiVersion: external-secrets.io/v1
 kind: ExternalSecret
 metadata:
-  name: vault-s3cmd-remote-config
+  name: vault-backup-remote-config
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: vault-s3cmd-remote-config
+    app.kubernetes.io/name: vault-backup-remote-config
    {{- include "custom.labels" . | nindent 4 }}
 spec:
  secretStoreRef:
    kind: ClusterSecretStore
-    name: vault
+    name: openbao
  data:
-    - secretKey: .s3cfg
-      remoteRef:
-        key: /garage/home-infra/vault-backups
-        property: s3cfg-remote
    - secretKey: BUCKET
      remoteRef:
        key: /garage/home-infra/vault-backups
-        property: BUCKET
+        property: BUCKET_PATH

 ---
 apiVersion: external-secrets.io/v1
 kind: ExternalSecret
 metadata:
-  name: vault-s3cmd-external-config
+  name: vault-backup-external-config
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: vault-s3cmd-external-config
+    app.kubernetes.io/name: vault-backup-external-config
    {{- include "custom.labels" . | nindent 4 }}
 spec:
  secretStoreRef:
    kind: ClusterSecretStore
-    name: vault
+    name: openbao
  data:
-    - secretKey: .s3cfg
-      remoteRef:
-        key: /digital-ocean/home-infra/vault-backup
-        property: s3cfg
    - secretKey: BUCKET
      remoteRef:
        key: /digital-ocean/home-infra/vault-backup
-        property: BUCKET
-
---
-apiVersion: external-secrets.io/v1
-kind: ExternalSecret
-metadata:
-  name: vault-backup-ntfy-secret
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app.kubernetes.io/name: vault-backup-ntfy-secret
-    {{- include "custom.labels" . | nindent 4 }}
-spec:
-  secretStoreRef:
-    kind: ClusterSecretStore
-    name: vault
-  data:
-    - secretKey: NTFY_TOKEN
-      remoteRef:
-        key: /ntfy/user/cl01tl
-        property: token
-    - secretKey: NTFY_ENDPOINT
-      remoteRef:
-        key: /ntfy/user/cl01tl
-        property: endpoint
-    - secretKey: NTFY_TOPIC
-      remoteRef:
-        key: /cl01tl/vault/snapshot
-        property: NTFY_TOPIC
+        property: BUCKET_PATH

 ---
 apiVersion: external-secrets.io/v1
@@ -128,24 +89,20 @@ metadata:
 spec:
  secretStoreRef:
    kind: ClusterSecretStore
-    name: vault
+    name: openbao
  data:
    - secretKey: ENVIRONMENT
      remoteRef:
        key: /cl01tl/vault/unseal
-        property: ENVIRONMENT
+        property: environment
    - secretKey: NODES
      remoteRef:
        key: /cl01tl/vault/unseal
-        property: NODES
+        property: nodes
    - secretKey: TOKENS
      remoteRef:
        key: /cl01tl/vault/unseal
-        property: TOKENS_1
-    - secretKey: NOTIFY_QUEUE_URLS
-      remoteRef:
-        key: /cl01tl/vault/unseal
-        property: NOTIFY_QUEUE_URLS
+        property: tokens-1

 ---
 apiVersion: external-secrets.io/v1
@@ -159,24 +116,20 @@ metadata:
 spec:
  secretStoreRef:
    kind: ClusterSecretStore
-    name: vault
+    name: openbao
  data:
    - secretKey: ENVIRONMENT
      remoteRef:
        key: /cl01tl/vault/unseal
-        property: ENVIRONMENT
+        property: environment
    - secretKey: NODES
      remoteRef:
        key: /cl01tl/vault/unseal
-        property: NODES
+        property: nodes
    - secretKey: TOKENS
      remoteRef:
        key: /cl01tl/vault/unseal
-        property: TOKENS_2
-    - secretKey: NOTIFY_QUEUE_URLS
-      remoteRef:
-        key: /cl01tl/vault/unseal
-        property: NOTIFY_QUEUE_URLS
+        property: tokens-2

 ---
 apiVersion: external-secrets.io/v1
@@ -190,60 +143,73 @@ metadata:
 spec:
  secretStoreRef:
    kind: ClusterSecretStore
-    name: vault
+    name: openbao
  data:
    - secretKey: ENVIRONMENT
      remoteRef:
        key: /cl01tl/vault/unseal
-        property: ENVIRONMENT
+        property: environment
    - secretKey: NODES
      remoteRef:
        key: /cl01tl/vault/unseal
-        property: NODES
+        property: nodes
    - secretKey: TOKENS
      remoteRef:
        key: /cl01tl/vault/unseal
-        property: TOKENS_3
-    - secretKey: NOTIFY_QUEUE_URLS
-      remoteRef:
-        key: /cl01tl/vault/unseal
-        property: NOTIFY_QUEUE_URLS
+        property: tokens-3

 ---
 apiVersion: external-secrets.io/v1
 kind: ExternalSecret
 metadata:
-  name: vault-token
+  name: vault-ntfy-config
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: vault-token
+    app.kubernetes.io/name: vault-ntfy-config
    {{- include "custom.labels" . | nindent 4 }}
 spec:
  secretStoreRef:
    kind: ClusterSecretStore
-    name: vault
+    name: openbao
  data:
-    - secretKey: token
+    - secretKey: NTFY_TOKEN
      remoteRef:
-        key: /cl01tl/vault/token
+        key: /ntfy/user/cl01tl
        property: token
-    - secretKey: unseal_key_1
+    - secretKey: NTFY_ENDPOINT
      remoteRef:
-        key: /cl01tl/vault/token
-        property: unseal_key_1
-    - secretKey: unseal_key_2
+        key: /ntfy/user/cl01tl
+        property: endpoint
+    - secretKey: NTFY_TOPIC
      remoteRef:
-        key: /cl01tl/vault/token
-        property: unseal_key_2
-    - secretKey: unseal_key_3
+        key: /cl01tl/ntfy/topics
+        property: vault
+
+---
+apiVersion: external-secrets.io/v1
+kind: ExternalSecret
+metadata:
+  name: vault-ntfy-unseal-config
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: vault-ntfy-unseal-config
+    {{- include "custom.labels" . | nindent 4 }}
+spec:
+  secretStoreRef:
+    kind: ClusterSecretStore
+    name: openbao
+  target:
+    template:
+      mergePolicy: Merge
+      engineVersion: v2
+      data:
+        NOTIFY_QUEUE_URLS: "{{ `{{ .endpoint }}` }}/{{ `{{ .topic }}` }}/?priority=4&tags=vault,unseal&title=Vault+Unsealed"
+  data:
+    - secretKey: endpoint
      remoteRef:
-        key: /cl01tl/vault/token
-        property: unseal_key_3
-    - secretKey: unseal_key_4
+        key: /cl01tl/ntfy/users/cl01tl
+        property: internal-endpoint-credential
+    - secretKey: topic
      remoteRef:
-        key: /cl01tl/vault/token
-        property: unseal_key_4
-    - secretKey: unseal_key_5
-      remoteRef:
-        key: /cl01tl/vault/token
-        property: unseal_key_5
+        key: /cl01tl/ntfy/topics
+        property: vault
--- a/clusters/cl01tl/helm/vault/templates/secret-provider-class.yaml
+++ b/clusters/cl01tl/helm/vault/templates/secret-provider-class.yaml
@@ -0,0 +1,58 @@
+apiVersion: secrets-store.csi.x-k8s.io/v1
+kind: SecretProviderClass
+metadata:
+  name: vault-backup-local-config
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: vault-backup-local-config
+    {{- include "custom.labels" . | nindent 4 }}
+spec:
+  provider: openbao
+  parameters:
+    baoAddress: "http://openbao-internal.openbao:8200"
+    roleName: slskd
+    objects: |
+      - objectName: .s3cfg
+        fileName: .s3cfg
+        secretPath: secret/data/garage/home-infra/vault-backups
+        secretKey: s3cfg-local
+
+---
+apiVersion: secrets-store.csi.x-k8s.io/v1
+kind: SecretProviderClass
+metadata:
+  name: vault-backup-remote-config
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: vault-backup-remote-config
+    {{- include "custom.labels" . | nindent 4 }}
+spec:
+  provider: openbao
+  parameters:
+    baoAddress: "http://openbao-internal.openbao:8200"
+    roleName: slskd
+    objects: |
+      - objectName: .s3cfg
+        fileName: .s3cfg
+        secretPath: secret/data/garage/home-infra/vault-backups
+        secretKey: s3cfg-remote
+
+---
+apiVersion: secrets-store.csi.x-k8s.io/v1
+kind: SecretProviderClass
+metadata:
+  name: vault-backup-external-config
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: vault-backup-external-config
+    {{- include "custom.labels" . | nindent 4 }}
+spec:
+  provider: openbao
+  parameters:
+    baoAddress: "http://openbao-internal.openbao:8200"
+    roleName: slskd
+    objects: |
+      - objectName: .s3cfg
+        fileName: .s3cfg
+        secretPath: secret/data/digital-ocean/home-infra/vault-backups
+        secretKey: s3cfg
--- a/clusters/cl01tl/helm/vault/values.yaml
+++ b/clusters/cl01tl/helm/vault/values.yaml
@@ -119,7 +119,7 @@ snapshot:
            - /scripts/snapshot.sh
          envFrom:
            - secretRef:
-                name: vault-snapshot-agent-token
+                name: vault-snapshot-agent-role
          env:
            - name: VAULT_ADDR
              value: http://vault-active.vault.svc.cluster.local:8200
@@ -135,12 +135,12 @@ snapshot:
            - /scripts/backup.sh
          envFrom:
            - secretRef:
-                name: vault-backup-ntfy-secret
+                name: vault-ntfy-config
          env:
            - name: BUCKET
              valueFrom:
                secretKeyRef:
-                  name: vault-s3cmd-local-config
+                  name: vault-backup-local-config
                  key: BUCKET
            - name: TARGET
              value: Local
@@ -155,12 +155,12 @@ snapshot:
            - /scripts/backup.sh
          envFrom:
            - secretRef:
-                name: vault-backup-ntfy-secret
+                name: vault-ntfy-config
          env:
            - name: BUCKET
              valueFrom:
                secretKeyRef:
-                  name: vault-s3cmd-remote-config
+                  name: vault-backup-remote-config
                  key: BUCKET
            - name: TARGET
              value: Remote
@@ -175,12 +175,12 @@ snapshot:
            - /scripts/backup.sh
          envFrom:
            - secretRef:
-                name: vault-backup-ntfy-secret
+                name: vault-ntfy-config
          env:
            - name: BUCKET
              valueFrom:
                secretKeyRef:
-                  name: vault-s3cmd-external-config
+                  name: vault-backup-external-config
                  key: BUCKET
            - name: TARGET
              value: External
@@ -211,10 +211,14 @@ snapshot:
          s3-backup-external:
            - path: /scripts/backup.sh
              subPath: backup.sh
-    s3cmd-local-config:
-      enabled: true
-      type: secret
-      name: vault-s3cmd-local-config
+    backup-local-config:
+      type: custom
+      volumeSpec:
+        csi:
+          driver: secrets-store.csi.k8s.io
+          readOnly: true
+          volumeAttributes:
+            secretProviderClass: vault-backup-local-config
      advancedMounts:
        snapshot:
          s3-backup-local:
@@ -222,10 +226,14 @@ snapshot:
              readOnly: true
              mountPropagation: None
              subPath: .s3cfg
-    s3cmd-remote-config:
-      enabled: true
-      type: secret
-      name: vault-s3cmd-remote-config
+    backup-remote-config:
+      type: custom
+      volumeSpec:
+        csi:
+          driver: secrets-store.csi.k8s.io
+          readOnly: true
+          volumeAttributes:
+            secretProviderClass: vault-backup-remote-config
      advancedMounts:
        snapshot:
          s3-backup-remote:
@@ -233,10 +241,14 @@ snapshot:
              readOnly: true
              mountPropagation: None
              subPath: .s3cfg
-    s3cmd-external-config:
-      enabled: true
-      type: secret
-      name: vault-s3cmd-external-config
+    backup-external-config:
+      type: custom
+      volumeSpec:
+        csi:
+          driver: secrets-store.csi.k8s.io
+          readOnly: true
+          volumeAttributes:
+            secretProviderClass: vault-backup-external-config
      advancedMounts:
        snapshot:
          s3-backup-external:
@@ -276,6 +288,8 @@ unseal:
          envFrom:
            - secretRef:
                name: vault-unseal-config-1
+            - secretRef:
+                name: vault-ntfy-unseal-config
          resources:
            requests:
              cpu: 1m
@@ -292,6 +306,8 @@ unseal:
          envFrom:
            - secretRef:
                name: vault-unseal-config-2
+            - secretRef:
+                name: vault-ntfy-unseal-config
          resources:
            requests:
              cpu: 1m
@@ -308,6 +324,8 @@ unseal:
          envFrom:
            - secretRef:
                name: vault-unseal-config-3
+            - secretRef:
+                name: vault-ntfy-unseal-config
          resources:
            requests:
              cpu: 1m