From e39743ffae48ae429a7ad9afc886808e262c3471 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20=C5=9Awi=C4=85tek?= Date: Tue, 23 Jan 2024 20:33:32 +0100 Subject: [PATCH] deps: upgrade otel-operator chart to 0.46.0 --- .changelog/3457.changed.txt | 2 +- .changelog/3515.changed.txt | 1 + deploy/helm/sumologic/Chart.yaml | 2 +- .../metrics/collector/otelcol/opentelemetrycollector.yaml | 3 --- docs/README.md | 2 +- .../goldenfile/metrics_collector_otc/basic.output.yaml | 3 --- .../goldenfile/metrics_collector_otc/custom.output.yaml | 3 --- 7 files changed, 4 insertions(+), 12 deletions(-) create mode 100644 .changelog/3515.changed.txt diff --git a/.changelog/3457.changed.txt b/.changelog/3457.changed.txt index f242d17710..49e69008d9 100644 --- a/.changelog/3457.changed.txt +++ b/.changelog/3457.changed.txt @@ -1 +1 @@ -deps: update opentelemetry operator to 0.44.2 \ No newline at end of file +deps: update opentelemetry operator to 0.46.0 \ No newline at end of file diff --git a/.changelog/3515.changed.txt b/.changelog/3515.changed.txt new file mode 100644 index 0000000000..49e69008d9 --- /dev/null +++ b/.changelog/3515.changed.txt @@ -0,0 +1 @@ +deps: update opentelemetry operator to 0.46.0 \ No newline at end of file diff --git a/deploy/helm/sumologic/Chart.yaml b/deploy/helm/sumologic/Chart.yaml index 09158cf813..2fd29f1e3b 100644 --- a/deploy/helm/sumologic/Chart.yaml +++ b/deploy/helm/sumologic/Chart.yaml @@ -33,6 +33,6 @@ dependencies: repository: https://sumologic.github.io/tailing-sidecar condition: tailing-sidecar-operator.enabled - name: opentelemetry-operator - version: 0.44.2 + version: 0.46.0 repository: https://open-telemetry.github.io/opentelemetry-helm-charts condition: opentelemetry-operator.enabled,sumologic.metrics.collector.otelcol.enabled diff --git a/deploy/helm/sumologic/templates/metrics/collector/otelcol/opentelemetrycollector.yaml b/deploy/helm/sumologic/templates/metrics/collector/otelcol/opentelemetrycollector.yaml index 53fe8466f4..da3a7d2d7e 100644 --- a/deploy/helm/sumologic/templates/metrics/collector/otelcol/opentelemetrycollector.yaml +++ b/deploy/helm/sumologic/templates/metrics/collector/otelcol/opentelemetrycollector.yaml @@ -32,9 +32,6 @@ 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 prometheusCR: diff --git a/docs/README.md b/docs/README.md index 244ca13f37..83f5a3ce23 100644 --- a/docs/README.md +++ b/docs/README.md @@ -105,7 +105,7 @@ The following table displays the currently used software versions for our Helm c | Name | Version | | ----------------------------------------- | ------- | | OpenTelemetry Collector | 0.90.1 | -| OpenTelemetry Operator | 0.44.2 | +| OpenTelemetry Operator | 0.46.0 | | kube-prometheus-stack/Prometheus Operator | 40.5.0 | | Falco | 3.8.7 | | Telegraf Operator | 1.3.12 | diff --git a/tests/helm/testdata/goldenfile/metrics_collector_otc/basic.output.yaml b/tests/helm/testdata/goldenfile/metrics_collector_otc/basic.output.yaml index 2947a0a39a..9abbe3bf83 100644 --- a/tests/helm/testdata/goldenfile/metrics_collector_otc/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/metrics_collector_otc/basic.output.yaml @@ -18,9 +18,6 @@ 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 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 index dd9c084718..5a0422f538 100644 --- a/tests/helm/testdata/goldenfile/metrics_collector_otc/custom.output.yaml +++ b/tests/helm/testdata/goldenfile/metrics_collector_otc/custom.output.yaml @@ -23,9 +23,6 @@ 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 prometheusCR: