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

[backport of #2506]feat: make creation of default Instrumentation object for opentelemetry operator configurable #2517

Merged
merged 1 commit into from
Sep 13, 2022
Merged

[backport of #2506]feat: make creation of default Instrumentation object for opentelemetry operator configurable #2517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- feat: add dot suffix to internal dns addresses [#2504]
- chore(tailing-sidecar-operator): upgrade to 0.3.4 [#2519]
- feat: make creation of default Instrumentation object for opentelemetry operator configurable [#2517]

[#2504]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2504
[#2519]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2519
[#2517]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2517
[Unreleased]: https://github.com/SumoLogic/sumologic-kubernetes-collection/compare/v2.15.0...release-v2

## [v2.15.0]
Expand Down
1 change: 1 addition & 0 deletions deploy/helm/sumologic/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,7 @@ The following table lists the configurable parameters of the Sumo Logic chart an
| `telegraf-operator.default` | Name of the default output configuration. | `sumologic-prometheus` |
| `telegraf-operator.data` | Telegraf sidecar configuration. | See [values.yaml] |
| `opentelemetry-operator.enabled` | Flag to control deploying OpenTelemetry Operator Helm sub-chart. | `false` |
| `opentelemetry-operator.createDefaultInstrumentation` | Flag to control creation of default Instrumentation object | `true` |
| `opentelemetry-operator.manager.env.WATCH_NAMESPACE` | Used to set value for `WATCH_NAMESPACE` environment variable which specifies Namespace to watch and create Instrumentation objects. | `Nil` |
| `otelagent.enabled` | Enables OpenTelemetry Collector Agent mode DaemonSet. | `false` |
| `otelagent.daemonset.nodeSelector` | Node selector for otelagent daemonset. [See docs/Best_Practices.md for more information.](../../docs/Best_Practices.md) | `{}` |
Expand Down
3 changes: 2 additions & 1 deletion deploy/helm/sumologic/templates/opentelemetry-operator/instrumentation-cr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{{ $operatorEnabled := index .Values "opentelemetry-operator" "enabled" }}
{{ $tracesEnabled := .Values.sumologic.traces.enabled }}
{{- if and $operatorEnabled $tracesEnabled }}
{{ $createDefaultInstrumentation := index .Values "opentelemetry-operator" "createDefaultInstrumentation" }}
{{- if and $operatorEnabled $tracesEnabled $createDefaultInstrumentation }}
{{- $ctx := . -}}
{{ $watchNamespace := index .Values "opentelemetry-operator" "manager" "env" }}
{{- if eq ( get $watchNamespace "WATCH_NAMESPACE" ) "" }}
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/sumologic/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5107,7 +5107,7 @@ tailing-sidecar-operator:
## ref: https://github.com/open-telemetry/opentelemetry-helm-charts/tree/main/charts/opentelemetry-operator
opentelemetry-operator:
enabled: false

createDefaultInstrumentation: true
admissionWebhooks:
failurePolicy: Fail
enabled: false
Expand Down