feat(kspm-collector,node-analyzer): add support for NATS_MAX_RECONNECT variable (#1400)

zohar-arad · web-flow · commit 660e610d475c · 2023-10-16T17:34:25.000+03:00
diff --git a/charts/kspm-collector/CHANGELOG.md b/charts/kspm-collector/CHANGELOG.md
@@ -105,7 +105,7 @@ exclusively to fix incorrect entries and not to add new ones.
 # v0.1.35
 ### New Features
 * **kspm-collector** [d1328c0](https://github.com/sysdiglabs/charts/commit/d1328c02976901a64d91f4e86a2a26035045496c): bumped KSPM Collector to latest version ([#921](https://github.com/sysdiglabs/charts/issues/921))
-# v0.1.34
+# v0.1.33
 ### Bug Fixes
 * **node-analyzer,kspm-collector** [59543e8](https://github.com/sysdiglabs/charts/commit/59543e8da45e1e61f21b2489500fe5452906bca0): Fix security context permission for KSPM components ([#907](https://github.com/sysdiglabs/charts/issues/907))
 # v0.1.33
diff --git a/charts/kspm-collector/Chart.yaml b/charts/kspm-collector/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: kspm-collector
 description: Sysdig KSPM collector
 
-version: 0.8.3
+version: 0.8.4
 appVersion: 1.30.0
 
 keywords:
diff --git a/charts/kspm-collector/README.md b/charts/kspm-collector/README.md
diff --git a/charts/kspm-collector/templates/configmap.yaml b/charts/kspm-collector/templates/configmap.yaml
@@ -17,6 +17,7 @@ data:
   excluded_workloads: {{ .Values.workloads.excluded | quote }}
   health_interval_minutes: {{ .Values.healthIntervalMin | default 5 | quote }}
   external_nats_url: {{ include "kspmCollector.natsUrl" . }}
+  nats_max_reconnect: {{ .Values.natsMaxReconnect | default 0 | quote }}
   cluster_name: {{ required "A valid clusterName is required" (include "kspmCollector.clusterName" .) }}
   nats_insecure: {{ include "kspmCollector.natsInsecure" . }}
   {{- if (.Values.httpProxy | default .Values.global.proxy.httpProxy) }}
diff --git a/charts/kspm-collector/templates/deployment.yaml b/charts/kspm-collector/templates/deployment.yaml
@@ -159,6 +159,12 @@ spec:
                 key: nats_insecure
                 name: {{ template "kspmCollector.fullname" . }}
                 optional: true
+          - name: NATS_MAX_RECONNECT
+            valueFrom:
+              configMapKeyRef:
+                key: nats_max_reconnect
+                name: {{ template "kspmCollector.fullname" . }}
+                optional: true
           - name: AGENT_PORT
             valueFrom:
               configMapKeyRef:
diff --git a/charts/kspm-collector/values.yaml b/charts/kspm-collector/values.yaml
@@ -5,6 +5,7 @@ httpProxy:
 httpsProxy:
 noProxy:
 sslVerifyCertificate:
+natsMaxReconnect: 0
 # Namespace to deploy to (Optional: Will default to release namespace)
 namespace:
 
@@ -76,7 +77,7 @@ clusterName: ""
 
 image:
   repository: sysdig/kspm-collector
-  tag: 1.32.0
+  tag: 1.33.0
   digest:
   registry: quay.io
   pullPolicy:
diff --git a/charts/node-analyzer/Chart.yaml b/charts/node-analyzer/Chart.yaml
@@ -3,7 +3,7 @@ name: node-analyzer
 description: Sysdig Node Analyzer
 
 # currently matching Sysdig's appVersion 1.14.34
-version: 1.17.7
+version: 1.17.8
 appVersion: 12.8.0
 keywords:
   - monitoring
diff --git a/charts/node-analyzer/README.md b/charts/node-analyzer/README.md
diff --git a/charts/node-analyzer/templates/configmap-kspm-analyzer.yaml b/charts/node-analyzer/templates/configmap-kspm-analyzer.yaml
@@ -14,6 +14,7 @@ data:
 {{ end}}
   environment: {{ $env }}
   external_nats_url: {{ include "nodeAnalyzer.natsUrl" . }}
+  nats_max_reconnect: {{ .Values.nodeAnalyzer.natsMaxReconnect | default 0 | quote }}
   cluster_name: {{ required "A valid clusterName is required" (include "nodeAnalyzer.clusterName" .) }}
   agent_app_name: {{ include "nodeAnalyzer.name" . }}
   {{- if hasKey .Values.nodeAnalyzer "sslVerifyCertificate" }}
diff --git a/charts/node-analyzer/templates/daemonset-node-analyzer.yaml b/charts/node-analyzer/templates/daemonset-node-analyzer.yaml
@@ -237,6 +237,12 @@ spec:
                 name: {{ .Release.Name }}-kspm-analyzer
                 key: agent_port
                 optional: true
+          - name: NATS_MAX_RECONNECT
+            valueFrom:
+              configMapKeyRef:
+                name: {{ .Release.Name }}-kspm-analyzer
+                key: nats_max_reconnect
+                optional: true
           {{- if .Values.global.sysdig.tags }}
           - name: TAGS
             value: {{ include "agent.tags" . }}
diff --git a/charts/node-analyzer/values.yaml b/charts/node-analyzer/values.yaml
@@ -137,6 +137,8 @@ nodeAnalyzer:
   httpProxy:
   httpsProxy:
   noProxy:
+  # NATS max reconnect attempts
+  natsMaxReconnect: 0
 
   # Allow sysdig Node Image Analyzer to run on Kubernetes 1.6 masters
   tolerations:
@@ -385,7 +387,7 @@ nodeAnalyzer:
     debug: false
     image:
       repository: sysdig/kspm-analyzer
-      tag: 1.33.0
+      tag: 1.34.0
       digest:
       pullPolicy:
 
diff --git a/charts/sysdig-deploy/Chart.yaml b/charts/sysdig-deploy/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: sysdig-deploy
 description: A chart with various Sysdig components for Kubernetes
 type: application
-version: 1.24.3
+version: 1.24.4
 maintainers:
   - name: AlbertoBarba
     email: alberto.barba@sysdig.com
@@ -36,7 +36,7 @@ dependencies:
   - name: node-analyzer
     # repository: https://charts.sysdig.com
     repository: file://../node-analyzer
-    version: ~1.17.7
+    version: ~1.17.8
     alias: nodeAnalyzer
     condition: nodeAnalyzer.enabled
   - name: cluster-scanner
@@ -48,7 +48,7 @@ dependencies:
   - name: kspm-collector
     # repository: https://charts.sysdig.com
     repository: file://../kspm-collector
-    version: ~0.8.3
+    version: ~0.8.4
     alias: kspmCollector
     condition: global.kspm.deploy
   - name: rapid-response
