From 82b4b1cdcaea73587f47beea2983d662675c6bdd Mon Sep 17 00:00:00 2001
From: Gabe Cook <gabe565@gmail.com>
Date: Fri, 28 Jul 2023 17:30:43 -0500
Subject: [PATCH] :fire: (vaultwarden): Remove dedicated WebSocket port

---
 charts/vaultwarden/Chart.yaml            | 4 ++--
 charts/vaultwarden/templates/common.yaml | 4 +++-
 charts/vaultwarden/values.yaml           | 9 +--------
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/charts/vaultwarden/Chart.yaml b/charts/vaultwarden/Chart.yaml
index d5c4e14a3..2935ea7d4 100644
--- a/charts/vaultwarden/Chart.yaml
+++ b/charts/vaultwarden/Chart.yaml
@@ -28,8 +28,8 @@ dependencies:
     condition: postgresql.enabled
 annotations:
   artifacthub.io/changes: |-
-    - kind: changed
-      description: Update ghcr.io/dani-garcia/vaultwarden Docker tag to v1.29.1
+    - kind: removed
+      description: BREAKING - Remove dedicated WebSocket port
   artifacthub.io/links: |-
     - name: App Source
       url: https://github.com/dani-garcia/vaultwarden
diff --git a/charts/vaultwarden/templates/common.yaml b/charts/vaultwarden/templates/common.yaml
index 280e8a620..38b6248d7 100644
--- a/charts/vaultwarden/templates/common.yaml
+++ b/charts/vaultwarden/templates/common.yaml
@@ -10,9 +10,11 @@ env:
   ROCKET_PORT: {{ quote .Values.service.main.ports.http.port }}
 
   {{- with .Values.service.main.ports.websocket }}
-  WEBSOCKET_ENABLED: {{ default .enabled "true" | quote }}
+  WEBSOCKET_ENABLED: {{ quote .enabled }}
+  {{- if .enabled }}
   WEBSOCKET_PORT: {{ quote .port }}
   {{- end }}
+  {{- end }}
 
   {{- if .Values.postgresql.enabled }}
   {{- with .Values.postgresql }}
diff --git a/charts/vaultwarden/values.yaml b/charts/vaultwarden/values.yaml
index 9b3e861e8..8ef8a1e5e 100644
--- a/charts/vaultwarden/values.yaml
+++ b/charts/vaultwarden/values.yaml
@@ -33,6 +33,7 @@ service:
       http:
         port: 80
       websocket:
+        enabled: false
         port: 3012
 
 ingress:
@@ -47,14 +48,6 @@ ingress:
     #         pathType: Prefix
     #         service:
     #           port: 80
-    #       - path: /notifications/hub/negotiate
-    #         pathType: Prefix
-    #         service:
-    #           port: 80
-    #       - path: /notifications/hub
-    #         pathType: Prefix
-    #         service:
-    #           port: 3012
 
 persistence:
   # -- Configure persistence settings for the chart under this key.