From 3e71684c187729f8f7060c7c3bf865aadf769261 Mon Sep 17 00:00:00 2001
From: Drik Qlis <drikqlis@gmail.com>
Date: Fri, 15 Mar 2024 18:29:43 +0100
Subject: [PATCH] feat: remove deprecated websocket implementation

---
 charts/vaultwarden/Chart.yaml               |  2 +-
 charts/vaultwarden/templates/_podSpec.tpl   |  3 ---
 charts/vaultwarden/templates/configmap.yaml |  5 -----
 charts/vaultwarden/templates/ingress.yaml   | 19 -------------------
 charts/vaultwarden/templates/service.yaml   |  6 ------
 charts/vaultwarden/values.yaml              | 12 ------------
 6 files changed, 1 insertion(+), 46 deletions(-)

diff --git a/charts/vaultwarden/Chart.yaml b/charts/vaultwarden/Chart.yaml
index 4a5a3f6..d3d3729 100644
--- a/charts/vaultwarden/Chart.yaml
+++ b/charts/vaultwarden/Chart.yaml
@@ -9,7 +9,7 @@ sources:
   - https://github.com/guerzon/vaultwarden
   - https://github.com/dani-garcia/vaultwarden
 appVersion: "1.30.5"
-version: 0.22.20
+version: 0.22.21
 kubeVersion: ">=1.12.0-0"
 
 dependencies:
diff --git a/charts/vaultwarden/templates/_podSpec.tpl b/charts/vaultwarden/templates/_podSpec.tpl
index e83fd10..bae80e8 100644
--- a/charts/vaultwarden/templates/_podSpec.tpl
+++ b/charts/vaultwarden/templates/_podSpec.tpl
@@ -70,9 +70,6 @@ containers:
       - containerPort: 8080
         name: http
         protocol: TCP
-      - containerPort: {{ .Values.websocket.port }}
-        name: websocket
-        protocol: TCP
     {{- if or (.Values.data) (.Values.attachments) }}
     volumeMounts:
       {{- with .Values.data }}
diff --git a/charts/vaultwarden/templates/configmap.yaml b/charts/vaultwarden/templates/configmap.yaml
index 9b25ccd..9f67f5e 100644
--- a/charts/vaultwarden/templates/configmap.yaml
+++ b/charts/vaultwarden/templates/configmap.yaml
@@ -25,11 +25,6 @@ data:
   SMTP_ACCEPT_INVALID_HOSTNAMES: {{ .Values.smtp.acceptInvalidHostnames | quote }}
   SMTP_ACCEPT_INVALID_CERTS: {{ .Values.smtp.acceptInvalidCerts | quote }}
   {{- end }}
-  {{- if .Values.websocket.enabled }}
-  WEBSOCKET_ENABLED: "true"
-  WEBSOCKET_ADDRESS: {{ .Values.websocket.address | quote }}
-  WEBSOCKET_PORT: {{ .Values.websocket.port | quote }}
-  {{- end }}
   {{- if .Values.data }}
   DATA_FOLDER: {{ default "/data" .Values.data.path | quote }}
   {{- end }}
diff --git a/charts/vaultwarden/templates/ingress.yaml b/charts/vaultwarden/templates/ingress.yaml
index 9325790..b8e28f0 100644
--- a/charts/vaultwarden/templates/ingress.yaml
+++ b/charts/vaultwarden/templates/ingress.yaml
@@ -1,5 +1,4 @@
 {{- $ingress := .Values.ingress -}}
-{{- $websocket := .Values.websocket -}}
 {{- $fullname := .Release.fullname -}}
 {{- if $ingress.enabled }}
 {{- $newAPIversion := .Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
@@ -68,15 +67,6 @@ spec:
               name: {{ include "vaultwarden.fullname" $ }}
               port:
                 name: "http"
-        {{- if $websocket.enabled }}
-        - path: {{ $ingress.pathWs }}
-          pathType: {{ $ingress.pathTypeWs }}
-          backend:
-            service:
-              name: {{ include "vaultwarden.fullname" $ }}
-              port:
-                name: "websocket"
-        {{- end }}
     {{- end }}
     - host: {{ $ingress.hostname | quote }}
       http:
@@ -88,13 +78,4 @@ spec:
               name: {{ include "vaultwarden.fullname" . }}
               port:
                 name: "http"
-        {{- if $websocket.enabled }}
-        - path: {{ $ingress.pathWs }}
-          pathType: {{ $ingress.pathTypeWs }}
-          backend:
-            service:
-              name: {{ include "vaultwarden.fullname" . }}
-              port:
-                name: "websocket"
-        {{- end }}
 {{- end }}
diff --git a/charts/vaultwarden/templates/service.yaml b/charts/vaultwarden/templates/service.yaml
index 9f6511a..b10ebe7 100644
--- a/charts/vaultwarden/templates/service.yaml
+++ b/charts/vaultwarden/templates/service.yaml
@@ -22,12 +22,6 @@ spec:
       port: 80
       protocol: TCP
       targetPort: 8080
-    {{- if .Values.websocket.enabled }}
-    - name: "websocket"
-      port: 3012
-      protocol: TCP
-      targetPort: {{ .Values.websocket.port }}
-    {{- end }}
 {{- if .Values.service.ipFamilyPolicy }}
   ipFamilyPolicy: {{ .Values.service.ipFamilyPolicy }}
 {{- end }}
diff --git a/charts/vaultwarden/values.yaml b/charts/vaultwarden/values.yaml
index 834de80..3c9405d 100644
--- a/charts/vaultwarden/values.yaml
+++ b/charts/vaultwarden/values.yaml
@@ -581,15 +581,6 @@ smtp:
 ## @section Exposure settings
 ##
 
-## @param websocket.enabled Enable websocket notifications
-## @param websocket.address Websocket listen address
-## @param websocket.port Websocket listen port
-##
-websocket:
-  enabled: true
-  address: "0.0.0.0"
-  port: 3012
-
 ## @param rocket.address Address to bind to
 ## @param rocket.port Rocket port
 ## @param rocket.workers Rocket number of workers
@@ -646,9 +637,6 @@ ingress:
   ## @param ingress.path Default application path for the ingress
   ##
   path: "/"
-  ## @param ingress.pathWs Path for the websocket ingress
-  ##
-  pathWs: "/notifications/hub"
   ## @param ingress.pathType Path type for the ingress
   ## Ref: https://kubernetes.io/docs/concepts/services-networking/ingress/
   ##