Skip to content

Commit

Permalink
feat: update opentelemetry-operator chart and fix progagators list in…
Browse files Browse the repository at this point in the history 
… instrumentation resource (#2630)

* chore(helm): update opentelemetry-operator chart 0.18.3

* chore(helm): update chart version 2.18.2

* feat(instrumentation): fix propagators, update dotnet instrumentation img

* feat(instrumentationjob): use specified image

* feat(operator): add possbility to set instrumentationjob img

* chore(helmtests): update tests

* docs(reamde): update parameters list

* docs(changelog): update

* docs(readme): update matrix
  • Loading branch information
@mat-rumian
mat-rumian authored Nov 23, 2022
1 parent 35df128 commit 72434d0
Show file tree
Hide file tree
Showing 9 changed files with 24 additions and 25 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,12 @@ for differences between Telegraf Operator Helm Chart 1.3.5 and Telegraf Operator
- chore: remove support for kOps 1.20 [#2592]
- chore(fluent-bit): update Fluent Bit Helm Chart to 0.20.9 [#2596]
- chore(telegraf-operator): update Telegraf Operator Helm Chart to 1.3.10 [#2598]
- feat: update opentelemetry-operator chart and fix progagators list in instrumentation resource [#2630]

[#2592]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2592
[#2596]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2596
[#2598]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2598
[#2630]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2630
[Unreleased]: https://github.com/SumoLogic/sumologic-kubernetes-collection/compare/v2.18.1...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
Expand Down
4 changes: 2 additions & 2 deletions deploy/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ The following matrix displays the tested package versions for our Helm chart.

| Sumo Logic Helm Chart | kube-prometheus-stack/Prometheus Operator | FluentD | Fluent Bit | Falco | Metrics Server | Telegraf Operator | Tailing Sidecar Operator | OpenTelemetry Operator |
|:----------------------|:------------------------------------------|:--------|:------------------------------------|:-------|:---------------|:------------------|:-------------------------|:-----------------------|
| latest | 12.10.0 | 1.14.6 | 0.20.9 | 1.18.6 | 5.11.9 | 1.3.5 | 0.3.4 | 0.13.0 |
| 2.18.0 | 12.10.0 | 1.14.6 | 0.20.2 | 1.18.6 | 5.11.9 | 1.3.5 | 0.3.4 | 0.13.0 |
| 2.18.2 - latest | 12.10.0 | 1.14.6 | 0.20.9 | 1.18.6 | 5.11.9 | 1.3.10 | 0.3.4 | 0.18.3 |
| 2.18.0 - 2.18.1 | 12.10.0 | 1.14.6 | 0.20.2 | 1.18.6 | 5.11.9 | 1.3.5 | 0.3.4 | 0.13.0 |
| 2.16.0 - 2.17.0 | 12.10.0 | 1.14.6 | 0.20.2 | 1.18.6 | 5.11.9 | 1.3.5 | 0.3.4 | 0.7.0 |
| 2.14.1 - 2.15.0 | 12.10.0 | 1.14.6 | 0.20.2 | 1.18.6 | 5.11.9 | 1.3.5 | 0.3.3 | 0.7.0 |
| 2.11.0 - 2.14.0 | 12.10.0 | 1.14.6 | 0.20.2 | 1.18.6 | 5.11.9 | 1.3.5 | 0.3.2 | 0.7.0 |
Expand Down
6 changes: 3 additions & 3 deletions deploy/helm/sumologic/Chart.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: sumologic
version: 2.18.1
appVersion: 2.18.1
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:
Expand Down Expand Up @@ -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
4 changes: 3 additions & 1 deletion deploy/helm/sumologic/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,9 @@ The following table lists the configurable parameters of the Sumo Logic chart an
| `opentelemetry-operator.enabled` | Flag to control deploying OpenTelemetry Operator Helm sub-chart. | `false` |
| `opentelemetry-operator.createDefaultInstrumentation` | Flag to control creation of default Instrumentation object | `false` |
| `opentelemetry-operator.instrumentationNamespaces` | Used to create `Instrumentation` resources in specified namespaces. | `Nil` |
| `otelagent.enabled` | Enables OpenTelemetry Collector Agent mode DaemonSet. | `false` |
| `opentelemetry-operator.instrumentationJobImage.image.repository` | Name of the image repository used to apply Instrumentation resource | `sumologic/kubernetes-tools` |
| `opentelemetry-operator.instrumentationJobImage.image.tag` | Name of the image tag used to apply Instrumentation resource | `2.13.0` |
| `otelagent.enabled` | Enables OpenTelemetry Collector Agent mode DaemonSet. | `true` |
| `otelagent.daemonset.nodeSelector` | Node selector for otelagent daemonset. [See docs/Best_Practices.md for more information.](../../docs/Best_Practices.md) | `{}` |
| `otelagent.daemonset.priorityClassName` | Priority class name for OpenTelemetry Agent trace pods. | If not provided then set to `RELEASE-NAME-sumologic-priorityclass`. |
| `otelcol.deployment.replicas` | Set the number of OpenTelemetry Collector replicas. | `1` |
Expand Down
6 changes: 1 addition & 5 deletions deploy/helm/sumologic/conf/opentelemetry-operator/instrumentation.cr.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ spec:
propagators:
- tracecontext
- baggage
- b3
- xray
resource:
addK8sUIDAttributes: false
sampler:
Expand All @@ -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
Expand Down
3 changes: 2 additions & 1 deletion deploy/helm/sumologic/templates/opentelemetry-operator/job-instrumentation-cr.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
10 changes: 8 additions & 2 deletions deploy/helm/sumologic/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5104,15 +5104,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
Expand Down
12 changes: 2 additions & 10 deletions ...lm/opentelemetry_operator_instrumentation_cr_configmap/static/instrumentation.output.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ data:
propagators:
- tracecontext
- baggage
- b3
- xray
resource:
addK8sUIDAttributes: false
sampler:
Expand All @@ -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
Expand Down Expand Up @@ -93,8 +89,6 @@ data:
propagators:
- tracecontext
- baggage
- b3
- xray
resource:
addK8sUIDAttributes: false
sampler:
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/opentelemetry_operator_instrumentation_cr_job/static/job.output.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 72434d0

Please sign in to comment.