deployments/bitwarden/namespace.yaml

@@ -1,7 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: security
-  labels:
-    app.kubernetes.io/name: bitwarden
-    app.kubernetes.io/managed-by: orion

deployments/security/bitwarden/deployment.yaml

@@ -21,19 +21,17 @@ spec:
           ports:
             - containerPort: 80
           env:
-            - name: WEBSOCKET_ENABLED
+            - name: BW_ADMIN_DOMAIN
+              value: bitwarden.khalisio.com
+            - name: WEBSOCKETS_ENABLED
               value: "true"
             - name: SIGNUPS_ALLOWED
               value: "true"
-            - name: ADMIN_TOKEN
+            - name: DOMAIN
-              valueFrom:
+              value: https://bitwarden.khalisio.com
-                secretKeyRef:
+          envFrom:
-                  name: bitwarden-secret
+            - secretRef:
-                  key: admin-token
+                name: bitwarden-secret
-            - name: DB_CERT_FORMAT
-              value: "pem"
-            - name: SIGNUP_ORIGINS
-              value: "https://bitwarden.khalisio.com"
           volumeMounts:
             - name: bitwarden-data
               mountPath: /data

deployments/security/bitwarden/ingress.yaml

@@ -4,18 +4,15 @@ metadata:
   name: bitwarden
   namespace: security
   annotations:
-    kubernetes.io/ingress.class: traefik
+    cert-manager.io/cluster-issuer: letsencrypt-prod
 spec:
   entryPoints:
     - websecure
+  tls:
+    secretName: bitwarden-tls
   routes:
     - match: Host(`bitwarden.khalisio.com`)
       kind: Rule
       services:
         - name: bitwarden
           port: 80
-  tls:
-    secretName: bitwarden-tls
-    options:
-      name: default
-      kind: ClusterEntrypoint

deployments/security/bitwarden/service.yaml

@@ -3,13 +3,11 @@ kind: Service
 metadata:
   name: bitwarden
   namespace: security
-  labels:
-    app: bitwarden
 spec:
-  type: ClusterIP
-  ports:
-    - port: 80
-      targetPort: 80
-      protocol: TCP
   selector:
     app: bitwarden
+  ports:
+    - name: http
+      port: 80
+      targetPort: 80
+  type: ClusterIP

deployments/security/namespace.yaml

@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: security
+  labels:
+    name: security