feat: update helm structure and resolve issues with unused variables

snapp-incubator · Jul 29, 2024 · c75a59c · c75a59c
1 parent d371152
commit c75a59c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/charts/nats-blackbox-exporter/templates/configmap.yaml b/charts/nats-blackbox-exporter/templates/configmap.yaml
@@ -8,7 +8,7 @@ data:
       level: {{ .Values.logLevel | quote}}
     nats:
       streams: {{ .Values.nats.streams | toYaml | nindent 8 }}
-      url: nats://{{ .Release.Name }}.{{ .Release.Namespace }}.svc.cluster.local:4222
+      url: {{ tpl (.Values.nats.url | toString) $ }}
       publish_interval: {{ .Values.nats.publish_interval | quote }}
       request_timeout: {{ .Values.nats.request_timeout | quote }}
       max_pub_acks_inflight: {{ .Values.nats.rmax_pub_acks_inflight | quote }}
@@ -17,5 +17,5 @@ data:
       new_stream_allow: {{ .Values.nats.new_stream_allow }}
     metric:
       server:
-        address: ":8080"
-      enabled: true
+        address: ":{{ .Values.metrics.port | default 8080 }}"
+      enabled: true
diff --git a/charts/nats-blackbox-exporter/templates/pod-monitor.yaml b/charts/nats-blackbox-exporter/templates/pod-monitor.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.podMonitor.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: PodMonitor
 metadata:
@@ -9,4 +10,5 @@ spec:
     matchLabels:
       {{- include "blackbox-exporter.selectorLabels" . | nindent 6 }}
   podMetricsEndpoints:
-  - port: metrics
+  - port: metrics
+{{ end }}
diff --git a/charts/nats-blackbox-exporter/values.yaml b/charts/nats-blackbox-exporter/values.yaml
@@ -34,8 +34,6 @@ resources:
     cpu: 100m
     memory: 128Mi
 
-metrics:
-  port: 8080
 livenessProbe:
   httpGet:
     path: /metrics
@@ -47,14 +45,20 @@ readinessProbe:
 
 logLevel: debug
 
+podMonitor:
+  enabled: true
+
 nats:
   streams:
     - name: "stream"
       subject: "test"
-  url: "localhost:4222"
+  url: nats://{{ .Release.Name }}.{{ .Release.Namespace }}.svc.cluster.local:4222
   publish_interval: 2s
   request_timeout: 50ms
   max_pub_acks_inflight: 1000
   queue_subscription_group: "group"
   flush_timeout: 2s
   new_stream_allow: false
+
+metrics:
+  port: 8080