Merge pull request #28 from JacekZubielik/mktxp-exporter

fix(code): fix code
JacekZubielik · May 22, 2024 · 71fbb6f · 71fbb6f
2 parents 0d6243e + 07ffe0a
commit 71fbb6f
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 39 deletions.
diff --git a/charts/mktxp-exporter/Chart.yaml b/charts/mktxp-exporter/Chart.yaml
@@ -3,7 +3,7 @@ apiVersion: v2
 appVersion: gha-7614306238
 description: Mikrotik MKTXP Prometheus exporter
 name: mktxp-exporter
-version: 0.0.1
+version: 0.0.2
 keywords:
 - mikrotik-exporter
 - mktxp-exporter

diff --git a/charts/mktxp-exporter/templates/servicemonitor.yaml b/charts/mktxp-exporter/templates/servicemonitor.yaml
@@ -10,7 +10,7 @@ metadata:
   {{- end }}
   {{- with .Values.monitoring.serviceMonitor.annotations }}
   annotations:
-  {{- toYaml . | nindent 4 }}
+    {{- toYaml . | nindent 4 }}
   {{- end }}
   {{- if .Values.monitoring.serviceMonitor.namespace }}
   namespace: {{ .Values.monitoring.serviceMonitor.namespace }}

diff --git a/charts/mktxp-exporter/templates/statefulset.yaml b/charts/mktxp-exporter/templates/statefulset.yaml
@@ -17,7 +17,7 @@ spec:
     metadata:
       {{- with .Values.podAnnotations }}
       annotations:
-      {{- toYaml . | nindent 8 }}
+        {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
       {{- include "app.selectorLabels" . | nindent 8 }}
@@ -40,10 +40,10 @@ spec:
           runAsNonRoot: false
           privileged: true
         volumeMounts:
-        - name:      config
+        - name: config
           mountPath: /tmp/mktxp.conf
-          subPath:   mktxp.conf
-        - name:      data
+          subPath: mktxp.conf
+        - name: data
           mountPath: /home/mktxp/mktxp
       - name: setup-permissions
         image: busybox
@@ -52,7 +52,7 @@ spec:
           runAsNonRoot: false
           privileged: true
         volumeMounts:
-        - name:      data
+        - name: data
           mountPath: /home/mktxp/mktxp
       containers:
       - name: {{ .Chart.Name }}
@@ -68,33 +68,33 @@ spec:
           {{- toYaml .Values.resources | nindent 12 }}
         livenessProbe:
           httpGet:
-            path:              /
-            port:              {{ .Values.service.port }}
-            scheme:            HTTP
-          periodSeconds:       60
-          timeoutSeconds:      10
-          successThreshold:    1
-          failureThreshold:    6
+            path: /
+            port: {{ .Values.service.port }}
+            scheme: HTTP
+          periodSeconds: 60
+          timeoutSeconds: 10
+          successThreshold: 1
+          failureThreshold: 6
           initialDelaySeconds: 10
         readinessProbe:
           httpGet:
-            path:              /
-            port:              {{ .Values.service.port }}
-            scheme:            HTTP
-          periodSeconds:       60
-          timeoutSeconds:      10
-          successThreshold:    1
-          failureThreshold:    2
+            path: /
+            port: {{ .Values.service.port }}
+            scheme: HTTP
+          periodSeconds: 60
+          timeoutSeconds: 10
+          successThreshold: 1
+          failureThreshold: 2
           initialDelaySeconds: 10
         volumeMounts:
-        - name:      data
+        - name: data
           mountPath: /home/mktxp/mktxp
       volumes:
       - name: config
         configMap:
           name: {{ include "app.fullname" . }}
           items:
-          - key:  mktxp.conf
+          - key: mktxp.conf
             path: mktxp.conf
             mode: 0644
       - name: data

diff --git a/charts/mktxp-exporter/values.yaml b/charts/mktxp-exporter/values.yaml
@@ -15,11 +15,11 @@ updateStrategy:
   #   maxUnavailable: 0
   #   maxSurge: 1
 
-# serviceAccount:
-#   create: false
-#   annotations: {}
-#   automountServiceAccountToken: false
-# podAnnotations: {}
+serviceAccount:
+  create: false
+  annotations: {}
+  automountServiceAccountToken: false
+podAnnotations: {}
 
 podSecurityContext:
   runAsUser: 100
@@ -32,27 +32,18 @@ service:
   port: 49090
 
 resources: {}
-
-nodeSelector:
-  kubernetes.io/hostname: {}
-
+nodeSelector: {}
 tolerations: []
-
 affinity: {}
 
 persistence:
   storageClassName: local-path
   size: 1Gi
 
-# ingress:
-#   enabled: false
-#   ingressClassName: traefik
-#   domainName: {}
-#   secretName: cluster-tls
-
 monitoring:
   enabled: false
   serviceMonitor:
+    annotations: {}
     enabled: false
     interval: 60s
     labels: {}