Skip to content

fix(controller): handle k8s 409 conflict as transient requeue#207

Merged
csatib02 merged 1 commit into
mainfrom
fix/conflict
May 19, 2026
Merged

fix(controller): handle k8s 409 conflict as transient requeue#207
csatib02 merged 1 commit into
mainfrom
fix/conflict

Conversation

@csatib02
Copy link
Copy Markdown
Member

@csatib02 csatib02 commented May 19, 2026

Fixes an issue where TC and the OTel-operator made changes to the collector CR on top of each-other.

Treat optimistic-concurrency conflicts on the OpenTelemetryCollector
update as a transient race (typically with opentelemetry-operator
writing back status). Log at INFO and requeue after 1s instead of
marking the Collector StateFailed and persisting the conflict text
into Status.Problems.

Signed-off-by: Bence Csati <bence.csati@axoflow.com>
@csatib02 csatib02 requested a review from OverOrion May 19, 2026 11:07
@csatib02 csatib02 self-assigned this May 19, 2026
@csatib02 csatib02 merged commit eb45e7b into main May 19, 2026
13 checks passed
@csatib02 csatib02 deleted the fix/conflict branch May 19, 2026 13:12
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.

2 participants