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

SumoLogic · Dec 14, 2023 · 212b872 · 212b872
1 parent 4c193e1
commit 212b872
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 11 deletions.
diff --git a/.changelog/3447.fixed.txt b/.changelog/3447.fixed.txt
@@ -0,0 +1 @@
+fix(metrics): use targetallocator serviceaccount created by the operator
diff --git a/deploy/helm/sumologic/templates/metrics/collector/otelcol/opentelemetrycollector.yaml b/deploy/helm/sumologic/templates/metrics/collector/otelcol/opentelemetrycollector.yaml
@@ -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

diff --git a/...oy/helm/sumologic/templates/metrics/collector/otelcol/targetallocator-serviceaccount.yaml b/...oy/helm/sumologic/templates/metrics/collector/otelcol/targetallocator-serviceaccount.yaml
diff --git a/tests/helm/testdata/goldenfile/metrics_collector_otc/basic.output.yaml b/tests/helm/testdata/goldenfile/metrics_collector_otc/basic.output.yaml
@@ -18,7 +18,6 @@ spec:
   replicas: 1
   serviceAccount: RELEASE-NAME-sumologic-metrics
   targetAllocator:
-    serviceAccount: RELEASE-NAME-sumologic-metrics-targetallocator
     enabled: true
     filterStrategy: relabel-config
     prometheusCR:

diff --git a/tests/helm/testdata/goldenfile/metrics_collector_otc/custom.output.yaml b/tests/helm/testdata/goldenfile/metrics_collector_otc/custom.output.yaml
@@ -23,7 +23,6 @@ spec:
   serviceAccount: RELEASE-NAME-sumologic-metrics
   targetAllocator:
     allocationStrategy: consistent-hashing
-    serviceAccount: RELEASE-NAME-sumologic-metrics-targetallocator
     enabled: true
     filterStrategy: relabel-config
     prometheusCR:
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		fix(metrics): use targetallocator serviceaccount created by the operator