chore(shield): handle on windows host the agent additional_settings inside host-shield.yaml config (#2249)

Author: francesco-furlan

charts/shield/Chart.yaml

@@ -13,5 +13,5 @@ maintainers:
   - name: mavimo
     email: marcovito.moscaritolo@sysdig.com
 type: application
-version: 1.6.0
+version: 1.6.1
 appVersion: "1.0.0"

charts/shield/templates/host/_windows_configmap_helpers.tpl

@@ -67,6 +67,11 @@
 
 {{- $config := merge $config (dict "proxy" (include "host.proxy_config" . | fromYaml)) }}
 
+{{- if and (include "common.semver.is_valid" .Values.host_windows.image.tag) (semverCompare ">= 0.8.0" .Values.host_windows.image.tag) }}
+{{- $runtimeAdditionalSettings := (include "host.windows.runtime_config_override" .) | fromYaml }}
+{{- $config := merge $config (dict "internals" (dict "agent_runtime" (dict "additional_settings" $runtimeAdditionalSettings))) }}
+{{- end }}
+
 {{- $override := (include "host.windows.shield_config_override" .) | fromYaml }}
 {{- $finalConfig := mergeOverwrite $config $override }}
 {{- $finalConfig | toYaml }}

charts/shield/templates/host/configmap-windows.yaml

@@ -9,6 +9,8 @@ metadata:
 data:
   host-shield.yaml: |
     {{- include "host.windows.host_shield_config" . | nindent 4 }}
+{{- if and (include "common.semver.is_valid" .Values.host_windows.image.tag) (semverCompare "< 0.8.0" .Values.host_windows.image.tag) }}
   dragent.yaml: |
     {{- include "host.windows.configmap" . | nindent 4 }}
 {{- end }}
+{{- end }}

charts/shield/tests/host/configmap-windows-dragent-yaml_test.yaml

@@ -729,3 +729,16 @@ tests:
           pattern: |
             collector: ingest-alt-eu1.app.sysdig.com
             collector_port: 6443
+
+  - it: Test agent_runtime_additional_settings with version < 0.8.0
+    set:
+      host_windows:
+        image:
+          tag: "0.7.1"
+        agent_runtime_additional_settings:
+          connection_timeout: 1000
+    asserts:
+      - matchRegex:
+          path: data['dragent.yaml']
+          pattern: |
+            connection_timeout: 1000

charts/shield/tests/host/configmap-windows-host-shield-config_test.yaml

@@ -415,3 +415,21 @@ tests:
             sysdig_endpoint:
               collector: {}
               region: eu1-alt
+
+  - it: Test agent_runtime_additional_settings with version >= 0.8.0
+    set:
+      host_windows:
+        image:
+          tag: "0.8.0"
+        agent_runtime_additional_settings:
+          connection_timeout: 1000
+    asserts:
+      - notExists:
+          path: data['dragent.yaml']
+      - matchRegex:
+          path: data['host-shield.yaml']
+          pattern: |
+            internals:
+              agent_runtime:
+                additional_settings:
+                  connection_timeout: 1000