From 168a76782a04cd1c7a4ef015b0aed97c68c8fa94 Mon Sep 17 00:00:00 2001
From: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
Date: Mon, 12 Feb 2024 13:07:56 +0200
Subject: [PATCH] fix collabora upgrade (#2152)

* fix collabora upgrade

* add no-auth values test

* allow empty pass in regex

* restore the required
---
 library/ix-dev/charts/collabora/Chart.yaml      |  2 +-
 .../charts/collabora/ci/noauth-values.yaml      | 17 +++++++++++++++++
 library/ix-dev/charts/collabora/questions.yaml  |  4 ++--
 3 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 library/ix-dev/charts/collabora/ci/noauth-values.yaml

diff --git a/library/ix-dev/charts/collabora/Chart.yaml b/library/ix-dev/charts/collabora/Chart.yaml
index 18eef91e0b..80c7d85e6c 100644
--- a/library/ix-dev/charts/collabora/Chart.yaml
+++ b/library/ix-dev/charts/collabora/Chart.yaml
@@ -4,7 +4,7 @@ description: Collabora is a collaborative online office suite based on LibreOffi
 annotations:
   title: Collabora
 type: application
-version: 2.0.3
+version: 2.0.4
 apiVersion: v2
 appVersion: 23.05.8.4.1
 kubeVersion: '>=1.16.0-0'
diff --git a/library/ix-dev/charts/collabora/ci/noauth-values.yaml b/library/ix-dev/charts/collabora/ci/noauth-values.yaml
new file mode 100644
index 0000000000..d7ee3ff9cd
--- /dev/null
+++ b/library/ix-dev/charts/collabora/ci/noauth-values.yaml
@@ -0,0 +1,17 @@
+collaboraConfig:
+  enableWebUI: false
+  username: ''
+  password: ''
+  dictionaries:
+    - en_GB
+    - en_US
+  aliasGroup1:
+    - nc.example.com
+    - other-nc.example.com
+  serverName: collabora.example.com:9980
+  extraParams:
+    - --o:welcome.enable=false
+    - --o:user_interface.mode=notebookbar
+    - --o:ssl.termination=true
+    - --o:ssl.enable=false
+    - --o:net.proto=IPv4
diff --git a/library/ix-dev/charts/collabora/questions.yaml b/library/ix-dev/charts/collabora/questions.yaml
index f0727f41a9..05d4cb0c3b 100644
--- a/library/ix-dev/charts/collabora/questions.yaml
+++ b/library/ix-dev/charts/collabora/questions.yaml
@@ -49,9 +49,9 @@ questions:
           label: Username for WebUI
           schema:
             type: string
+            required: true
             show_if: [[enableWebUI, "=", true]]
             default: ""
-            required: true
         - variable: password
           label: Password for WebUI
           schema:
@@ -60,7 +60,7 @@ questions:
             private: true
             required: true
             show_if: [[enableWebUI, "=", true]]
-            valid_chars: "[a-zA-Z0-9!@#%^&*?]{8,}"
+            valid_chars: "^[a-zA-Z0-9!@#%^&*?]{8,}$|^$"
             valid_chars_error: |
               Password must be at least 8 characters long and contain at least one of the following:</br>
               - Uppercase letter</br>