From 7c6123d2782b9cd6aeb3edeaa6519eda87193364 Mon Sep 17 00:00:00 2001
From: sonicaj <waqarsonic1@gmail.com>
Date: Mon, 25 Sep 2023 12:42:49 +0000
Subject: [PATCH] Publish new changes in catalog

---
 charts/collabora/{1.2.16 => 1.2.17}/.helmignore     |   0
 charts/collabora/{1.2.16 => 1.2.17}/Chart.lock      |   0
 charts/collabora/{1.2.16 => 1.2.17}/Chart.yaml      |   2 +-
 charts/collabora/{1.2.16 => 1.2.17}/README.md       |   0
 charts/collabora/{1.2.16 => 1.2.17}/app-readme.md   |   0
 .../{1.2.16 => 1.2.17}/charts/common-2304.0.1.tgz   | Bin
 .../{1.2.16 => 1.2.17}/ci/http-values.yaml          |   0
 .../{1.2.16 => 1.2.17}/ci/https-values.yaml         |   2 +-
 charts/collabora/{1.2.16 => 1.2.17}/ix_values.yaml  |   0
 charts/collabora/{1.2.16 => 1.2.17}/metadata.yaml   |   0
 charts/collabora/{1.2.16 => 1.2.17}/questions.yaml  |   5 ++++-
 .../{1.2.16 => 1.2.17}/templates/_helpers.tpl       |   0
 .../{1.2.16 => 1.2.17}/templates/deployment.yaml    |   6 +++++-
 .../{1.2.16 => 1.2.17}/templates/nginx-conf.yaml    |   0
 .../{1.2.16 => 1.2.17}/templates/secrets.yaml       |   0
 .../{1.2.16 => 1.2.17}/templates/service.yaml       |   0
 16 files changed, 11 insertions(+), 4 deletions(-)
 rename charts/collabora/{1.2.16 => 1.2.17}/.helmignore (100%)
 rename charts/collabora/{1.2.16 => 1.2.17}/Chart.lock (100%)
 rename charts/collabora/{1.2.16 => 1.2.17}/Chart.yaml (97%)
 rename charts/collabora/{1.2.16 => 1.2.17}/README.md (100%)
 rename charts/collabora/{1.2.16 => 1.2.17}/app-readme.md (100%)
 rename charts/collabora/{1.2.16 => 1.2.17}/charts/common-2304.0.1.tgz (100%)
 rename charts/collabora/{1.2.16 => 1.2.17}/ci/http-values.yaml (100%)
 rename charts/collabora/{1.2.16 => 1.2.17}/ci/https-values.yaml (99%)
 rename charts/collabora/{1.2.16 => 1.2.17}/ix_values.yaml (100%)
 rename charts/collabora/{1.2.16 => 1.2.17}/metadata.yaml (100%)
 rename charts/collabora/{1.2.16 => 1.2.17}/questions.yaml (93%)
 rename charts/collabora/{1.2.16 => 1.2.17}/templates/_helpers.tpl (100%)
 rename charts/collabora/{1.2.16 => 1.2.17}/templates/deployment.yaml (93%)
 rename charts/collabora/{1.2.16 => 1.2.17}/templates/nginx-conf.yaml (100%)
 rename charts/collabora/{1.2.16 => 1.2.17}/templates/secrets.yaml (100%)
 rename charts/collabora/{1.2.16 => 1.2.17}/templates/service.yaml (100%)

