From a89308b4b90ecade9a83c5512254b1f2bd265300 Mon Sep 17 00:00:00 2001
From: StevenMcElligott <89483932+StevenMcElligott@users.noreply.github.com>
Date: Thu, 8 Jun 2023 20:08:07 -0400
Subject: [PATCH] feat(mosquitto): Move to new common (#9219)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

**Description**
<!--
Please include a summary of the change and which issue is fixed. Please
also include relevant motivation and context. List any dependencies that
are required for this change.
-->
⚒️ Fixes  # <!--(issue)-->

**⚙️ Type of change**

- [ ] ⚙️ Feature/App addition
- [ ] 🪛 Bugfix
- [ ] ⚠️ Breaking change (fix or feature that would cause existing
functionality to not work as expected)
- [ ] 🔃 Refactor of current code

**🧪 How Has This Been Tested?**
<!--
Please describe the tests that you ran to verify your changes. Provide
instructions so we can reproduce. Please also list any relevant details
for your test configuration
-->

**📃 Notes:**
<!-- Please enter any other relevant information here -->

**✔️ Checklist:**

- [ ] ⚖️ My code follows the style guidelines of this project
- [ ] 👀 I have performed a self-review of my own code
- [ ] #️⃣ I have commented my code, particularly in hard-to-understand
areas
- [ ] 📄 I have made corresponding changes to the documentation
- [ ] ⚠️ My changes generate no new warnings
- [ ] 🧪 I have added tests to this description that prove my fix is
effective or that my feature works
- [ ] ⬆️ I increased versions for any altered app according to semantic
versioning

**➕ App addition**

If this PR is an app addition please make sure you have done the
following.

- [ ] 🪞 I have opened a PR on
[truecharts/containers](https://github.com/truecharts/containers) adding
the container to TrueCharts mirror repo.
- [ ] 🖼️ I have added an icon in the Chart's root directory called
`icon.png`

---

_Please don't blindly check all the boxes. Read them and only check
those that apply.
Those checkboxes are there for the reviewer to see what is this all
about and
the status of this PR with a quick glance._

---------

Signed-off-by: Kjeld Schouten <kjeld@schouten-lebbing.nl>
Co-authored-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
Co-authored-by: Kjeld Schouten <kjeld@schouten-lebbing.nl>
---
 charts/incubator/mosquitto/Chart.yaml         |  4 +--
 .../incubator/mosquitto/templates/NOTES.txt   |  1 +
 .../incubator/mosquitto/templates/common.yaml |  4 +--
 charts/incubator/mosquitto/values.yaml        | 30 +++++++++++++++----
 4 files changed, 29 insertions(+), 10 deletions(-)
 create mode 100644 charts/incubator/mosquitto/templates/NOTES.txt

diff --git a/charts/incubator/mosquitto/Chart.yaml b/charts/incubator/mosquitto/Chart.yaml
index 2d2f2d58755..2086736d01a 100644
--- a/charts/incubator/mosquitto/Chart.yaml
+++ b/charts/incubator/mosquitto/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: "2.0.15"
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
-    version: 11.1.2
+    version: 12.10.4
 deprecated: false
 description: Eclipse Mosquitto - An open source MQTT broker
 home: https://truecharts.org/charts/incubator/mosquitto
@@ -22,7 +22,7 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/incubator/mosquitto
   - https://github.com/eclipse/mosquitto
 type: application
-version: 9.0.0
+version: 10.0.0
 annotations:
   truecharts.org/catagories: |
     - homeautomation
diff --git a/charts/incubator/mosquitto/templates/NOTES.txt b/charts/incubator/mosquitto/templates/NOTES.txt
new file mode 100644
index 00000000000..efcb74cb772
--- /dev/null
+++ b/charts/incubator/mosquitto/templates/NOTES.txt
@@ -0,0 +1 @@
+{{- include "tc.v1.common.lib.chart.notes" $ -}}
diff --git a/charts/incubator/mosquitto/templates/common.yaml b/charts/incubator/mosquitto/templates/common.yaml
index b9e7208f382..995efb03eb0 100644
--- a/charts/incubator/mosquitto/templates/common.yaml
+++ b/charts/incubator/mosquitto/templates/common.yaml
@@ -1,5 +1,5 @@
 {{/* Make sure all variables are set properly */}}
-{{- include "tc.common.loader.init" . }}
+{{- include "tc.v1.common.loader.init" . }}
 
 {{/* Render the templates */}}
-{{ include "tc.common.loader.apply" . }}
+{{ include "tc.v1.common.loader.apply" . }}
diff --git a/charts/incubator/mosquitto/values.yaml b/charts/incubator/mosquitto/values.yaml
index 17fd9f2245d..f5c7fb4ceec 100644
--- a/charts/incubator/mosquitto/values.yaml
+++ b/charts/incubator/mosquitto/values.yaml
@@ -17,6 +17,25 @@ service:
         port: 9001
         targetPort: 9001
 
+workload:
+  main:
+    podSpec:
+      containers:
+        main:
+          probes:
+            liveness:
+              enabled: true
+              type: tcp
+              port: 1883
+            readiness:
+              enabled: true
+              type: tcp
+              port: 1883
+            startup:
+              enabled: true
+              type: tcp
+              port: 1883
+
 ingress:
   websockets:
     autoLink: true
@@ -61,13 +80,12 @@ persistence:
     enabled: true
     mountPath: "/mosquitto/configinc"
   mosquitto-config:
-    enabled: "true"
+    enabled: true
     mountPath: "/mosquitto/config/mosquitto.conf"
     subPath: "mosquitto.conf"
-    type: "custom"
-    volumeSpec:
-      configMap:
-        name: '{{ template "tc.common.names.fullname" . }}-config'
+    type: configmap
+    objectName: config
 
 portal:
-  enabled: false
+  open:
+    enabled: false