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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 10 commits into from
Nov 23, 2022
Merged

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

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
41bbd30
chore(instrjob): set k8s tools img tag
mat-rumian Nov 23, 2022
f778774
chore(instrumentation): use only tracecontext and baggage as default …
mat-rumian Nov 23, 2022
e575d0b
feat(chart): update opentelemetry-operator chart version 0.18.3
mat-rumian Nov 23, 2022
fef9178
feat(chart): update chart version 2.18.2
mat-rumian Nov 23, 2022
b01c175
feat(instrumentationjob): add image customization possibility
mat-rumian Nov 23, 2022
7d648bb
chore(helmtests): update
mat-rumian Nov 23, 2022
750c71b
docs(changelog): update
mat-rumian Nov 23, 2022
79587f0
feat(instrumentation): update dotnet beta 0.4.0 img
mat-rumian Nov 23, 2022
2d62167
chore(testhelm): update dotnet beta 0.4.0 img
mat-rumian Nov 23, 2022
b612a37
Merge branch 'main' into mat-rumian-small-impr
mat-rumian Nov 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions deploy/helm/sumologic/Chart.yaml
View file
Open in desktop
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
4 changes: 0 additions & 4 deletions deploy/helm/sumologic/conf/opentelemetry-operator/instrumentation.cr.yaml
View file
Open in desktop
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
3 changes: 2 additions & 1 deletion deploy/helm/sumologic/templates/opentelemetry-operator/job-instrumentation-cr.yaml
View file
Open in desktop
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
Open in desktop
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.

please all information about new parameters to https://github.com/SumoLogic/sumologic-kubernetes-collection/blob/main/deploy/helm/sumologic/README.md

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
8 changes: 0 additions & 8 deletions ...lm/opentelemetry_operator_instrumentation_cr_configmap/static/instrumentation.output.yaml
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion tests/helm/opentelemetry_operator_instrumentation_cr_job/static/job.output.yaml
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion tests/helm/terraform/static/tracing-metrics-disabled.output.yaml
View file
Open in desktop
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