fix(bitwarden): upgrade chart and remove websockets

SocialGouv · Nov 10, 2023 · 77e1715 · 77e1715
1 parent 795e810
commit 77e1715
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 40 deletions.
diff --git a/charts/vaultwarden/USAGE.md b/charts/vaultwarden/USAGE.md
@@ -1,4 +1,3 @@
-
 # Vaultwarden
 
 [Vaultwarden](https://github.com/dani-garcia/vaultwarden), is an alternative implementation of the Bitwarden server API written in Rust and compatible with [upstream Bitwarden clients](https://bitwarden.com/download/).
@@ -240,9 +239,6 @@ helm -n $NAMESPACE uninstall $RELEASE_NAME
 | `image.pullPolicy`  | Vaultwarden image pull policy                 | `IfNotPresent`       |
 | `image.pullSecrets` | Specify docker-registry secret names          | `[]`                 |
 | `domain`            | Domain name where the application is accessed | `""`                 |
-| `websocket.enabled` | Enable websocket notifications                | `true`               |
-| `websocket.address` | Websocket listen address                      | `0.0.0.0`            |
-| `websocket.port`    | Websocket listen port                         | `3012`               |
 | `rocket.port`       | Rocket port                                   | `8080`               |
 | `rocket.workers`    | Rocket number of workers                      | `10`                 |
 | `webVaultEnabled`   | Enable Web Vault                              | `true`               |
@@ -285,7 +281,6 @@ helm -n $NAMESPACE uninstall $RELEASE_NAME
 | `ingress.tls`                     | Enable TLS on the ingress resource.                                            | `true`               |
 | `ingress.hostname`                | Hostname for the ingress.                                                      | `warden.contoso.com` |
 | `ingress.path`                    | Default application path for the ingress                                       | `/`                  |
-| `ingress.pathWs`                  | Path for the websocket ingress                                                 | `/notifications/hub` |
 | `ingress.pathType`                | Path type for the ingress                                                      | `Prefix`             |
 | `ingress.pathTypeWs`              | Path type for the ingress                                                      | `Exact`              |
 | `ingress.tlsSecret`               | Kubernetes secret containing the SSL certificate when using the "nginx" class. | `""`                 |

diff --git a/charts/vaultwarden/templates/configmap.yaml b/charts/vaultwarden/templates/configmap.yaml
@@ -21,11 +21,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
@@ -62,13 +62,4 @@ spec:
               name: {{ .Values.service.name }}
               port:
                 name: "http"
-        {{- if .Values.websocket.enabled }}
-        - path: {{ $ingress.pathWs }}
-          pathType: {{ $ingress.pathTypeWs }}
-          backend:
-            service:
-              name: {{ .Values.service.name }}
-              port:
-                name: "websocket"
-        {{- end }}
 {{- end }}
diff --git a/charts/vaultwarden/templates/service.yaml b/charts/vaultwarden/templates/service.yaml
@@ -22,9 +22,3 @@ spec:
       port: 80
       protocol: TCP
       targetPort: 8080
-    {{- if .Values.websocket.enabled }}
-    - name: "websocket"
-      port: 3012
-      protocol: TCP
-      targetPort: {{ .Values.websocket.port }}
-    {{- end }}
diff --git a/charts/vaultwarden/templates/statefulset.yaml b/charts/vaultwarden/templates/statefulset.yaml
@@ -108,9 +108,6 @@ spec:
             - containerPort: 8080
               name: http
               protocol: TCP
-            - containerPort: {{ .Values.websocket.port }}
-              name: websocket
-              protocol: TCP
           readinessProbe:
             httpGet:
               path: /alive

diff --git a/charts/vaultwarden/values.yaml b/charts/vaultwarden/values.yaml
@@ -11,7 +11,7 @@ image:
   ## @param image.tag Vaultwarden image tag
   ## Ref: https://hub.docker.com/r/vaultwarden/server/tags
   ##
-  tag: "1.29.2-alpine"
+  tag: "1.30.0-alpine"
   ## @param image.pullPolicy Vaultwarden image pull policy
   ## ref: https://kubernetes.io/docs/user-guide/images/#pre-pulling-images
   ##
@@ -27,14 +27,7 @@ image:
 ## Example: https://warden.contoso.com:8443
 ##
 domain: ""
-## @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.port Rocket port
 ## @param rocket.workers Rocket number of workers
 ##
@@ -160,9 +153,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/
   ##