Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: update opentelemetry-operator chart and fix progagators list in instrumentation resource #2628

Merged
merged 10 commits into from
Nov 23, 2022
6 changes: 3 additions & 3 deletions deploy/helm/sumologic/Chart.yaml
Original file line number Diff line number Diff line change
@@ -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:
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
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 @@ -31,8 +29,6 @@ spec:
dotnet:
image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-dotnet:0.3.1-beta.1
env:
- name: OTEL_PROPAGATORS
value: tracecontext,baggage
- name: OTEL_METRICS_EXPORTER
value: none
- name: OTEL_LOGS_EXPORTER
Expand Down
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
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for catch Kasia I will create a separated PR for that :)

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
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 @@ -41,8 +39,6 @@ data:
dotnet:
image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-dotnet:0.3.1-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 @@ -107,8 +101,6 @@ data:
dotnet:
image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-dotnet:0.3.1-beta.1
env:
- name: OTEL_PROPAGATORS
value: tracecontext,baggage
- name: OTEL_METRICS_EXPORTER
value: none
- name: OTEL_LOGS_EXPORTER
Expand Down
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
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down