From 3b54c90168ce92e5a9e62d09406cadbccdeccf17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?B=E1=B4=87=CA=80=C9=B4=E1=B4=85=20S=E1=B4=84=CA=9C?=
 =?UTF-8?q?=E1=B4=8F=CA=80=C9=A2=E1=B4=87=CA=80s?= <bernd@bjws.nl>
Date: Sun, 19 Jun 2022 12:12:17 +0200
Subject: [PATCH] [mosquitto] Add per_listener_settings option (#1623)

---
 charts/stable/mosquitto/Chart.yaml               | 6 +++---
 charts/stable/mosquitto/templates/configmap.yaml | 1 +
 charts/stable/mosquitto/values.yaml              | 3 +++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/charts/stable/mosquitto/Chart.yaml b/charts/stable/mosquitto/Chart.yaml
index fdf74f06..fbcb278d 100644
--- a/charts/stable/mosquitto/Chart.yaml
+++ b/charts/stable/mosquitto/Chart.yaml
@@ -3,7 +3,7 @@ apiVersion: v2
 appVersion: 2.0.11
 description: Eclipse Mosquitto - An open source MQTT broker
 name: mosquitto
-version: 4.3.2
+version: 4.4.0
 kubeVersion: ">=1.16.0-0"
 keywords:
   - mosquitto
@@ -22,5 +22,5 @@ dependencies:
     version: 4.4.2
 annotations:
   artifacthub.io/changes: |-
-    - kind: changed
-      description: Upgraded `common` chart dependency to version 4.4.2
+    - kind: added
+      description: Added support for enabling `per_listener_settings`
diff --git a/charts/stable/mosquitto/templates/configmap.yaml b/charts/stable/mosquitto/templates/configmap.yaml
index 74751df9..a2bba09e 100644
--- a/charts/stable/mosquitto/templates/configmap.yaml
+++ b/charts/stable/mosquitto/templates/configmap.yaml
@@ -8,6 +8,7 @@ metadata:
     {{- include "common.labels" . | nindent 4 }}
 data:
   mosquitto.conf: |
+    per_listener_settings {{ .Values.perListenerSettings }}
     listener {{ .Values.service.main.ports.mqtt.port }}
     {{- if .Values.auth.enabled }}
     allow_anonymous false
diff --git a/charts/stable/mosquitto/values.yaml b/charts/stable/mosquitto/values.yaml
index 61f32109..f97bbe52 100644
--- a/charts/stable/mosquitto/values.yaml
+++ b/charts/stable/mosquitto/values.yaml
@@ -28,6 +28,9 @@ auth:
   # -- By enabling this, `allow_anonymous` gets set to `false` in the mosquitto config.
   enabled: false
 
+# -- By enabling this, authentication and access control settings will be controlled on a per-listener basis
+perListenerSettings: false
+
 persistence:
   # -- Configure a persistent volume to place mosquitto data in.
   # When enabled, this enables `persistence` and `persistence_location` in the mosquitto config.