From 649389d7f87ac3e0da48edea3ce733aefbbe1644 Mon Sep 17 00:00:00 2001 From: release-bot Date: Fri, 17 May 2024 09:26:50 -0600 Subject: [PATCH] Update changelogs and rendered content --- .chloggen/add-operator-cli-args.yaml | 3 +-- .chloggen/operator-update.yaml | 4 ++-- UPGRADING.md | 2 +- .../rendered_manifests/operator/deployment.yaml | 7 ------- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/.chloggen/add-operator-cli-args.yaml b/.chloggen/add-operator-cli-args.yaml index 20bd0f3f96..b3c539633b 100644 --- a/.chloggen/add-operator-cli-args.yaml +++ b/.chloggen/add-operator-cli-args.yaml @@ -9,5 +9,4 @@ issues: [1251] # (Optional) One or more lines of additional information to render under the primary note. # These lines will be padded with 2 spaces and then inserted directly into the document. # Use pipe (|) for multiline entries. -# TODO: Depending on when the next release is cut, the version values for the notes may change -subtext: If you're utilizing operator feature gates or auto-instrumentation for apache-httpd, go, nginx, or python, please see [upgrade guidelines](https://github.com/signalfx/splunk-otel-collector-chart/blob/main/UPGRADING.md#0990-0991) +subtext: If you're utilizing operator feature gates or auto-instrumentation for apache-httpd, go, nginx, or python, please see [upgrade guidelines](https://github.com/signalfx/splunk-otel-collector-chart/blob/main/UPGRADING.md#01000-01001) diff --git a/.chloggen/operator-update.yaml b/.chloggen/operator-update.yaml index fa2b44210c..ec5a473c59 100644 --- a/.chloggen/operator-update.yaml +++ b/.chloggen/operator-update.yaml @@ -5,9 +5,9 @@ component: operator # A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). note: Bump operator app to v0.99.0 while keeping operator chart at v0.49.1 due to values.schema.json validation blocker # One or more tracking issues related to the change -issues: [1292] +issues: [1251] # (Optional) One or more lines of additional information to render under the primary note. # These lines will be padded with 2 spaces and then inserted directly into the document. # Use pipe (|) for multiline entries. subtext: - Holding off on updating the operator chart until changes are adopted for https://github.com/open-telemetry/opentelemetry-helm-charts/pull/1065 + Holding off on updating the operator chart until changes are adopted for [1065](https://github.com/open-telemetry/opentelemetry-helm-charts/pull/1065) diff --git a/UPGRADING.md b/UPGRADING.md index 887cb19b3b..e7fad63f4d 100644 --- a/UPGRADING.md +++ b/UPGRADING.md @@ -1,6 +1,6 @@ # Upgrade guidelines -# 0.99.0 to 0.99.1 +# 0.100.0 to 0.100.1 Feature gates for controlling instrumentation in the operator have been replaced with command-line arguments. This update primarily affects users of non-Splunk distributions like apache-httpd, go, nginx, and python, which are now disabled by default. diff --git a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/operator/deployment.yaml b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/operator/deployment.yaml index 458e4a4e8c..cd12e12438 100644 --- a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/operator/deployment.yaml +++ b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/operator/deployment.yaml @@ -34,13 +34,6 @@ spec: - --health-probe-addr=:8081 - --webhook-port=9443 - --collector-image=otel/opentelemetry-collector-contrib:0.95.0 - - --enable-java-instrumentation=true - - --enable-nodejs-instrumentation=true - - --enable-dotnet-instrumentation=true - - --enable-apache-httpd-instrumentation=false - - --enable-go-instrumentation=false - - --enable-nginx-instrumentation=false - - --enable-python-instrumentation=false command: - /manager env: