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.

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

Update GoReleaser templating to support all collector distros #708

Merged
merged 9 commits into from
Nov 7, 2024

Conversation

jackgopack4
Copy link
Contributor

@jackgopack4 jackgopack4 commented Oct 25, 2024

Per #716 we do not currently generate the Goreleaser configurations for otelcol-otlp and otelcol-k8s due to different requirements in default files, configurations, builds, etc.
This PR adds conditional logic to successfully generate these goreleaser templates.

Anyone can verify this change by downloading "main" branch, applying my changes to Makefile and cmd/goreleaser/internal/configure.go, running $ make generate-goreleaser and see the minute formatting changes that get applied to the goreleaser templates.

The pipeline tests should ensure that these binaries still build and release successfully but of course it should be verified after merge with v0.113.0 or v0.114.0

Updates to the goreleaser template will also likely be required to close #618 so I figured it was a good idea to get all four distros templated first

@jackgopack4 jackgopack4 changed the title Enable Position-Independent Executable builds Update GoReleaser templating to support all collector distros Oct 31, 2024
@jackgopack4 jackgopack4 marked this pull request as ready for review October 31, 2024 18:26
@jackgopack4 jackgopack4 requested review from a team as code owners October 31, 2024 18:26
Makefile Outdated Show resolved Hide resolved
@jackgopack4
Copy link
Contributor Author

@TylerHelmuth I think you've worked with the goreleaser templating recently; would you or someone else mind taking a look? Thanks.

@jackgopack4
Copy link
Contributor Author

@open-telemetry/helm-approvers @open-telemetry/operator-approvers appreciate some eyes on this change, thank you

@swiatekm
Copy link

swiatekm commented Nov 6, 2024

The templating changes look fine to me, but having them mixed with the PIE changes makes them harder to review. I'd prefer to merge #726 first. I also don't think we should proceed without @TylerHelmuth's review here.

@jackgopack4
Copy link
Contributor Author

The templating changes look fine to me, but having them mixed with the PIE changes makes them harder to review. I'd prefer to merge #726 first.

Agreed, removed those changes.

cmd/goreleaser/internal/configure.go Outdated Show resolved Hide resolved
cmd/goreleaser/internal/configure.go Outdated Show resolved Hide resolved
cmd/goreleaser/internal/configure.go Outdated Show resolved Hide resolved
@TylerHelmuth TylerHelmuth merged commit 26c3dee into open-telemetry:main Nov 7, 2024
48 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

OTE-01-005 WP1: Linux Binary Hardening Recommendations
3 participants