fix(agent): fix occasional k8s_coldstart block duplication and key na…

…me (#1069)
sysdiglabs · May 9, 2023 · d9cbbdd · d9cbbdd
1 parent d1c6d9e
commit d9cbbdd
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 8 deletions.
diff --git a/charts/agent/Chart.yaml b/charts/agent/Chart.yaml
@@ -5,7 +5,7 @@ description: Sysdig Monitor and Secure agent
 type: application
 
 # currently matching sysdig 1.14.32
-version: 1.7.3
+version: 1.7.4
 
 appVersion: 12.14.0
 

diff --git a/charts/agent/templates/_helpers.tpl b/charts/agent/templates/_helpers.tpl
@@ -450,13 +450,13 @@ agent config to prevent a backend push from enabling them after installation.
     {{- end }}
     {{- if not .Values.sysdig.settings.k8s_coldstart }}
         {{- if not .Values.delegatedAgentDeployment.enabled }}
-            {{- $_ := set $k8sColdStartBlock "max_parallel_cold_starts" (include "agent.parallelStarts" . | int ) }}
+            {{- $_ := set $k8sColdStartBlock "max_parallel_cold_start" (include "agent.parallelStarts" . | int ) }}
         {{- else }}
-            {{- $_ := set $k8sColdStartBlock "max_parallel_cold_starts" 1 }}
+            {{- $_ := set $k8sColdStartBlock "max_parallel_cold_start" 1 }}
         {{- end }}
     {{- end }}
     {{- $completeBlock := dict "k8s_coldstart" $k8sColdStartBlock }}
-    {{- toYaml $completeBlock }}
+    {{- $_ := merge .Values.sysdig.settings $completeBlock }}
 {{- end }}
 
 {{ define "agent.connectionSettings" }}

diff --git a/charts/agent/tests/delegated_agent_deployment_test.yaml b/charts/agent/tests/delegated_agent_deployment_test.yaml
@@ -414,7 +414,7 @@ tests:
             k8s_coldstart:
               enabled: true
               enforce_leader_election: true
-              max_parallel_cold_starts: 1
+              max_parallel_cold_start: 1
               namespace: NAMESPACE
     template: templates/configmap-deployment.yaml
 
@@ -432,7 +432,7 @@ tests:
             k8s_coldstart:
               enabled: true
               enforce_leader_election: true
-              max_parallel_cold_starts: 1
+              max_parallel_cold_start: 1
               namespace: NAMESPACE
     template: templates/configmap-deployment.yaml
 

diff --git a/charts/agent/tests/k8s_coldstart_test.yaml b/charts/agent/tests/k8s_coldstart_test.yaml
@@ -13,7 +13,7 @@ tests:
             k8s_coldstart:
               enabled: true
               enforce_leader_election: true
-              max_parallel_cold_starts: 1
+              max_parallel_cold_start: 1
               namespace: NAMESPACE
     template: templates/configmap.yaml
 
@@ -29,6 +29,57 @@ tests:
             k8s_coldstart:
               enabled: true
               enforce_leader_election: true
-              max_parallel_cold_starts: 10
+              max_parallel_cold_start: 10
               namespace: NAMESPACE
     template: templates/configmap.yaml
+
+  - it: Test manual setting of k8s_coldstart values
+    set:
+      sysdig:
+        settings:
+          k8s_coldstart:
+            max_parallel_cold_start: 1
+    asserts:
+      - matchRegex:
+          path: data['dragent.yaml']
+          pattern: |-
+            k8s_coldstart:
+              max_parallel_cold_start: 1
+
+  - it: Test manual setting of k8s_coldstart values with leaderelection set
+    set:
+      leaderelection:
+        enable: true
+      sysdig:
+        settings:
+          k8s_coldstart:
+            max_parallel_cold_start: 2
+    asserts:
+      - matchRegex:
+          path: data['dragent.yaml']
+          pattern: |-
+            k8s_coldstart:
+              enabled: true
+              enforce_leader_election: true
+              max_parallel_cold_start: 2
+              namespace: NAMESPACE
+
+  - it: Test manual setting of k8s_coldstart values with leaderelection and delegatedAgentDeployment set
+    set:
+      delegatedAgentDeployment:
+        enabled: true
+      leaderelection:
+        enable: true
+      sysdig:
+        settings:
+          k8s_coldstart:
+            max_parallel_cold_start: 2
+    asserts:
+      - matchRegex:
+          path: data['dragent.yaml']
+          pattern: |-
+            k8s_coldstart:
+              enabled: true
+              enforce_leader_election: true
+              max_parallel_cold_start: 2
+              namespace: NAMESPACE