Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Target Allocator builds by using versions.txt #1140

Merged
merged 7 commits into from
Oct 7, 2022
+7 −4
Merged

Fix Target Allocator builds by using versions.txt #1140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
16ff879
Rerun target allocator publish step
jaronoff97 Oct 4, 2022
6c56293
Docs which will trigger a publish
jaronoff97 Oct 4, 2022
9c7f9da
Merge branch 'main' into 1139-fix-ta-builds
jaronoff97 Oct 6, 2022
9835391
update release docs
jaronoff97 Oct 7, 2022
ed9344d
update on new version
jaronoff97 Oct 7, 2022
cbbb732
Merge branch '1139-fix-ta-builds' of github.com:jaronoff97/openteleme…
jaronoff97 Oct 7, 2022
ce49680
Merge branch 'main' into 1139-fix-ta-builds
jaronoff97 Oct 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/publish-target-allocator.yaml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should TA be released for every operator release? If so then it should be reflected in the release doc.


# Represents the current release of Java instrumentation.
# Should match autoinstrumentation/java/version.txt
Expand Down