From 78bc8be205a53a07e66d5207d70074476c21ff9c Mon Sep 17 00:00:00 2001 From: Jacob Aronoff Date: Fri, 7 Oct 2022 11:25:49 -0400 Subject: [PATCH] Fix Target Allocator builds by using versions.txt (#1140) * Rerun target allocator publish step * Docs which will trigger a publish * update release docs * update on new version --- .github/workflows/publish-target-allocator.yaml | 4 +++- RELEASE.md | 2 +- cmd/otel-allocator/README.md | 3 ++- versions.txt | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish-target-allocator.yaml b/.github/workflows/publish-target-allocator.yaml index ccb046c708..72d2066275 100644 --- a/.github/workflows/publish-target-allocator.yaml +++ b/.github/workflows/publish-target-allocator.yaml @@ -7,6 +7,8 @@ on: - '.github/workflows/publish-target-allocator.yaml' branches: - main + tags: + - 'v*' workflow_dispatch: jobs: @@ -17,7 +19,7 @@ jobs: - uses: actions/checkout@v3 - name: Read version - run: echo "VERSION=$(cat cmd/otel-allocator/version.txt)" >> $GITHUB_ENV + run: grep -v '\#' versions.txt | grep targetallocator | awk -F= '{print "VERSION="$2}' >> $GITHUB_ENV - name: Docker meta id: meta diff --git a/RELEASE.md b/RELEASE.md index 5c9a45590e..21095ac66a 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -2,7 +2,7 @@ Steps to release a new version of the OpenTelemetry Operator: -1. Change the `versions.txt`, so that it lists the target version of the OpenTelemetry Collector (operand), and the desired version for the operator. The `major.minor` should typically match, with the patch portion being possibly different. +1. Change the `versions.txt`, so that it lists the target version of the OpenTelemetry Collector (operand), and the desired version for the target allocator and the operator. The `major.minor` should typically match, with the patch portion being possibly different. 1. Run `make bundle USER=open-telemetry VERSION=0.38.0`, using the version that will be released. 1. Change the compatibility matrix in the readme file, using the OpenTelemetry Operator version to be released and the current latest Kubernetes version as the latest supported version, with N-2 being the lower bound. Make sure that the CI is currently testing the latest Kubernetes version! 1. Add the changes to the changelog diff --git a/cmd/otel-allocator/README.md b/cmd/otel-allocator/README.md index f4b4d53fda..88b4cee963 100644 --- a/cmd/otel-allocator/README.md +++ b/cmd/otel-allocator/README.md @@ -1,7 +1,8 @@ # Target Allocator The TargetAllocator is an optional separately deployed component of an OpenTelemetry Collector setup, which is used to -distribute targets of the PrometheusReceiver on all deployed Collector instances. +distribute targets of the PrometheusReceiver on all deployed Collector instances. The release version matches the +operator's most recent release as well. # Design diff --git a/versions.txt b/versions.txt index 05b8d9aedb..bbdf49788d 100644 --- a/versions.txt +++ b/versions.txt @@ -8,7 +8,7 @@ opentelemetry-collector=0.60.0 operator=0.60.0 # Represents the current release of the Target Allocator. -targetallocator=0.1.0 +targetallocator=0.60.0 # Represents the current release of Java instrumentation. # Should match autoinstrumentation/java/version.txt