From 51a314bb4f25bf9f9c7123b7d63aa2d2f74b7cf5 Mon Sep 17 00:00:00 2001
From: Nikolai Rodionov <allanger@badhouseplants.net>
Date: Thu, 31 Oct 2024 10:43:29 +0100
Subject: [PATCH] Move vaultwardentest to the etersoft cluster

---
 .sops.yaml                                          |  2 +-
 README.md                                           |  8 ++++++++
 .../applications/helmfile-badhouseplants.yaml       |  7 -------
 installations/applications/helmfile-etersoft.yaml   |  7 +++++++
 installations/applications/helmfile.yaml            |  6 ++++++
 .../secrets.vaultwardentest.yaml                    |  0
 .../values.vaultwardentest.yaml                     | 13 ++++++++-----
 7 files changed, 30 insertions(+), 13 deletions(-)
 create mode 100644 installations/applications/helmfile.yaml
 rename values/{badhouseplants => etersoft}/secrets.vaultwardentest.yaml (100%)
 rename values/{badhouseplants => etersoft}/values.vaultwardentest.yaml (89%)

diff --git a/.sops.yaml b/.sops.yaml
index 99bfaaa..4a815be 100644
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -1,5 +1,5 @@
 creation_rules:
-  - path_regex: values/.*/secrets.server-xray-public.yaml*
+  - path_regex: values/.*/secrets.server-xray-public./*
     key_groups:
       - age:
           - age1vzkv97n2p7gfkw8dyx8ctz2kumattz89th2jq47zyjyrarmnssysdkw9v8
diff --git a/README.md b/README.md
index 1b0ffd2..e75696c 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,9 @@
+<<<<<<< Updated upstream
 k8s-deployemnt
+=======
+# Helmfile deployments for Bad Houseplants
+
+## Project structure
+
+
+>>>>>>> Stashed changes
diff --git a/installations/applications/helmfile-badhouseplants.yaml b/installations/applications/helmfile-badhouseplants.yaml
index 70f7b53..9f1a79f 100644
--- a/installations/applications/helmfile-badhouseplants.yaml
+++ b/installations/applications/helmfile-badhouseplants.yaml
@@ -75,13 +75,6 @@ releases:
       - template: default-env-values
       - template: default-env-secrets
       - template: ext-tcp-routes
-        #- name: vaultwardentest
-        #  chart: allangers-charts/vaultwarden
-        #  version: 2.1.0
-        #  namespace: applications
-        #  inherit:
-        #    - template: default-env-values
-        #    - template: default-env-secrets
   - name: navidrome
     chart: allangers-charts/navidrome
     namespace: applications
diff --git a/installations/applications/helmfile-etersoft.yaml b/installations/applications/helmfile-etersoft.yaml
index bb956db..59dd1ab 100644
--- a/installations/applications/helmfile-etersoft.yaml
+++ b/installations/applications/helmfile-etersoft.yaml
@@ -24,3 +24,10 @@ releases:
       - template: default-env-values
       - template: ext-secret
       - template: ext-traefik-middleware
+  - name: vaultwardentest
+    chart: allangers-charts/vaultwarden
+    version: 2.2.0
+    namespace: applications
+    inherit:
+      - template: default-env-values
+      - template: default-env-secrets
diff --git a/installations/applications/helmfile.yaml b/installations/applications/helmfile.yaml
new file mode 100644
index 0000000..f2b930c
--- /dev/null
+++ b/installations/applications/helmfile.yaml
@@ -0,0 +1,6 @@
+bases:
+  - ../../common/environments.yaml
+  - ../../common/templates.yaml
+
+helmfiles:
+  - ./helmfile-{{ `{{ .Environment.Name }}` }}.yaml
diff --git a/values/badhouseplants/secrets.vaultwardentest.yaml b/values/etersoft/secrets.vaultwardentest.yaml
similarity index 100%
rename from values/badhouseplants/secrets.vaultwardentest.yaml
rename to values/etersoft/secrets.vaultwardentest.yaml
diff --git a/values/badhouseplants/values.vaultwardentest.yaml b/values/etersoft/values.vaultwardentest.yaml
similarity index 89%
rename from values/badhouseplants/values.vaultwardentest.yaml
rename to values/etersoft/values.vaultwardentest.yaml
index 0edc735..b55265d 100644
--- a/values/badhouseplants/values.vaultwardentest.yaml
+++ b/values/etersoft/values.vaultwardentest.yaml
@@ -1,4 +1,3 @@
----
 workload:
   kind: Deployment
   strategy:
@@ -31,8 +30,8 @@ ingress:
           paths:
             - backend:
                 service:
-                  name: '{{ include "chart.fullname" $ }}'
-                  port: 
+                  name: '{{ include "chart.fullname" $ }}-main'
+                  port:
                     number: 8080
               path: /
               pathType: Prefix
@@ -41,11 +40,15 @@ ingress:
           - vaulttest.badhouseplants.net
         secretName: vaulttest.badhouseplants.net
 extraVolumes:
-  # -- Because by default the fs is read-only, we need to add an emtpy dir volume
   logs:
     emptyDir: {}
 
-storage: {}
+storage:
+  data:
+    annotations:
+      volume.kubernetes.io/selected-node: yekaterinburg
+    accessModes:
+      - ReadWriteOnce
 env:
   environment:
     enabled: true