Merge pull request #80 from JacekZubielik/mosquitto

build(mosquitto): 0.0.4
JacekZubielik · Aug 20, 2024 · 730f62c · 730f62c
2 parents 9d68c57 + f080f6d
commit 730f62c
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 32 deletions.
diff --git a/charts/mosquitto/Chart.yaml b/charts/mosquitto/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 2.0.18
 description: Eclipse Mosquitto MQTT
 name: mosquitto
-version: 0.0.3
+version: 0.0.4
 type: application
 keywords:
 - mqtt
@@ -12,4 +12,4 @@ icon: https://raw.githubusercontent.com/eclipse/mosquitto/master/logo/mosquitto-
 sources:
 - https://github.com/eclipse/mosquitto
 maintainers:
-  - name: jacekzubielik
+- name: jacekzubielik
diff --git a/charts/mosquitto/templates/deployment.yaml b/charts/mosquitto/templates/deployment.yaml
@@ -60,7 +60,7 @@ spec:
           runAsUser: 0
           privileged: true
         volumeMounts:
-        - name:      mosquitto-data
+        - name: mosquitto-data
           mountPath: /mosquitto
       containers:
       - name: {{ .Chart.Name }}
@@ -82,62 +82,56 @@ spec:
         {{- if .Values.livenessProbe.enabled }}
         livenessProbe:
           httpGet:
-            path:              /
-            port:              {{ .Values.service.mqttPort }}
-            scheme:            {{ .Values.livenessProbe.scheme }}
-          periodSeconds:       {{ .Values.livenessProbe.periodSeconds }}
-          timeoutSeconds:      {{ .Values.livenessProbe.timeoutSeconds }}
-          successThreshold:    {{ .Values.livenessProbe.successThreshold }}
-          failureThreshold:    {{ .Values.livenessProbe.failureThreshold }}
+            path: /
+            port: {{ .Values.service.mqttPort }}
+            scheme: {{ .Values.livenessProbe.scheme }}
+          periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
+          timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
+          successThreshold: {{ .Values.livenessProbe.successThreshold }}
+          failureThreshold: {{ .Values.livenessProbe.failureThreshold }}
           initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds}}
         {{- end }}
         {{- if .Values.readinessProbe.enabled }}
         readinessProbe:
           httpGet:
-            path:              /
-            port:              {{ .Values.service.mqttPort }}
-            scheme:            {{ .Values.livenessProbe.scheme }}
-          periodSeconds:       {{ .Values.readinessProbe.periodSeconds }}
-          timeoutSeconds:      {{ .Values.readinessProbe.timeoutSeconds }}
-          successThreshold:    {{ .Values.readinessProbe.successThreshold }}
-          failureThreshold:    {{ .Values.readinessProbe.failureThreshold }}
+            path: /
+            port: {{ .Values.service.mqttPort }}
+            scheme: {{ .Values.livenessProbe.scheme }}
+          periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+          timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
+          successThreshold: {{ .Values.readinessProbe.successThreshold }}
+          failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
           initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds}}
         {{- end }}
         volumeMounts:
         - name: mosquitto-conf
           mountPath: /mosquitto/config/mosquitto.conf
           subPath: mosquitto.conf
-          readOnly: false
         - name: mosquitto-passwd
           mountPath: /mosquitto/password_file
           subPath: password_file
-          readOnly: false
         - name: mosquitto-ca-cert
           mountPath: /mosquitto/config/certs/ca.crt
           subPath: ca.crt
-          readOnly: false
         - name: mosquitto-server-cert
           mountPath: /mosquitto/config/certs/server.crt
           subPath: server.crt
-          readOnly: false
         - name: mosquitto-server-key
           mountPath: /mosquitto/config/certs/server.key
           subPath: server.key
-          readOnly: false
         - name: mosquitto-data
-          mountPath: /mosquitto
-          subPath: mosquitto
-          readOnly: false
+          mountPath: /mosquitto/data
+          subPath: mosquitto/data
         resources:
         {{- toYaml .Values.resources | nindent 12 }}
       volumes:
-      - name: mosquitto-passwd
-        secret:
-          secretName: mosquitto-secrets
-          items:
-          - key:  password_file
-            path: password_file
-            mode: 0644
+      # - name: mosquitto-passwd
+      #   secret:
+      #     secretName: mosquitto-secrets
+      #     items:
+      #     - key: password_file
+      #       path: password_file
+      #       mode: 0644
       - name: mosquitto-conf
         configMap:
           name: {{ include "app.fullname" . }}