Skip to content
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

Jump to bottom

fix(metrics): use targetallocator serviceaccount created by the operator #3447

Merged
merged 1 commit into from
Dec 14, 2023
Merged

fix(metrics): use targetallocator serviceaccount created by the operator #3447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions .changelog/3447.fixed.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fix(metrics): use targetallocator serviceaccount created by the operator
2 changes: 2 additions & 0 deletions deploy/helm/sumologic/templates/metrics/collector/otelcol/opentelemetrycollector.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ spec:
{{- if .Values.sumologic.metrics.collector.otelcol.allocationStrategy }}
allocationStrategy: {{ .Values.sumologic.metrics.collector.otelcol.allocationStrategy }}
{{- end }}
# we set serviceAccount to work around https://github.com/open-telemetry/opentelemetry-operator/issues/2443
# TODO: drop this after the above is fixed
serviceAccount: {{ template "sumologic.metadata.name.metrics.targetallocator.serviceaccount" . }}
enabled: true
filterStrategy: relabel-config
Expand Down
9 changes: 0 additions & 9 deletions ...oy/helm/sumologic/templates/metrics/collector/otelcol/targetallocator-serviceaccount.yaml
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions tests/helm/testdata/goldenfile/metrics_collector_otc/basic.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ spec:
replicas: 1
serviceAccount: RELEASE-NAME-sumologic-metrics
targetAllocator:
# we set serviceAccount to work around https://github.com/open-telemetry/opentelemetry-operator/issues/2443
# TODO: drop this after the above is fixed
serviceAccount: RELEASE-NAME-sumologic-metrics-targetallocator
enabled: true
filterStrategy: relabel-config
Expand Down
2 changes: 2 additions & 0 deletions tests/helm/testdata/goldenfile/metrics_collector_otc/custom.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ spec:
serviceAccount: RELEASE-NAME-sumologic-metrics
targetAllocator:
allocationStrategy: consistent-hashing
# we set serviceAccount to work around https://github.com/open-telemetry/opentelemetry-operator/issues/2443
# TODO: drop this after the above is fixed
serviceAccount: RELEASE-NAME-sumologic-metrics-targetallocator
enabled: true
filterStrategy: relabel-config
Expand Down
Loading