From 9178a95f0af1480f0c23333b83e003d1da701716 Mon Sep 17 00:00:00 2001
From: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
Date: Tue, 28 Dec 2021 13:50:58 +0200
Subject: [PATCH] fix(shlink): protocol is `HTTP` (#1619)

* fix(shlink): protocol is `HTTP`

* defaults to tcp anyway

* this is backend, there is no portal...
---
 charts/incubator/shlink/Chart.yaml     |  2 +-
 charts/incubator/shlink/questions.yaml | 48 +++++++++-----------------
 charts/incubator/shlink/values.yaml    |  1 -
 docs/manual/default-ports.md           |  2 +-
 4 files changed, 19 insertions(+), 34 deletions(-)

diff --git a/charts/incubator/shlink/Chart.yaml b/charts/incubator/shlink/Chart.yaml
index 7fcc2d3fba0..7b72f69efe9 100644
--- a/charts/incubator/shlink/Chart.yaml
+++ b/charts/incubator/shlink/Chart.yaml
@@ -28,7 +28,7 @@ name: shlink
 sources:
 - https://github.com/shlinkio/shlink
 type: application
-version: 0.0.1
+version: 0.0.2
 annotations:
   truecharts.org/catagories: |
     - utilities
diff --git a/charts/incubator/shlink/questions.yaml b/charts/incubator/shlink/questions.yaml
index 69bf93a0e32..1eccbcadf4a 100644
--- a/charts/incubator/shlink/questions.yaml
+++ b/charts/incubator/shlink/questions.yaml
@@ -1,28 +1,8 @@
 # Include{groups}
-portals:
-  web_portal:
-    protocols:
-      - "$kubernetes-resource_configmap_portal_protocol"
-    host:
-      - "$kubernetes-resource_configmap_portal_host"
-    ports:
-      - "$kubernetes-resource_configmap_portal_port"
+portals: {}
+
 questions:
-  - variable: portal
-    group: "Container Image"
-    label: "Configure Portal Button"
-    schema:
-      type: dict
-      hidden: true
-      attrs:
-        - variable: enabled
-          label: "Enable"
-          description: "enable the portal button"
-          schema:
-            hidden: true
-            editable: false
-            type: boolean
-            default: true
+
 # Include{global}
 
   - variable: controller
@@ -94,6 +74,12 @@ questions:
           schema:
             type: string
             default: ""
+        - variable: IS_HTTPS_ENABLED
+          label: "Served over HTTPS"
+          description: "Tells if Shlink is served with https or not"
+          schema:
+            type: boolean
+            default: true
 # Include{containerConfig}
   - variable: service
     group: "Networking and Services"
@@ -113,6 +99,13 @@ questions:
                       schema:
                         type: dict
                         attrs:
+                          - variable: port
+                            label: "Port"
+                            description: "This port exposes the container port on the service"
+                            schema:
+                              type: int
+                              default: 10153
+                              required: true
                           - variable: advanced
                             label: "Show Advanced settings"
                             schema:
@@ -129,7 +122,7 @@ questions:
                                   label: "Port Type"
                                   schema:
                                     type: string
-                                    default: "HTTPS"
+                                    default: "HTTP"
                                     enum:
                                       - value: HTTP
                                         description: "HTTP"
@@ -152,13 +145,6 @@ questions:
                                   schema:
                                     type: int
                                     default: 10153
-                          - variable: port
-                            label: "Port"
-                            description: "This port exposes the container port on the service"
-                            schema:
-                              type: int
-                              default: 10153
-                              required: true
 
   - variable: serviceexpert
     group: "Networking and Services"
diff --git a/charts/incubator/shlink/values.yaml b/charts/incubator/shlink/values.yaml
index 245a307f7b7..5d69825cdc7 100644
--- a/charts/incubator/shlink/values.yaml
+++ b/charts/incubator/shlink/values.yaml
@@ -13,7 +13,6 @@ podSecurityContext:
 
 service:
   main:
-    protocol: HTTPS
     ports:
       main:
         targetPort: 10153
diff --git a/docs/manual/default-ports.md b/docs/manual/default-ports.md
index 7aab23fdf53..e82e0c05b99 100644
--- a/docs/manual/default-ports.md
+++ b/docs/manual/default-ports.md
@@ -293,7 +293,7 @@ These defaults can of course be changed, but as we guarantee "sane, working defa
 | pydio-cells                |      main       |      main       | 10150 |   TCP    |                                         |
 | scrutiny                   |      main       |      main       | 10151 |   TCP    |                                         |
 | kodi-headless              |    websocket    |    websocket    | 10152 |   TCP    |                                         |
-| shlink                     |      main       |      main       | 10153 |  HTTPS   |                                         |
+| shlink                     |      main       |      main       | 10153 |   TCP    |                                         |
 | hyperion-ng                | boblightservice | boblightservice | 19333 |   TCP    |                                         |
 | hyperion-ng                |   jsonservice   |   jsonservice   | 19444 |   TCP    |                                         |
 | hyperion-ng                | protobufservice | protobufservice | 19445 |   TCP    |                                         |