feat: make creation of default Instrumentation object for opentelemet…

…ry operator configurable
SumoLogic · Sep 12, 2022 · 7a8dc14 · 7a8dc14
1 parent 10b5f48
commit 7a8dc14
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+### Changed
+
+- feat: make creation of default Instrumentation object for opentelemetry operator configurable [#2506]
+
+[#2506]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2506
+[Unreleased]: https://github.com/SumoLogic/sumologic-kubernetes-collection/compare/v2.15.0...release-v2.15
+
 ## [v2.15.0]
 
 ### Released 2022-09-02

diff --git a/deploy/helm/sumologic/README.md b/deploy/helm/sumologic/README.md
@@ -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)                                                                                                                                                                                                                                              | `{}`                                                                                                              |

diff --git a/deploy/helm/sumologic/templates/opentelemetry-operator/instrumentation-cr.yaml b/deploy/helm/sumologic/templates/opentelemetry-operator/instrumentation-cr.yaml
@@ -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" ) "" }}

diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml
@@ -5103,7 +5103,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