fix(agent):Fix dragent.yaml indentation for security block (#1034)

sysdiglabs · Apr 6, 2023 · 6cefcd1 · 6cefcd1
1 parent 5be65f4
commit 6cefcd1
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 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.6.7
+version: 1.6.8
 
 appVersion: 12.13.0
 

diff --git a/charts/agent/README.md b/charts/agent/README.md
@@ -284,7 +284,7 @@ The Sysdig agent uses a file called `dragent.yaml` to store the configuration.
 
 Using the Helm chart, the default configuration settings can be updated using `sysdig.settings` either
 via `--set sysdig.settings.key = value` or in the values YAML file. For example, to eanble Prometheus metrics scraping,
-you need this in your `values.yaml` file::
+you need this in your `values.yaml` file:
 
 ```yaml
 sysdig:
@@ -299,6 +299,19 @@ sysdig:
 $ helm install --namespace sysdig-agent sysdig-agent -f values.yaml sysdig/agent
 ```
 
+### Agent Modes
+When directly specifying the agent mode by `sysdig.settitngs.feature.mode`, the values of `monitor.enabled` and
+`secure.enabled` must match the provided type. For example, setting `sysdig.settings.feature.mode=secure` would require
+the following:
+```yaml
+monitor:
+  enabled: false
+sysdig:
+  settings:
+    feature:
+      mode: secure
+```
+
 ## Upgrading Sysdig agent configuration
 
 If you need to upgrade the agent configuration file, first modify the YAML file (in this case we are increasing the

diff --git a/charts/agent/templates/_helpers.tpl b/charts/agent/templates/_helpers.tpl
@@ -377,7 +377,7 @@ For monitor.enabled=false, disable all Monitor specific extras (like app checks,
             "statsd") }}
             {{- $_ := set $monitorBlock $monitorFeature (dict "enabled" false) }}
         {{- end }}
-        {{- toYaml $monitorBlock }}
+{{ toYaml $monitorBlock }}
     {{- end -}}
 {{- end -}}
 
@@ -428,7 +428,7 @@ agent config to prevent a backend push from enabling them after installation.
             {{- $_ := set $secureConfig $secureFeature (dict "enabled" false) }}
         {{- end }}
     {{- end }}
-    {{- toYaml $secureConfig }}
+{{ toYaml $secureConfig }}
 {{- end }}
 
 {{ define "agent.k8sColdStart" }}