From e95ade48d7ec1e75362d1f289b35490b0f4e1bea Mon Sep 17 00:00:00 2001
From: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
Date: Wed, 23 Feb 2022 09:44:07 +0200
Subject: [PATCH] fix(pydio-cells): fix configmap and main service (#1943)

* fix(pydio-cells): fix configmap and main service

* update questions and configmap
---
 charts/stable/pydio-cells/Chart.yaml          |  2 +-
 charts/stable/pydio-cells/questions.yaml      |  4 ++--
 .../pydio-cells/templates/_configmap.tpl      | 19 ++++++++++---------
 charts/stable/pydio-cells/values.yaml         |  1 +
 docs/manual/default-ports.md                  |  2 +-
 5 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/charts/stable/pydio-cells/Chart.yaml b/charts/stable/pydio-cells/Chart.yaml
index 38cf7c3fccf..536600f2b1b 100644
--- a/charts/stable/pydio-cells/Chart.yaml
+++ b/charts/stable/pydio-cells/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 kubeVersion: ">=1.16.0-0"
 name: pydio-cells
-version: 1.0.2
+version: 1.0.3
 appVersion: "3.0.4"
 description: Pydio-cells is the nextgen file sharing platform for organizations.
 type: application
diff --git a/charts/stable/pydio-cells/questions.yaml b/charts/stable/pydio-cells/questions.yaml
index ef0188c43b9..1c555f38adf 100644
--- a/charts/stable/pydio-cells/questions.yaml
+++ b/charts/stable/pydio-cells/questions.yaml
@@ -111,7 +111,7 @@ questions:
             type: string
             required: true
             default: ""
-        - variable: title
+        - variable: password
           label: "Cells Admin Password (First install only)"
           description: "Cells Admin Password"
           schema:
@@ -163,7 +163,7 @@ questions:
                                   label: "Port Type"
                                   schema:
                                     type: string
-                                    default: "HTTP"
+                                    default: "HTTPS"
                                     enum:
                                       - value: HTTP
                                         description: "HTTP"
diff --git a/charts/stable/pydio-cells/templates/_configmap.tpl b/charts/stable/pydio-cells/templates/_configmap.tpl
index dc541c11cf0..fe2feae8354 100644
--- a/charts/stable/pydio-cells/templates/_configmap.tpl
+++ b/charts/stable/pydio-cells/templates/_configmap.tpl
@@ -9,13 +9,14 @@ metadata:
 data:
   pydiocells-install: |-
     frontendapplicationtitle: {{ .Values.pydioinstall.title }}
-    frontendLogin: {{ .Values.pydioinstall.username }}
-    frontendPassword: {{ .Values.pydioinstall.password }}
-    frontendRepeatPassword: {{ .Values.pydioinstall.password }}
-    dbConnectionType: tcp
-    dbTCPHostname: {{ printf "%v-%v" .Release.Name "mariadb" }}
-    dbTCPPort: 3306
-    dbTCPName: {{ .Values.mariadb.mariadbDatabase }}
-    dbTCPUser: {{ .Values.mariadb.mariadbUsername }}
-    dbTCPPassword: {{ .Values.mariadb.mariadbPassword | trimAll "\"" }}
+    frontendlogin: {{ .Values.pydioinstall.username }}
+    frontendpassword: {{ .Values.pydioinstall.password }}
+    frontendrepeatpassword: {{ .Values.pydioinstall.password }}
+    dbconnectiontype: tcp
+    dbtcphostname: {{ printf "%v-%v" .Release.Name "mariadb" }}
+    dbtcpport: 3306
+    dbtcpname: {{ .Values.mariadb.mariadbDatabase }}
+    dbtcpuser: {{ .Values.mariadb.mariadbUsername }}
+    dbtcppassword: {{ .Values.mariadb.mariadbPassword | trimAll "\"" }}
+
 {{- end -}}
diff --git a/charts/stable/pydio-cells/values.yaml b/charts/stable/pydio-cells/values.yaml
index c9934887c6c..bb0a5ac652e 100644
--- a/charts/stable/pydio-cells/values.yaml
+++ b/charts/stable/pydio-cells/values.yaml
@@ -33,6 +33,7 @@ service:
   main:
     ports:
       main:
+        protocol: HTTPS
         targetPort: 10150
         port: 10150
   gprc:
diff --git a/docs/manual/default-ports.md b/docs/manual/default-ports.md
index c8402483568..b8d6653e62f 100644
--- a/docs/manual/default-ports.md
+++ b/docs/manual/default-ports.md
@@ -302,7 +302,7 @@ These defaults can of course be changed, but as we guarantee "sane, working defa
 | ipfs                       |     gateway     |     gateway     | 10147 |   TCP    |                                         |
 | kodi-headless              |      main       |      main       | 10148 |   TCP    |                                         |
 | pwndrop                    |      main       |      main       | 10149 |   TCP    |                                         |
-| pydio-cells                |      main       |      main       | 10150 |   TCP    |                                         |
+| pydio-cells                |      main       |      main       | 10150 |  HTTPS   |                                         |
 | scrutiny                   |      main       |      main       | 10151 |   TCP    |                                         |
 | kodi-headless              |    websocket    |    websocket    | 10152 |   TCP    |                                         |
 | shlink                     |      main       |      main       | 10153 |   TCP    |                                         |