diff --git a/CHANGELOG.md b/CHANGELOG.md index 5519d1df6c..fd1709df5e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,6 +41,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - feat(chart): restrict permissions for setup and cleanup jobs [#2599] - feat: add parameter to configure additional Prometheus remote writes [#2611] - docs: rename user-provided config from values.yaml to user-values.yaml [#2619] +- feat: update opentelemetry-operator chart and fix progagators list in instrumentation resource [#2628] ### Fixed @@ -75,6 +76,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [#2619]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2619 [#2621]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2621 [#2615]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2615 +[#2628]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2628 [Unreleased]: https://github.com/SumoLogic/sumologic-kubernetes-collection/compare/v2.17.0...main [telegraf_operator_comapare_1.3.5_and_1.3.10]: https://github.com/influxdata/helm-charts/compare/telegraf-operator-1.3.5...telegraf-operator-1.3.10 [cert-manager-1.4]: https://github.com/cert-manager/cert-manager/releases/tag/v1.4.0 diff --git a/deploy/helm/sumologic/Chart.yaml b/deploy/helm/sumologic/Chart.yaml index de6300f711..30c8ed1f7b 100644 --- a/deploy/helm/sumologic/Chart.yaml +++ b/deploy/helm/sumologic/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: sumologic -version: 2.15.0 -appVersion: 2.15.0 +version: 2.18.2 +appVersion: 2.18.2 description: A Helm chart for collecting Kubernetes logs, metrics, traces and events into Sumo Logic. type: application keywords: @@ -37,6 +37,6 @@ dependencies: repository: https://sumologic.github.io/tailing-sidecar condition: tailing-sidecar-operator.enabled - name: opentelemetry-operator - version: 0.13.0 + version: 0.18.3 repository: https://open-telemetry.github.io/opentelemetry-helm-charts condition: opentelemetry-operator.enabled diff --git a/deploy/helm/sumologic/conf/opentelemetry-operator/instrumentation.cr.yaml b/deploy/helm/sumologic/conf/opentelemetry-operator/instrumentation.cr.yaml index 4e562c5ee2..b785c855c4 100644 --- a/deploy/helm/sumologic/conf/opentelemetry-operator/instrumentation.cr.yaml +++ b/deploy/helm/sumologic/conf/opentelemetry-operator/instrumentation.cr.yaml @@ -17,8 +17,6 @@ spec: propagators: - tracecontext - baggage - - b3 - - xray resource: addK8sUIDAttributes: false sampler: @@ -29,10 +27,8 @@ spec: - name: OTEL_RESOURCE_ATTRIBUTES value: application={{ $ns }} dotnet: - image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-dotnet:0.3.1-beta.1 + image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-dotnet:0.4.0-beta.1 env: - - name: OTEL_PROPAGATORS - value: tracecontext,baggage - name: OTEL_METRICS_EXPORTER value: none - name: OTEL_LOGS_EXPORTER diff --git a/deploy/helm/sumologic/templates/opentelemetry-operator/job-instrumentation-cr.yaml b/deploy/helm/sumologic/templates/opentelemetry-operator/job-instrumentation-cr.yaml index 1b62e1f217..69d46ff7ae 100644 --- a/deploy/helm/sumologic/templates/opentelemetry-operator/job-instrumentation-cr.yaml +++ b/deploy/helm/sumologic/templates/opentelemetry-operator/job-instrumentation-cr.yaml @@ -2,6 +2,7 @@ {{ $tracesEnabled := .Values.sumologic.traces.enabled }} {{ $createDefaultInstrumentation := index .Values "opentelemetry-operator" "createDefaultInstrumentation" }} {{- if and $operatorEnabled $tracesEnabled $createDefaultInstrumentation }} +{{ $instrumentationJobImage := index .Values "opentelemetry-operator" "instrumentationJobImage" "image" }} apiVersion: batch/v1 kind: Job metadata: @@ -15,7 +16,7 @@ spec: serviceAccountName: {{ template "sumologic.metadata.name.roles.serviceaccount" . }} containers: - name: instrumentation-cr-applier - image: sumologic/kubernetes-tools + image: {{ $instrumentationJobImage.repository }}:{{ $instrumentationJobImage.tag }} volumeMounts: - name: instrumentation-cr-configmap mountPath: /tmp/instrumentation-cr.yaml diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml index ede25149ed..d968cbe564 100644 --- a/deploy/helm/sumologic/values.yaml +++ b/deploy/helm/sumologic/values.yaml @@ -5098,15 +5098,21 @@ tailing-sidecar-operator: scc: create: false -## Configure OpenTelemetry Operator - Tracing +## Configure OpenTelemetry Operator - Instrumentation ## ref: https://github.com/open-telemetry/opentelemetry-helm-charts/tree/main/charts/opentelemetry-operator opentelemetry-operator: enabled: false - ## Specific for Tracing - Instrumentation resource creation + ## Specific for Sumo Logic chart - Instrumentation resource creation + instrumentationJobImage: + image: + repository: sumologic/kubernetes-tools + tag: 2.13.0 + createDefaultInstrumentation: false instrumentationNamespaces: "" + ## Specific for OpenTelemetry Operator chart values admissionWebhooks: failurePolicy: Fail enabled: true diff --git a/tests/helm/opentelemetry_operator_instrumentation_cr_configmap/static/instrumentation.output.yaml b/tests/helm/opentelemetry_operator_instrumentation_cr_configmap/static/instrumentation.output.yaml index 242f6fddfe..79e5b154c5 100644 --- a/tests/helm/opentelemetry_operator_instrumentation_cr_configmap/static/instrumentation.output.yaml +++ b/tests/helm/opentelemetry_operator_instrumentation_cr_configmap/static/instrumentation.output.yaml @@ -27,8 +27,6 @@ data: propagators: - tracecontext - baggage - - b3 - - xray resource: addK8sUIDAttributes: false sampler: @@ -39,10 +37,8 @@ data: - name: OTEL_RESOURCE_ATTRIBUTES value: application=ot-operator1 dotnet: - image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-dotnet:0.3.1-beta.1 + image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-dotnet:0.4.0-beta.1 env: - - name: OTEL_PROPAGATORS - value: tracecontext,baggage - name: OTEL_METRICS_EXPORTER value: none - name: OTEL_LOGS_EXPORTER @@ -93,8 +89,6 @@ data: propagators: - tracecontext - baggage - - b3 - - xray resource: addK8sUIDAttributes: false sampler: @@ -105,10 +99,8 @@ data: - name: OTEL_RESOURCE_ATTRIBUTES value: application=ot-operator2 dotnet: - image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-dotnet:0.3.1-beta.1 + image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-dotnet:0.4.0-beta.1 env: - - name: OTEL_PROPAGATORS - value: tracecontext,baggage - name: OTEL_METRICS_EXPORTER value: none - name: OTEL_LOGS_EXPORTER diff --git a/tests/helm/opentelemetry_operator_instrumentation_cr_job/static/job.output.yaml b/tests/helm/opentelemetry_operator_instrumentation_cr_job/static/job.output.yaml index 891de9f42f..3b94a1eab4 100644 --- a/tests/helm/opentelemetry_operator_instrumentation_cr_job/static/job.output.yaml +++ b/tests/helm/opentelemetry_operator_instrumentation_cr_job/static/job.output.yaml @@ -15,7 +15,7 @@ spec: serviceAccountName: RELEASE-NAME-sumologic containers: - name: instrumentation-cr-applier - image: sumologic/kubernetes-tools + image: sumologic/kubernetes-tools:2.13.0 volumeMounts: - name: instrumentation-cr-configmap mountPath: /tmp/instrumentation-cr.yaml diff --git a/tests/helm/terraform/static/tracing-metrics-disabled.output.yaml b/tests/helm/terraform/static/tracing-metrics-disabled.output.yaml index ae8ee9552e..5a99e0b9e4 100644 --- a/tests/helm/terraform/static/tracing-metrics-disabled.output.yaml +++ b/tests/helm/terraform/static/tracing-metrics-disabled.output.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app: RELEASE-NAME-sumologic - chart: "sumologic-2.15.0" + chart: "sumologic-2.18.2" release: "RELEASE-NAME" heritage: "Helm" data: