From 5e1dc7985b8afa709e9e766f111f61107031970c Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Mon, 14 Jun 2021 21:21:21 +0200
Subject: [PATCH] Fix mosquitto main service

---
 charts/incubator/mosquitto/Chart.yaml           |  2 +-
 charts/incubator/mosquitto/SCALE/questions.yaml | 13 +------------
 charts/incubator/mosquitto/values.yaml          |  3 +--
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/charts/incubator/mosquitto/Chart.yaml b/charts/incubator/mosquitto/Chart.yaml
index ff76f333e3d..7f3153521ce 100644
--- a/charts/incubator/mosquitto/Chart.yaml
+++ b/charts/incubator/mosquitto/Chart.yaml
@@ -21,4 +21,4 @@ name: mosquitto
 sources:
 - https://github.com/eclipse/mosquitto
 type: application
-version: 1.1.1
+version: 1.1.2
diff --git a/charts/incubator/mosquitto/SCALE/questions.yaml b/charts/incubator/mosquitto/SCALE/questions.yaml
index 475a366dc05..8c6888e9170 100644
--- a/charts/incubator/mosquitto/SCALE/questions.yaml
+++ b/charts/incubator/mosquitto/SCALE/questions.yaml
@@ -201,17 +201,6 @@ questions:
                   attrs:
                     - variable: main
                       label: "Main Service Port Configuration"
-                      schema:
-                        type: dict
-                        attrs:
-                          - variable: enabled
-                            label: "Enable the port"
-                            schema:
-                              type: boolean
-                              default: false
-                              hidden: true
-                    - variable: mqtt
-                      label: "MQTT Service Port Configuration"
                       schema:
                         type: dict
                         attrs:
@@ -225,7 +214,7 @@ questions:
                             label: "Port Type"
                             schema:
                               type: string
-                              default: "HTTP"
+                              default: "TCP"
                               enum:
                                 - value: HTTP
                                   description: "HTTP"
diff --git a/charts/incubator/mosquitto/values.yaml b/charts/incubator/mosquitto/values.yaml
index 50856741426..cda69f06c35 100644
--- a/charts/incubator/mosquitto/values.yaml
+++ b/charts/incubator/mosquitto/values.yaml
@@ -14,8 +14,7 @@ service:
   main:
     ports:
       main:
-        enabled: false
-      mqtt:
+        protocol: TCP
         enabled: true
         port: 1883