Skip to content

Commit

Permalink
apply code review suggestion
Browse files Browse the repository at this point in the history
  • Loading branch information
clamoriniere committed Nov 25, 2024
1 parent 282dae8 commit 417f247
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
6 changes: 3 additions & 3 deletions charts/datadog/templates/NOTES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -534,16 +534,16 @@ More information about this change: https://github.com/DataDog/helm-charts/pull/
{{- end }}


{{- if and (ne .Values.targetSystem "linux") (eq (include "should-add-host-path-for-os-release-paths" .) "false") .Values.datadog.sbom.host.enabled }}
{{- if and (eq .Values.targetSystem "linux") (eq (include "should-add-host-path-for-os-release-paths" .) "false") .Values.datadog.sbom.host.enabled }}
#################################################################
#### ERROR: Configuration notice ####
#################################################################
The SBOM host filesystem collection feature requires access to the os-release information from the host.
`datadog.sbom.host.enabled: true` can't be use with `datadog.disableDefaultOsReleasePaths: true`.
`datadog.sbom.host.enabled: true` can't be used with `datadog.disableDefaultOsReleasePaths: true`.
{{- fail "The SBOM host filesystem collection feature requires access to the os-release information from the host." }}
{{- end }}

{{- if and (ne .Values.targetSystem "linux") (eq (include "should-add-host-path-for-os-release-paths" .) "false") (eq (include "should-enable-system-probe" .) "true") }}
{{- if and (eq .Values.targetSystem "linux") (eq (include "should-add-host-path-for-os-release-paths" .) "false") (eq (include "should-enable-system-probe" .) "true") }}
#################################################################
#### ERROR: Configuration notice ####
#################################################################
Expand Down
7 changes: 6 additions & 1 deletion charts/datadog/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2315,7 +2315,12 @@ providers:
enabled: false

talos:
# providers.talos.enabled -- Activate all specificities related to Talos.dev configuration. Required as currently we cannot auto-detect Talos.dev.
# providers.talos.enabled -- Activate all required specificities related to Talos.dev configuration,
# as currently the chart cannot auto-detect Talos.dev cluster.
# Note: The Agent deployment requires additional privileges that are not permitted by the default pod security policy.
# The annotation `pod-security.kubernetes.io/enforce=privileged` must be applied to the Datadog installation
# Kubernetes namespace. For more information on pod security policies in Talos.dev clusters, see:
# https://www.talos.dev/v1.8/kubernetes-guides/configuration/pod-security/
enabled: false

remoteConfiguration:
Expand Down

0 comments on commit 417f247

Please sign in to comment.