From 49a4adb22a48f73499d451b1311f1f7400d247ae Mon Sep 17 00:00:00 2001
From: Xstar97 <Xstar97@users.noreply.github.com>
Date: Sun, 20 Nov 2022 09:25:59 -0500
Subject: [PATCH] fix(rcon-webadmin) wss +ws variables (#4384)

* wip fix(rcon-webadmin) wss +ws variables

* update persistence

* modify persisence mountpath

* fix persistence

* update chart and version

* set persistence to db

* envs

* Update charts/stable/rcon-webadmin/values.yaml

Signed-off-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com>

* bump

Signed-off-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
Co-authored-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
---
 charts/stable/rcon-webadmin/Chart.yaml     |  4 ++--
 charts/stable/rcon-webadmin/questions.yaml | 12 ++++++++++++
 charts/stable/rcon-webadmin/values.yaml    | 15 +++++++--------
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/charts/stable/rcon-webadmin/Chart.yaml b/charts/stable/rcon-webadmin/Chart.yaml
index bdcba3a6324..59ed10a6395 100644
--- a/charts/stable/rcon-webadmin/Chart.yaml
+++ b/charts/stable/rcon-webadmin/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: "latest"
+appVersion: "0.14.1"
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
@@ -23,7 +23,7 @@ sources:
   - https://github.com/rcon-web-admin/rcon-web-admin
   - https://hub.docker.com/r/itzg/rcon/
 type: application
-version: 3.0.1
+version: 3.0.2
 annotations:
   truecharts.org/SCALE-support: "true"
   truecharts.org/grade: U
diff --git a/charts/stable/rcon-webadmin/questions.yaml b/charts/stable/rcon-webadmin/questions.yaml
index a03f7dd60dc..d51e71de097 100644
--- a/charts/stable/rcon-webadmin/questions.yaml
+++ b/charts/stable/rcon-webadmin/questions.yaml
@@ -91,6 +91,18 @@ questions:
           schema:
             type: int
             default: 25575
+        - variable: rwa_websocket_url_ssl
+          label: RWA WEBSOCKET URL SSL
+          description: SSL WebSocket URL
+          schema:
+            type: string
+            default: ""
+        - variable: rwa_websocket_url
+          label: RWA WEBSOCKET URL
+          description: WebSocket URL
+          schema:
+            type: string
+            default: ""
         - variable: rwa_restrict_commands
           label: RWA RESTRICT COMMANDS
           description: Prevent the initial user user executing these commands
diff --git a/charts/stable/rcon-webadmin/values.yaml b/charts/stable/rcon-webadmin/values.yaml
index ecec025afd4..e814fbe39ce 100644
--- a/charts/stable/rcon-webadmin/values.yaml
+++ b/charts/stable/rcon-webadmin/values.yaml
@@ -1,7 +1,7 @@
 image:
   pullPolicy: IfNotPresent
   repository: tccr.io/truecharts/rcon-webadmin
-  tag: latest@sha256:2c1a5d92a3b8d30b2c3957eeb34b93910a8991fc886647f24438e57f73451f90
+  tag: 0.14.1@sha256:2c1a5d92a3b8d30b2c3957eeb34b93910a8991fc886647f24438e57f73451f90
 
 podSecurityContext:
   runAsGroup: 0
@@ -25,12 +25,10 @@ rcon:
   rwa_server_name: minecraft
   rwa_rcon_host: ""
   rwa_rcon_port: 25575
-  rwa_restrict_commands:
-    - command1
-    - command2
-  rwa_restrict_widgets:
-    - widget1
-    - widget2
+  rwa_websocket_url_ssl: ""
+  rwa_websocket_url: ""
+  rwa_restrict_commands: []
+  rwa_restrict_widgets: []
 
 env:
   RWA_ADMIN: '{{ ternary "TRUE" "FALSE" .Values.rcon.rwa_admin }}'
@@ -43,7 +41,8 @@ env:
   RWA_RCON_PORT: "{{ .Values.rcon.rwa_rcon_port }}"
   RWA_RESTRICT_COMMANDS: '{{ join "," .Values.rcon.rwa_restrict_commands }}'
   RWA_RESTRICT_WIDGETS: '{{ join "," .Values.rcon.rwa_restrict_widgets }}'
-
+  RWA_WEBSOCKET_URL_SSL: "{{ .Values.rcon.rwa_websocket_url_ssl }}"
+  RWA_WEBSOCKET_URL: "{{ .Values.rcon.rwa_websocket_url }}"
 service:
   main:
     ports: