From 21d601afc45de928730240d8b9c4da9fe454cea2 Mon Sep 17 00:00:00 2001 From: Vineeth Pothulapati Date: Wed, 28 Jun 2023 00:55:57 +0530 Subject: [PATCH] rebase and update changelog --- .chloggen/1684-init-containers.yaml | 16 ---------------- .chloggen/1853-nginx-crd.yaml | 16 ---------------- CHANGELOG.md | 5 +++++ 3 files changed, 5 insertions(+), 32 deletions(-) delete mode 100755 .chloggen/1684-init-containers.yaml delete mode 100755 .chloggen/1853-nginx-crd.yaml diff --git a/.chloggen/1684-init-containers.yaml b/.chloggen/1684-init-containers.yaml deleted file mode 100755 index 23ee0ea268..0000000000 --- a/.chloggen/1684-init-containers.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: enhancement - -# The name of the component, or a single word describing the area of concern, (e.g. operator, target allocator, github action) -component: Collector - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Adds ability to set init containers for collector - -# One or more tracking issues related to the change -issues: [1684] - -# (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: diff --git a/.chloggen/1853-nginx-crd.yaml b/.chloggen/1853-nginx-crd.yaml deleted file mode 100755 index 81e6554598..0000000000 --- a/.chloggen/1853-nginx-crd.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: new_component - -# The name of the component, or a single word describing the area of concern, (e.g. operator, target allocator, github action) -component: operator - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Instrumentation crd for Nginx auto-instrumentation. - -# One or more tracking issues related to the change -issues: [1853] - -# (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: diff --git a/CHANGELOG.md b/CHANGELOG.md index 82b84d4b8e..f3f821afa4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ Changes by Version ### 💡 Enhancements 💡 +- `collector`: Adds ability to set init containers for collector (#1684) - `operator`: Adding more tests to validate existence of init containers. (#1826) - `operator`: For Apache HTTPD instrumentation, use latest instrumentation library v1.0.3. (#1827) - `autoinstrumentation/nodejs`: Bump python packages to 1.14.0/0.40.0 (#1790) @@ -18,6 +19,10 @@ Changes by Version - `operator`: Fix the upgrade mechanism to not crash when one OTEL Collector instance uses the old approach to set the autoscaler. (#1799) - `target allocator`: Fix the empty global scrape interval in Prometheus CR watcher, which causes configuration unmarshalling to fail. (#1811) +### 🚀 New components 🚀 + +- `operator`: Instrumentation crd for Nginx auto-instrumentation. (#1853) + ### Components * [OpenTelemetry Collector - v0.80.0](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.80.0)