Skip to content

Commit

Permalink
Fix Target Allocator builds by using versions.txt (open-telemetry#1140)
Browse files Browse the repository at this point in the history
* Rerun target allocator publish step

* Docs which will trigger a publish

* update release docs

* update on new version
  • Loading branch information
jaronoff97 authored Oct 7, 2022
1 parent 93350b2 commit 78bc8be
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/publish-target-allocator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ on:
- '.github/workflows/publish-target-allocator.yaml'
branches:
- main
tags:
- 'v*'
workflow_dispatch:

jobs:
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion cmd/otel-allocator/README.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion versions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 78bc8be

Please sign in to comment.