diff --git a/charts/collabora/1.2.16/.helmignore b/charts/collabora/1.2.17/.helmignore
similarity index 100%
rename from charts/collabora/1.2.16/.helmignore
rename to charts/collabora/1.2.17/.helmignore
diff --git a/charts/collabora/1.2.16/Chart.lock b/charts/collabora/1.2.17/Chart.lock
similarity index 100%
rename from charts/collabora/1.2.16/Chart.lock
rename to charts/collabora/1.2.17/Chart.lock
diff --git a/charts/collabora/1.2.16/Chart.yaml b/charts/collabora/1.2.17/Chart.yaml
similarity index 97%
rename from charts/collabora/1.2.16/Chart.yaml
rename to charts/collabora/1.2.17/Chart.yaml
index aa41813de1..ac8e3f9e53 100644
--- a/charts/collabora/1.2.16/Chart.yaml
+++ b/charts/collabora/1.2.17/Chart.yaml
@@ -5,7 +5,7 @@ description: |
 annotations:
   title: Collabora
 type: application
-version: 1.2.16
+version: 1.2.17
 apiVersion: v2
 appVersion: 23.05.4.2.1
 kubeVersion: '>=1.16.0-0'
diff --git a/charts/collabora/1.2.16/README.md b/charts/collabora/1.2.17/README.md
similarity index 100%
rename from charts/collabora/1.2.16/README.md
rename to charts/collabora/1.2.17/README.md
diff --git a/charts/collabora/1.2.16/app-readme.md b/charts/collabora/1.2.17/app-readme.md
similarity index 100%
rename from charts/collabora/1.2.16/app-readme.md
rename to charts/collabora/1.2.17/app-readme.md
diff --git a/charts/collabora/1.2.16/charts/common-2304.0.1.tgz b/charts/collabora/1.2.17/charts/common-2304.0.1.tgz
similarity index 100%
rename from charts/collabora/1.2.16/charts/common-2304.0.1.tgz
rename to charts/collabora/1.2.17/charts/common-2304.0.1.tgz
diff --git a/charts/collabora/1.2.16/ci/http-values.yaml b/charts/collabora/1.2.17/ci/http-values.yaml
similarity index 100%
rename from charts/collabora/1.2.16/ci/http-values.yaml
rename to charts/collabora/1.2.17/ci/http-values.yaml
diff --git a/charts/collabora/1.2.16/ci/https-values.yaml b/charts/collabora/1.2.17/ci/https-values.yaml
similarity index 99%
rename from charts/collabora/1.2.16/ci/https-values.yaml
rename to charts/collabora/1.2.17/ci/https-values.yaml
index c568272d68..82a3723eef 100644
--- a/charts/collabora/1.2.16/ci/https-values.yaml
+++ b/charts/collabora/1.2.17/ci/https-values.yaml
@@ -7,7 +7,7 @@ config:
   extra_params: --o:welcome.enable=false --o:user_interface.mode=notebookbar --o:ssl.termination=true
     --o:ssl.enable=false --o:net.proto=IPv4 --o:net.post_allow.host[0]=.+ --o:storage.wopi.host[0]=.+
   password: changeme
-  server_name: ssh.sonicaj.com:49980
+  server_name: ssh.sonicaj.com
   timezone: Asia/Karachi
   username: admin
 ixChartContext:
diff --git a/charts/collabora/1.2.16/ix_values.yaml b/charts/collabora/1.2.17/ix_values.yaml
similarity index 100%
rename from charts/collabora/1.2.16/ix_values.yaml
rename to charts/collabora/1.2.17/ix_values.yaml
diff --git a/charts/collabora/1.2.16/metadata.yaml b/charts/collabora/1.2.17/metadata.yaml
similarity index 100%
rename from charts/collabora/1.2.16/metadata.yaml
rename to charts/collabora/1.2.17/metadata.yaml
diff --git a/charts/collabora/1.2.16/questions.yaml b/charts/collabora/1.2.17/questions.yaml
similarity index 93%
rename from charts/collabora/1.2.16/questions.yaml
rename to charts/collabora/1.2.17/questions.yaml
index 696f138169..5dbc3cd147 100644
--- a/charts/collabora/1.2.16/questions.yaml
+++ b/charts/collabora/1.2.17/questions.yaml
@@ -64,7 +64,10 @@ questions:
             default: "--o:welcome.enable=false --o:user_interface.mode=notebookbar --o:ssl.termination=true --o:ssl.enable=false --o:net.proto=IPv4 --o:net.post_allow.host[0]=.+ --o:storage.wopi.host[0]=.+"
         - variable: server_name
           label: "Server Name"
