Skip to content

Commit af06b5a

Browse files
committed
merge conflict
2 parents dea589a + bfdffa8 commit af06b5a

2 files changed

Lines changed: 8 additions & 1 deletion

File tree

crates/stackable-webhook/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
44

55
## [Unreleased]
66

7+
### Fixed
8+
9+
- Don't error in case the `initial_reconcile` Receiver is dropped ([#1133]).
10+
11+
[#1133]: https://github.com/stackabletech/operator-rs/pull/1133
12+
713
## [0.8.0] - 2025-12-32
814

915
### Added

crates/stackable-webhook/src/webhooks/conversion_webhook.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,8 @@ where
259259
// After the reconciliation of the CRDs, the initial reconcile heartbeat is sent out
260260
// via the oneshot channel.
261261
if let Some(initial_reconcile_tx) = self.initial_reconcile_tx.take() {
262-
// TODO Some docs why we ignore errors
262+
// This call will (only) error in case the receiver is dropped, so we need to ignore
263+
// failures.
263264
let _ = initial_reconcile_tx.send(());
264265
}
265266

0 commit comments

Comments
 (0)