From d995f1c36ff37306d9d72872e6b5354d50be425a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20=C5=9Awi=C4=85tek?= Date: Thu, 7 Sep 2023 13:14:24 +0200 Subject: [PATCH] chore: upgrade otel to 0.84.0-sumo-0 --- .changelog/3249.changed.txt | 1 + deploy/helm/sumologic/README.md | 4 ++-- deploy/helm/sumologic/values.yaml | 6 +++--- docs/security-best-practices.md | 14 +++++++------- docs/working-with-container-registries.md | 2 +- .../events_otc_statefulset/basic.output.yaml | 2 +- .../events_otc_statefulset/proxy.output.yaml | 2 +- .../logs_otc_cloudwatch/basic.output.yaml | 2 +- .../logs_otc_daemonset/additional.output.yaml | 4 ++-- .../logs_otc_daemonset/basic.output.yaml | 2 +- .../basic.output.yaml | 2 +- .../basic.output.yaml | 2 +- .../metrics_collector_otc/basic.output.yaml | 2 +- .../metrics_collector_otc/custom.output.yaml | 2 +- .../basic.output.yaml | 2 +- .../traces-gateway-deployment/basic.output.yaml | 2 +- .../traces-sampler-deployment/basic.output.yaml | 2 +- 17 files changed, 27 insertions(+), 26 deletions(-) create mode 100644 .changelog/3249.changed.txt diff --git a/.changelog/3249.changed.txt b/.changelog/3249.changed.txt new file mode 100644 index 0000000000..cd6be1f179 --- /dev/null +++ b/.changelog/3249.changed.txt @@ -0,0 +1 @@ +chore: upgrade otel to 0.84.0-sumo-0 \ No newline at end of file diff --git a/deploy/helm/sumologic/README.md b/deploy/helm/sumologic/README.md index a85d41ab30..73c63f65ab 100644 --- a/deploy/helm/sumologic/README.md +++ b/deploy/helm/sumologic/README.md @@ -158,7 +158,7 @@ The following table lists the configurable parameters of the Sumo Logic chart an | `sumologic.noProxy` | List of comma separated hostnames which should be excluded from the proxy | `kubernetes.default.svc` | | `sumologic.pullSecrets` | Optional list of secrets that will be used for pulling images for Sumo Logic's deployments and statefulsets. | `Nil` | | `sumologic.otelcolImage.repository` | Default image repository for OpenTelemetry Collector. This can be overridden for specific components. | `public.ecr.aws/sumologic/sumologic-otel-collector` | -| `sumologic.otelcolImage.tag` | Default image tag for OpenTelemetry Collector. This can be overridden for specific components. | `0.83.0-sumo-0` | +| `sumologic.otelcolImage.tag` | Default image tag for OpenTelemetry Collector. This can be overridden for specific components. | `0.84.0-sumo-0` | | `sumologic.otelcolImage.addFipsSuffix` | Add a `-fips` suffix to all image tags. See [docs/security-best-practices.md](/docs/security-best-practices.md) for more information. | `false` | | `sumologic.podLabels` | Additional labels for the pods. | `{}` | | `sumologic.podAnnotations` | Additional annotations for the pods. | `{}` | @@ -441,7 +441,7 @@ The following table lists the configurable parameters of the Sumo Logic chart an | `opentelemetry-operator.instrumentation.python.metrics.enabled` | Flag to control metrics export from Python instrumentation in `Instrumentation` resource. | `true` | | `opentelemetry-operator.instrumentation.python.traces.enabled` | Flag to control traces export from Python instrumentation in `Instrumentation` resource. | `true` | | `opentelemetry-operator.manager.collectorImage.repository` | The default collector image repository for OpenTelemetryCollector CRDs. | `public.ecr.aws/sumologic/sumologic-otel-collector` | -| `opentelemetry-operator.manager.collectorImage.tag` | The default collector image tag for OpenTelemetryCollector CRDs. | `0.83.0-sumo-0` | +| `opentelemetry-operator.manager.collectorImage.tag` | The default collector image tag for OpenTelemetryCollector CRDs. | `0.84.0-sumo-0` | | `opentelemetry-operator.manager.resources.limits.cpu` | Used to set limit CPU for OpenTelemetry-Operator Manager. | `250m` | | `opentelemetry-operator.manager.resources.limits.memory` | Used to set limit Memory for OpenTelemetry-Operator Manager. | `512Mi` | | `opentelemetry-operator.manager.resources.requests.cpu` | Used to set requested CPU for OpenTelemetry-Operator Manager. | `150m` | diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml index 2c07dbd5f3..0fe5c26d0f 100644 --- a/deploy/helm/sumologic/values.yaml +++ b/deploy/helm/sumologic/values.yaml @@ -240,7 +240,7 @@ sumologic: ### Global configuration for OpenTelemetry Collector otelcolImage: repository: "public.ecr.aws/sumologic/sumologic-otel-collector" - tag: "0.83.0-sumo-0" + tag: "0.84.0-sumo-0" ## Add a -fips suffix to all image tags. With default tags, this results in FIPS-compliant otel images. ## See https://github.com/SumoLogic/sumologic-otel-collector/blob/main/docs/fips.md for more information. @@ -3731,7 +3731,7 @@ tracesSampler: spike_limit_percentage: 20 ## Smart cascading filtering rules with preset limits. - ## Please see https://github.com/SumoLogic/sumologic-otel-collector/tree/v0.83.0-sumo-0/pkg/processor/cascadingfilterprocessor + ## Please see https://github.com/SumoLogic/sumologic-otel-collector/tree/v0.84.0-sumo-0/pkg/processor/cascadingfilterprocessor ## for details. cascading_filter: ## Max number of traces for which decisions are kept in memory @@ -4617,7 +4617,7 @@ opentelemetry-operator: manager: collectorImage: repository: "public.ecr.aws/sumologic/sumologic-otel-collector" - tag: "0.83.0-sumo-0" + tag: "0.84.0-sumo-0" env: resources: limits: diff --git a/docs/security-best-practices.md b/docs/security-best-practices.md index b66024615f..2579dad7d3 100644 --- a/docs/security-best-practices.md +++ b/docs/security-best-practices.md @@ -390,30 +390,30 @@ For Helm Chart v2 please When you use **OpenTelemetry Collector** you need set the fips compliant images. -For example, to use `0.83.0-sumo-0-fips` image with Helm Chart v2 use the following configuration: +For example, to use `0.84.0-sumo-0-fips` image with Helm Chart v2 use the following configuration: ```yaml metadata: image: - tag: 0.83.0-sumo-0-fips + tag: 0.84.0-sumo-0-fips otellogs: image: - tag: 0.83.0-sumo-0-fips + tag: 0.84.0-sumo-0-fips otelevents: image: - tag: 0.83.0-sumo-0-fips + tag: 0.84.0-sumo-0-fips otelcol: deployment: image: - tag: 0.83.0-sumo-0-fips + tag: 0.84.0-sumo-0-fips otelagent: daemonset: image: - tag: 0.83.0-sumo-0-fips + tag: 0.84.0-sumo-0-fips otelgateway: deployment: image: - tag: 0.83.0-sumo-0-fips + tag: 0.84.0-sumo-0-fips ``` ### FIPS compliant images for Fluent Bit and Fluentd diff --git a/docs/working-with-container-registries.md b/docs/working-with-container-registries.md index f4d53d80a2..5374cae5f0 100644 --- a/docs/working-with-container-registries.md +++ b/docs/working-with-container-registries.md @@ -69,7 +69,7 @@ One can then use `${REGISTRY_REPO_URL}:${TAG}` in `user-values.yaml` as such: sumologic: otelcol: defaultImage: - tag: 0.83.0-sumo-0-fips + tag: 0.84.0-sumo-0-fips ``` ## Upgrading while rehosting images diff --git a/tests/helm/testdata/goldenfile/events_otc_statefulset/basic.output.yaml b/tests/helm/testdata/goldenfile/events_otc_statefulset/basic.output.yaml index aa665c31c3..06c7ba4af3 100644 --- a/tests/helm/testdata/goldenfile/events_otc_statefulset/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/events_otc_statefulset/basic.output.yaml @@ -71,7 +71,7 @@ spec: priorityClassName: "prio" containers: - name: otelcol - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.83.0-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.84.0-sumo-0" imagePullPolicy: IfNotPresent args: - --config=/etc/otel/config.yaml diff --git a/tests/helm/testdata/goldenfile/events_otc_statefulset/proxy.output.yaml b/tests/helm/testdata/goldenfile/events_otc_statefulset/proxy.output.yaml index 8920dcc51d..980ae1d66e 100644 --- a/tests/helm/testdata/goldenfile/events_otc_statefulset/proxy.output.yaml +++ b/tests/helm/testdata/goldenfile/events_otc_statefulset/proxy.output.yaml @@ -58,7 +58,7 @@ spec: fsGroup: 999 containers: - name: otelcol - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.83.0-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.84.0-sumo-0" imagePullPolicy: IfNotPresent args: - --config=/etc/otel/config.yaml diff --git a/tests/helm/testdata/goldenfile/logs_otc_cloudwatch/basic.output.yaml b/tests/helm/testdata/goldenfile/logs_otc_cloudwatch/basic.output.yaml index cad90b7898..59894e546e 100644 --- a/tests/helm/testdata/goldenfile/logs_otc_cloudwatch/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc_cloudwatch/basic.output.yaml @@ -41,7 +41,7 @@ spec: fsGroup: 999 containers: - name: otelcol - image: public.ecr.aws/sumologic/sumologic-otel-collector:0.83.0-sumo-0 + image: public.ecr.aws/sumologic/sumologic-otel-collector:0.84.0-sumo-0 imagePullPolicy: IfNotPresent args: - --config=/etc/otelcol/config.yaml diff --git a/tests/helm/testdata/goldenfile/logs_otc_daemonset/additional.output.yaml b/tests/helm/testdata/goldenfile/logs_otc_daemonset/additional.output.yaml index 44abdc3529..ff535aa040 100644 --- a/tests/helm/testdata/goldenfile/logs_otc_daemonset/additional.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc_daemonset/additional.output.yaml @@ -41,7 +41,7 @@ spec: containers: - args: - --config=/etc/otelcol/config.yaml - image: public.ecr.aws/sumologic/sumologic-otel-collector:0.83.0-sumo-0 + image: public.ecr.aws/sumologic/sumologic-otel-collector:0.84.0-sumo-0 imagePullPolicy: IfNotPresent name: otelcol livenessProbe: @@ -176,7 +176,7 @@ spec: containers: - args: - --config=/etc/otelcol/config.yaml - image: public.ecr.aws/sumologic/sumologic-otel-collector:0.83.0-sumo-0 + image: public.ecr.aws/sumologic/sumologic-otel-collector:0.84.0-sumo-0 imagePullPolicy: IfNotPresent name: otelcol livenessProbe: diff --git a/tests/helm/testdata/goldenfile/logs_otc_daemonset/basic.output.yaml b/tests/helm/testdata/goldenfile/logs_otc_daemonset/basic.output.yaml index 380d54be2d..fcd9bc0378 100644 --- a/tests/helm/testdata/goldenfile/logs_otc_daemonset/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc_daemonset/basic.output.yaml @@ -33,7 +33,7 @@ spec: containers: - args: - --config=/etc/otelcol/config.yaml - image: public.ecr.aws/sumologic/sumologic-otel-collector:0.83.0-sumo-0 + image: public.ecr.aws/sumologic/sumologic-otel-collector:0.84.0-sumo-0 imagePullPolicy: IfNotPresent name: otelcol livenessProbe: diff --git a/tests/helm/testdata/goldenfile/metadata_logs_otc_statefulset/basic.output.yaml b/tests/helm/testdata/goldenfile/metadata_logs_otc_statefulset/basic.output.yaml index aa73d1df52..ab04a79893 100644 --- a/tests/helm/testdata/goldenfile/metadata_logs_otc_statefulset/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_logs_otc_statefulset/basic.output.yaml @@ -57,7 +57,7 @@ spec: fsGroup: 999 containers: - name: otelcol - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.83.0-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.84.0-sumo-0" imagePullPolicy: IfNotPresent args: - --config=/etc/otel/config.yaml diff --git a/tests/helm/testdata/goldenfile/metadata_metrics_otc_statefulset/basic.output.yaml b/tests/helm/testdata/goldenfile/metadata_metrics_otc_statefulset/basic.output.yaml index 23bf8c915d..3ea77434db 100644 --- a/tests/helm/testdata/goldenfile/metadata_metrics_otc_statefulset/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_metrics_otc_statefulset/basic.output.yaml @@ -57,7 +57,7 @@ spec: fsGroup: 999 containers: - name: otelcol - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.83.0-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.84.0-sumo-0" imagePullPolicy: IfNotPresent args: - --config=/etc/otel/config.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 index 4a2942fe79..acc793c24c 100644 --- a/tests/helm/testdata/goldenfile/metrics_collector_otc/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/metrics_collector_otc/basic.output.yaml @@ -13,7 +13,7 @@ metadata: heritage: "Helm" sumologic.com/scrape: "true" spec: - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.83.0-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.84.0-sumo-0" mode: statefulset replicas: 1 serviceAccount: RELEASE-NAME-sumologic-metrics 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 815f941d66..53c580b460 100644 --- a/tests/helm/testdata/goldenfile/metrics_collector_otc/custom.output.yaml +++ b/tests/helm/testdata/goldenfile/metrics_collector_otc/custom.output.yaml @@ -17,7 +17,7 @@ metadata: podKey: podValue spec: - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.83.0-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.84.0-sumo-0" mode: statefulset replicas: 1 serviceAccount: RELEASE-NAME-sumologic-metrics diff --git a/tests/helm/testdata/goldenfile/otelcol-instrumentation-statefulset/basic.output.yaml b/tests/helm/testdata/goldenfile/otelcol-instrumentation-statefulset/basic.output.yaml index 01fdb281f4..dfc480eb2b 100644 --- a/tests/helm/testdata/goldenfile/otelcol-instrumentation-statefulset/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/otelcol-instrumentation-statefulset/basic.output.yaml @@ -56,7 +56,7 @@ spec: fsGroup: 999 containers: - name: otelcol - image: public.ecr.aws/sumologic/sumologic-otel-collector:0.83.0-sumo-0 + image: public.ecr.aws/sumologic/sumologic-otel-collector:0.84.0-sumo-0 imagePullPolicy: IfNotPresent args: - "--config=/conf/otelcol.instrumentation.conf.yaml" diff --git a/tests/helm/testdata/goldenfile/traces-gateway-deployment/basic.output.yaml b/tests/helm/testdata/goldenfile/traces-gateway-deployment/basic.output.yaml index 95a63763a4..b4967d9630 100644 --- a/tests/helm/testdata/goldenfile/traces-gateway-deployment/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/traces-gateway-deployment/basic.output.yaml @@ -36,7 +36,7 @@ spec: restartPolicy: Always containers: - name: otelcol - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.83.0-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.84.0-sumo-0" imagePullPolicy: IfNotPresent args: - "--config=/conf/traces.gateway.conf.yaml" diff --git a/tests/helm/testdata/goldenfile/traces-sampler-deployment/basic.output.yaml b/tests/helm/testdata/goldenfile/traces-sampler-deployment/basic.output.yaml index 7476f86570..50990e0dff 100644 --- a/tests/helm/testdata/goldenfile/traces-sampler-deployment/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/traces-sampler-deployment/basic.output.yaml @@ -30,7 +30,7 @@ spec: serviceAccountName: RELEASE-NAME-sumologic containers: - name: otelcol - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.83.0-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.84.0-sumo-0" imagePullPolicy: IfNotPresent args: - --config=/conf/traces.sampler.conf.yaml