From d3cd4f90c58beb5db86e84fe776d6c1887904a47 Mon Sep 17 00:00:00 2001
From: Scott Sorell <scott.sorell@gmail.com>
Date: Fri, 9 Oct 2026 10:12:28 -0600
Subject: [PATCH] Fix Helm application deployment configuration

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../01-infrastructure-appset.yaml             |  2 +-
 infrastructure/cilium/Chart.lock              |  6 ++
 infrastructure/longhorn/Chart.lock            |  6 ++
 .../vaultwarden/templates/deployment.yaml     |  5 +-
 services/vaultwarden/values.schema.json       | 69 +++++++++++++++++++
 services/vaultwarden/values.yaml              |  6 +-
 6 files changed, 89 insertions(+), 5 deletions(-)
 create mode 100644 infrastructure/cilium/Chart.lock
 create mode 100644 infrastructure/longhorn/Chart.lock
 create mode 100644 services/vaultwarden/values.schema.json

diff --git a/bootstrap/applicationsets/01-infrastructure-appset.yaml b/bootstrap/applicationsets/01-infrastructure-appset.yaml
index 36f3880..44bd851 100644
--- a/bootstrap/applicationsets/01-infrastructure-appset.yaml
+++ b/bootstrap/applicationsets/01-infrastructure-appset.yaml
@@ -29,7 +29,7 @@ spec:
           releaseName: '{{.path.basename}}'
       destination:
         server: https://kubernetes.default.svc
-        namespace: '{{.path.basename}}'
+        namespace: '{{if eq .path.basename "longhorn"}}longhorn-system{{else}}{{.path.basename}}{{end}}'
       syncPolicy:
         automated:
           prune: true
diff --git a/infrastructure/cilium/Chart.lock b/infrastructure/cilium/Chart.lock
new file mode 100644
index 0000000..54209fe
--- /dev/null
+++ b/infrastructure/cilium/Chart.lock
@@ -0,0 +1,6 @@
+dependencies:
+- name: cilium
+  repository: https://helm.cilium.io/
+  version: 1.17.6
+digest: sha256:9fd2d9c5f39653d8aa8480cd4981b5ba9a15be8b8b3f2345ab3fc41d4f153ead
+generated: "2026-10-09T10:03:54.889590052-06:00"
diff --git a/infrastructure/longhorn/Chart.lock b/infrastructure/longhorn/Chart.lock
new file mode 100644
index 0000000..f9ba95c
--- /dev/null
+++ b/infrastructure/longhorn/Chart.lock
@@ -0,0 +1,6 @@
+dependencies:
+- name: longhorn
+  repository: https://charts.longhorn.io
+  version: 1.8.1
+digest: sha256:30efb7d38008c18b9f8f7bdaab0f176cf21a5098919527171b5f5573b657e9a7
+generated: "2026-10-09T10:03:54.900940149-06:00"
diff --git a/services/vaultwarden/templates/deployment.yaml b/services/vaultwarden/templates/deployment.yaml
index 42f0f67..91c1a59 100644
--- a/services/vaultwarden/templates/deployment.yaml
+++ b/services/vaultwarden/templates/deployment.yaml
@@ -23,7 +23,10 @@ spec:
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: http
-              containerPort: 80
+              containerPort: {{ .Values.service.port }}
+          env:
+            - name: ROCKET_PORT
+              value: {{ .Values.service.port | quote }}
           envFrom:
             - secretRef:
                 name: {{ .Values.existingSecret }}
diff --git a/services/vaultwarden/values.schema.json b/services/vaultwarden/values.schema.json
new file mode 100644
index 0000000..1335f7c
--- /dev/null
+++ b/services/vaultwarden/values.schema.json
@@ -0,0 +1,69 @@
+{
+  "$schema": "https://json-schema.org/draft-07/schema#",
+  "type": "object",
+  "properties": {
+    "nameOverride": {
+      "type": "string"
+    },
+    "image": {
+      "type": "object",
+      "properties": {
+        "repository": {
+          "type": "string",
+          "minLength": 1
+        },
+        "tag": {
+          "type": "string",
+          "minLength": 1
+        },
+        "pullPolicy": {
+          "type": "string",
+          "enum": ["Always", "IfNotPresent", "Never"]
+        }
+      },
+      "required": ["repository", "tag", "pullPolicy"],
+      "additionalProperties": false
+    },
+    "replicaCount": {
+      "type": "integer",
+      "minimum": 1
+    },
+    "service": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": ["ClusterIP", "NodePort", "LoadBalancer"]
+        },
+        "port": {
+          "type": "integer",
+          "minimum": 1,
+          "maximum": 65535
+        }
+      },
+      "required": ["type", "port"],
+      "additionalProperties": false
+    },
+    "persistence": {
+      "type": "object",
+      "properties": {
+        "size": {
+          "type": "string",
+          "minLength": 1
+        },
+        "storageClass": {
+          "type": "string",
+          "minLength": 1
+        }
+      },
+      "required": ["size", "storageClass"],
+      "additionalProperties": false
+    },
+    "existingSecret": {
+      "type": "string",
+      "minLength": 1
+    }
+  },
+  "required": ["image", "replicaCount", "service", "persistence", "existingSecret"],
+  "additionalProperties": false
+}
diff --git a/services/vaultwarden/values.yaml b/services/vaultwarden/values.yaml
index 94b593e..4e0a944 100644
--- a/services/vaultwarden/values.yaml
+++ b/services/vaultwarden/values.yaml
@@ -1,13 +1,13 @@
 image:
-  repository: vaultwarden/server
-  tag: 1.33.2
+  repository: ghcr.io/dani-garcia/vaultwarden
+  tag: 1.33.2-alpine
   pullPolicy: IfNotPresent
 
 replicaCount: 1
 
 service:
   type: ClusterIP
-  port: 80
+  port: 8080
 
 persistence:
   size: 5Gi