Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions charts/datadog/templates/install_info-configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ data:
install_info: |
---
install_method:
tool: helm
tool_version: {{ .Release.Service }}
tool: {{ .Values.datadog.installInfo.tool | default "helm" }}
tool_version: {{ .Values.datadog.installInfo.toolVersion | default .Release.Service }}
Comment on lines +14 to +15

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Quote installInfo values in rendered install_info YAML

The new datadog.installInfo.tool and toolVersion values are now user-controlled, but they are injected as unquoted scalars into the embedded install_info YAML. If either value contains YAML-significant content (for example ": ", #, or a newline), the resulting install_info payload can be parsed incorrectly or become invalid when the Agent reads it, which defeats the purpose of making these fields configurable. Rendering these fields with quoting (or JSON string escaping) avoids this regression while preserving arbitrary string input.

Useful? React with 👍 / 👎.

installer_version: {{ .Chart.Name }}-{{ .Chart.Version }}
3 changes: 3 additions & 0 deletions charts/datadog/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
"datadog": {
"type": "object",
"properties": {
"installInfo": {
"type": "object"
},
"apm": {
"type": "object",
"properties": {
Expand Down
2 changes: 2 additions & 0 deletions charts/datadog/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ datadog:
## If set, this parameter takes precedence over "appKey".
appKeyExistingSecret: # <DATADOG_APP_KEY_SECRET>

installInfo: {}

# agents.secretAnnotations -- Annotations to add to the Secrets
secretAnnotations: {}
# key: "value"
Expand Down
Loading