From b98128c4f5086d00f7a9f189b278e1b6fe8956b4 Mon Sep 17 00:00:00 2001 From: Pavol Loffay Date: Fri, 12 Apr 2024 11:21:28 +0200 Subject: [PATCH 1/2] Add missing changelog to 0.98.0 Signed-off-by: Pavol Loffay --- .chloggen/fix-keepequal-dropequal.yaml | 16 ------------- CHANGELOG.md | 1 + RELEASE.md | 33 +++++++++++++------------- 3 files changed, 18 insertions(+), 32 deletions(-) delete mode 100644 .chloggen/fix-keepequal-dropequal.yaml diff --git a/.chloggen/fix-keepequal-dropequal.yaml b/.chloggen/fix-keepequal-dropequal.yaml deleted file mode 100644 index 5632b044cf..0000000000 --- a/.chloggen/fix-keepequal-dropequal.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: bug_fix - -# The name of the component, or a single word describing the area of concern, (e.g. operator, target allocator, github action) -component: target allocator - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Fix for keepequal/dropequal action - -# One or more tracking issues related to the change -issues: [2793] - -# (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 1d5c113af8..8942ef2dbb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ ### 🧰 Bug fixes 🧰 +- `target allocator`: Fix for keepequal/dropequal action (#2793) - `collector`: Create automatically the RBAC permissions to manage replicasets when using the k8sattributesprocessor (#2823) - `documentation`: The description for some fields was truncated in the documentation. (#2563) diff --git a/RELEASE.md b/RELEASE.md index da0c32ea52..b1d47d07f2 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -2,22 +2,23 @@ Steps to release a new version of the OpenTelemetry Operator: -1. Set the version you're releasing as an environment variable for convenience: `export VERSION=0.n+1.0` -2. Update `versions.txt` - - Operator, target allocator and opamp-bridge should be `$VERSION`. - - OpenTelemetry Collector should be the latest collector version. The `major.minor` should typically match, with the patch portion being possibly different. - - The `autoinstrumentation-*` versions should match the latest supported versions in `autoinstrumentation/`. - > [!WARNING] - > DO NOT BUMP JAVA PAST `1.32.X` AND DO NOT BUMP .NET PAST `1.2.0`. Upgrades past these versions will introduce breaking HTTP semantic convention changes. -3. Check if the compatible OpenShift versions are updated in the `hack/add-openshift-annotations.sh` script. -4. Update the bundle by running `make bundle VERSION=$VERSION`. -5. Change the compatibility matrix in the [readme](./README.md) file, using the OpenTelemetry Operator version to be released and the current latest Kubernetes version as the latest supported version. Remove the oldest entry. -6. Update release schedule table, by moving the current release manager to the end of the table with updated release version. -7. Add the changes to the changelog by running `make chlog-update VERSION=$VERSION`. -8. Check the OpenTelemetry Collector's changelog and ensure migration steps are present in `pkg/collector/upgrade` -9. Once the changes above are merged and available in `main`, a draft release will be automatically created. Publish it once the release workflows all complete. -10. Update the operator version in the Helm Chart, as per the [release guide](https://github.com/open-telemetry/opentelemetry-helm-charts/blob/main/charts/opentelemetry-operator/CONTRIBUTING.md) -11. The GitHub Workflow, submits two pull requests to the Operator hub repositories. Make sure the pull requests are approved and merged. +1. Create a `Prepare relese x.y.z` pull request with the following content: + 1. Set the version you're releasing as an environment variable for convenience: `export VERSION=0.n+1.0` + 2. Update `versions.txt` + - Operator, target allocator and opamp-bridge should be `$VERSION`. + - OpenTelemetry Collector should be the latest collector version. The `major.minor` should typically match, with the patch portion being possibly different. + - The `autoinstrumentation-*` versions should match the latest supported versions in `autoinstrumentation/`. + > [!WARNING] + > DO NOT BUMP JAVA PAST `1.32.X` AND DO NOT BUMP .NET PAST `1.2.0`. Upgrades past these versions will introduce breaking HTTP semantic convention changes. + 1. Check if the compatible OpenShift versions are updated in the `hack/add-openshift-annotations.sh` script. + 1. Update the bundle by running `make bundle VERSION=$VERSION`. + 1. Change the compatibility matrix in the [readme](./README.md) file, using the OpenTelemetry Operator version to be released and the current latest Kubernetes version as the latest supported version. Remove the oldest entry. + 1. Update release schedule table, by moving the current release manager to the end of the table with updated release version. + 1. Add the changes to the changelog by running `make chlog-update VERSION=$VERSION`. + 1. Check the OpenTelemetry Collector's changelog and ensure migration steps are present in `pkg/collector/upgrade` +1. Once the changes above are merged and available in `main`, a draft release will be automatically created. Publish it once the release workflows all complete. +1. Update the operator version in the Helm Chart, as per the [release guide](https://github.com/open-telemetry/opentelemetry-helm-charts/blob/main/charts/opentelemetry-operator/CONTRIBUTING.md) +1. The GitHub Workflow, submits two pull requests to the Operator hub repositories. Make sure the pull requests are approved and merged. - `community-operators-prod` is used by OLM on OpenShift. Example: [`operator-framework/community-operators-prod`](https://github.com/redhat-openshift-ecosystem/community-operators-prod/pull/494) - `community-operators` is used by Operatorhub.io. Example: [`operator-framework/community-operators`](https://github.com/k8s-operatorhub/community-operators/pull/461) From ce93575a5d84659556c78ceec86ad8fa2482615e Mon Sep 17 00:00:00 2001 From: Pavol Loffay Date: Fri, 12 Apr 2024 11:23:11 +0200 Subject: [PATCH 2/2] Fix Signed-off-by: Pavol Loffay --- RELEASE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE.md b/RELEASE.md index b1d47d07f2..ade27c6d24 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -4,7 +4,7 @@ Steps to release a new version of the OpenTelemetry Operator: 1. Create a `Prepare relese x.y.z` pull request with the following content: 1. Set the version you're releasing as an environment variable for convenience: `export VERSION=0.n+1.0` - 2. Update `versions.txt` + 1. Update `versions.txt` - Operator, target allocator and opamp-bridge should be `$VERSION`. - OpenTelemetry Collector should be the latest collector version. The `major.minor` should typically match, with the patch portion being possibly different. - The `autoinstrumentation-*` versions should match the latest supported versions in `autoinstrumentation/`.