-          description: "When this environment variable is set (is not “”), then its value will be used as server name in /etc/loolwsd/loolwsd.xml. Without this, CODE is not delivering a correct host for the websocket connection in case of a proxy in front of it."
+          description: |
+            When this environment variable is set (is not “”), then its value will be used as server name in /etc/loolwsd/loolwsd.xml.
+            Without this, CODE is not delivering a correct host for the websocket connection in case of a proxy in front of it.</br>
+            If a port is not specified, the below configured Node Port will be used.
           schema:
             type: string
             $ref:
diff --git a/charts/collabora/1.2.16/templates/_helpers.tpl b/charts/collabora/1.2.17/templates/_helpers.tpl
similarity index 100%
rename from charts/collabora/1.2.16/templates/_helpers.tpl
rename to charts/collabora/1.2.17/templates/_helpers.tpl
diff --git a/charts/collabora/1.2.16/templates/deployment.yaml b/charts/collabora/1.2.17/templates/deployment.yaml
similarity index 93%
rename from charts/collabora/1.2.16/templates/deployment.yaml
rename to charts/collabora/1.2.17/templates/deployment.yaml
index 1334c4c32b..8aba01f092 100644
--- a/charts/collabora/1.2.16/templates/deployment.yaml
+++ b/charts/collabora/1.2.17/templates/deployment.yaml
@@ -117,7 +117,11 @@ spec:
           {{ $envList = mustAppend $envList (dict "name" "dictionaries" "value" $envConfig.dictionaries) }}
           {{ $envList = mustAppend $envList (dict "name" "extra_params" "value" $envConfig.extra_params) }}
           {{ $envList = mustAppend $envList (dict "name" "DONT_GEN_SSL_CERT" "value" "true") }}
-          {{ $envList = mustAppend $envList (dict "name" "server_name" "value" (printf "%v:%v" $envConfig.server_name .Values.nodePort)) }}
+          {{ if not (contains ":" $envConfig.server_name) }}
+            {{ $envList = mustAppend $envList (dict "name" "server_name" "value" (printf "%v:%v" $envConfig.server_name .Values.nodePort)) }}
+          {{ else }}
+            {{ $envList = mustAppend $envList (dict "name" "server_name" "value" (printf "%v" $envConfig.server_name)) }}
+          {{ end }}
           {{ $envList = mustAppend $envList (dict "name" "username" "valueFromSecret" true "secretName" $secretName "secretKey" "username") }}
           {{ $envList = mustAppend $envList (dict "name" "password" "valueFromSecret" true "secretName" $secretName "secretKey" "password") }}
           {{ include "common.containers.allEnvironmentVariables" (dict "environmentVariables" $envList) | nindent 10 }}
diff --git a/charts/collabora/1.2.16/templates/nginx-conf.yaml b/charts/collabora/1.2.17/templates/nginx-conf.yaml
similarity index 100%
rename from charts/collabora/1.2.16/templates/nginx-conf.yaml
rename to charts/collabora/1.2.17/templates/nginx-conf.yaml
diff --git a/charts/collabora/1.2.16/templates/secrets.yaml b/charts/collabora/1.2.17/templates/secrets.yaml
similarity index 100%
rename from charts/collabora/1.2.16/templates/secrets.yaml
rename to charts/collabora/1.2.17/templates/secrets.yaml
diff --git a/charts/collabora/1.2.16/templates/service.yaml b/charts/collabora/1.2.17/templates/service.yaml
similarity index 100%
rename from charts/collabora/1.2.16/templates/service.yaml
rename to charts/collabora/1.2.17/templates/service.yaml