From 71b69533f6d2482677127a3b60a4b6efaa31570a Mon Sep 17 00:00:00 2001
From: Zoe Roux <zoe.roux@zoriya.dev>
Date: Sat, 2 Aug 2025 23:22:40 +0200
Subject: [PATCH] Cleanup bitwarden setup

---
 apps/external-secrets.yaml   | 47 ------------------------------------
 apps/misc/bitwarden.yaml     | 46 +++++++++++++++++++++++++++++++++++
 apps/misc/kustomization.yaml |  1 +
 3 files changed, 47 insertions(+), 47 deletions(-)
 create mode 100644 apps/misc/bitwarden.yaml

diff --git a/apps/external-secrets.yaml b/apps/external-secrets.yaml
index 744c2b3..ebe5a2c 100644
--- a/apps/external-secrets.yaml
+++ b/apps/external-secrets.yaml
@@ -22,50 +22,3 @@ spec:
       valuesObject:
         bitwarden-sdk-server:
           enabled: true
----
-apiVersion: external-secrets.io/v1
-kind: ClusterSecretStore
-metadata:
-  name: bitwarden
-spec:
-  provider:
-    bitwardensecretsmanager:
-      apiURL: https://vault.bitwarden.eu/api
-      identityURL: https://vault.bitwarden.eu/identity
-      auth:
-        secretRef:
-          credentials:
-            namespace: external-secrets
-            name: bitwarden-access-token
-            key: token
-      caProvider:
-        type: Secret
-        namespace: external-secrets
-        name: bitwarden-tls-certs
-        key: ca.crt
-
-      organizationID: b461238b-9b93-4598-b12c-b32c00834ab6
-      projectID: b63f0f85-2c6f-4f99-b999-b32c009d7bdf
----
-apiVersion: cert-manager.io/v1
-kind: Certificate
-metadata:
-  name: bitwarden-tls-certs
-  namespace: external-secrets
-spec:
-  secretName: bitwarden-tls-certs
-  dnsNames:
-    - bitwarden-sdk-server.external-secrets.svc.cluster.local
-    - external-secrets-bitwarden-sdk-server.external-secrets.svc.cluster.local
-    - localhost
-  ipAddresses:
-    - 127.0.0.1
-    - ::1
-  privateKey:
-    algorithm: RSA
-    encoding: PKCS8
-    size: 2048
-  issuerRef:
-    name: selfsigned
-    kind: ClusterIssuer
-    group: cert-manager.io
diff --git a/apps/misc/bitwarden.yaml b/apps/misc/bitwarden.yaml
new file mode 100644
index 0000000..e269479
--- /dev/null
+++ b/apps/misc/bitwarden.yaml
@@ -0,0 +1,46 @@
+apiVersion: external-secrets.io/v1
+kind: ClusterSecretStore
+metadata:
+  name: bitwarden
+spec:
+  provider:
+    bitwardensecretsmanager:
+      apiURL: https://vault.bitwarden.eu/api
+      identityURL: https://vault.bitwarden.eu/identity
+      auth:
+        secretRef:
+          credentials:
+            namespace: external-secrets
+            name: bitwarden-access-token
+            key: token
+      caProvider:
+        type: Secret
+        namespace: external-secrets
+        name: bitwarden-tls-certs
+        key: ca.crt
+
+      organizationID: b461238b-9b93-4598-b12c-b32c00834ab6
+      projectID: b63f0f85-2c6f-4f99-b999-b32c009d7bdf
+---
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: bitwarden-tls-certs
+  namespace: external-secrets
+spec:
+  secretName: bitwarden-tls-certs
+  dnsNames:
+    - bitwarden-sdk-server.external-secrets.svc.cluster.local
+    - external-secrets-bitwarden-sdk-server.external-secrets.svc.cluster.local
+    - localhost
+  ipAddresses:
+    - 127.0.0.1
+    - ::1
+  privateKey:
+    algorithm: RSA
+    encoding: PKCS8
+    size: 2048
+  issuerRef:
+    name: selfsigned
+    kind: ClusterIssuer
+    group: cert-manager.io
diff --git a/apps/misc/kustomization.yaml b/apps/misc/kustomization.yaml
index a618a33..583cff2 100644
--- a/apps/misc/kustomization.yaml
+++ b/apps/misc/kustomization.yaml
@@ -4,3 +4,4 @@ kind: Kustomization
 resources:
   - cilium-announcement.yaml
   - ip-pool.yaml
+  - bitwarden.yaml