Skip to content

feat(opentelemetry-operator): support custom annotations on CRDs - #2299

Merged
TylerHelmuth merged 9 commits into
open-telemetry:mainfrom
somaz94:feat/operator-crds-annotations
Aug 5, 2026
Merged

TylerHelmuth merged 9 commits into
open-telemetry:mainfrom
somaz94:feat/operator-crds-annotations

Conversation

@somaz94

@somaz94 somaz94 commented Jul 10, 2026

Copy link
Copy Markdown
Contributor

Description

Add an opt-in crds.annotations value so the operator CRDs can carry helm.sh/resource-policy: keep and survive helm uninstall. Disabled by default.

Link to tracking issue

Fixes #1713

Authorship

  • I, a human, wrote this pull request description myself.

@somaz94
somaz94 marked this pull request as ready for review July 13, 2026 03:10
@somaz94
somaz94 requested review from a team and Allex1 as code owners July 13, 2026 03:10
Comment thread charts/opentelemetry-operator/values.yaml
@TylerHelmuth

Copy link
Copy Markdown
Member

@somaz94 I merged another operator PR first. Please re-bump the chart version and regenerate the examples.

…nerate examples

Assisted-by: Claude Opus 4.8
@somaz94

somaz94 commented Jul 20, 2026

Copy link
Copy Markdown
Contributor Author

Done in 88ba1105 — re-bumped the chart to 0.120.1 and re-ran make generate-examples. Thanks for the heads-up on the version collision after the other operator PR landed.

@somaz94

somaz94 commented Jul 29, 2026

Copy link
Copy Markdown
Contributor Author

Two approvals here and CI is green. Flagging one practical thing rather than just nudging:

The chart version was already re-bumped once after another operator PR landed ahead of this one (88ba1105, 07-20). Right now this branch is at 0.120.1 against main at 0.120.0, so there's no collision — but the same round trip happens again if another operator PR bumps first. Mentioning it only in case merging as-is is easier than another re-bump; happy to redo it if not.

@TylerHelmuth

Copy link
Copy Markdown
Member

@somaz94 I messed up and came back from PTO and merged another operator PR first. Sorry for the churn, you'll need to bump the chart version again

@somaz94

somaz94 commented Aug 5, 2026

Copy link
Copy Markdown
Contributor Author

No worries at all — bumped to 0.120.2 and re-ran make generate-examples in 7882569c. The diff is 35 files but purely the version string (53 insertions / 53 deletions, every changed line is 0.120.10.120.2); the CRD annotations change itself is untouched.

Branch was already merged with main, so it's current apart from #2320.

Comment thread charts/opentelemetry-operator/README.md Outdated
@TylerHelmuth
TylerHelmuth merged commit 21b66f9 into open-telemetry:main Aug 5, 2026
8 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.

Add helm.sh/resource-policy: keep in CRDs

3 participants