Skip to content
Merged
Changes from 1 commit
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
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ data:
{{- if .Values.datadog.bootstrap.config }}
{{- toYaml .Values.datadog.bootstrap.config | nindent 4 }}
{{- end }}
{{- if .Values.datadog.bootstrap.secretFileContents }}
{{- if and .Values.datadog.bootstrap.secretFileContents (not (dig "secret" nil .Values.datadog.bootstrap.config)) }}
Comment thread
ckelner marked this conversation as resolved.
Outdated
secret:
sgc_path: /opt/datadog/observability-pipelines-worker/bin/datadog-secret-backend
sgc_path: /opt/datadog/observability-pipelines-worker/bin/sgc

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

looks like OPW defaults secret.sgc_path when it's omitted -- see the default setting to /sgc in 2.21.1 & this test

That default matches the sgc binary since 2.13.0, whereas the change to /sgc happened in 2.15.1. Should we simply omit secret.sgc_path from the template and defer to the worker default?

(note i haven't seen the google doc yet)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

ok yeah I stand by this after looking at the doc. Changing the hardcoded path works too but omitting it fully to defer to the default feels a tad nicer

backend_type: json
backend_config:
file_path: /etc/observability-pipelines-secrets/secrets.json
Expand Down
Loading