Skip to content

fix(observability-pipelines-worker): correct sgc_path in bootstrap template #2883

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gh-worker-dd-mergequeue-cf854d merged 5 commits into from
Sep 2, 2026
Merged

fix(observability-pipelines-worker): correct sgc_path in bootstrap template #2883

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ccb9043
fix(observability-pipelines-worker): correct sgc_path in bootstrap te…
ckelner Aug 28, 2026
1fe094c
Omit sgc_path from template, add changelog, bump to 2.21.2
ckelner Aug 31, 2026
d052eab
Use hasKey instead of dig truthiness to detect secret block
ckelner Aug 31, 2026
63c1213
Merge branch 'main' into ckelner/fix-opw-sgc-path-bootstrap
ckelner Aug 31, 2026
9e8b3b6
bump version in readme
tessneau Sep 2, 2026
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: 4 additions & 0 deletions charts/observability-pipelines-worker/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## 2.21.2

* Fix `sgc_path` in bootstrap template: remove hardcoded path to `datadog-secret-backend` (renamed to `sgc` since 2.15.1) and defer to the worker's built-in default. Also skip emitting the auto-generated `secret:` block when `bootstrap.config` already defines one, preventing duplicate YAML key errors.

## 2.21.1

* Official image `2.21.1`
Expand Down
2 changes: 1 addition & 1 deletion charts/observability-pipelines-worker/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
name: observability-pipelines-worker
version: 2.21.1
version: 2.21.2
description: Observability Pipelines Worker
type: application
keywords:
Expand Down
3 changes: 1 addition & 2 deletions charts/observability-pipelines-worker/templates/bootstrap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@ 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 (hasKey (default dict .Values.datadog.bootstrap.config) "secret")) }}
secret:
sgc_path: /opt/datadog/observability-pipelines-worker/bin/datadog-secret-backend
backend_type: json
backend_config:
file_path: /etc/observability-pipelines-secrets/secrets.json
Expand Down
Loading