Skip to content

Commit d51491e

Browse files
Techassisbernauer
andauthored
chore: Apply suggestions
Co-authored-by: Sebastian Bernauer <[email protected]>
1 parent ac5b9cb commit d51491e

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

crates/stackable-operator/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ All notable changes to this project will be documented in this file.
88

99
- Add `CustomResourceDefinitionMaintainer` which applies and patches CRDs triggered by TLS
1010
certificate rotations of the `ConversionWebhookServer`. It additionally provides a `oneshot`
11-
channel which can be used to trigger creation/patching of any default custom resources deployed by
11+
channel which can for example be used to trigger creation/patching of any custom resources deployed by
1212
the operator ([#1099]).
1313
- Add a `Client::create_if_missing` associated function to create a resource if it doesn't
1414
exist ([#1099]).

crates/stackable-operator/src/crd/maintainer.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,10 +220,10 @@ impl CustomResourceDefinitionMaintainer {
220220
// After the reconciliation of the CRDs, the initial reconcile heartbeat is sent out
221221
// via the oneshot channel.
222222
if let Some(initial_reconcile_tx) = initial_reconcile_tx.take() {
223-
match initial_reconcile_tx.send(()) {
224-
Ok(_) => {}
225-
Err(_) => return SendInitialReconcileHeartbeatSnafu.fail(),
226-
}
223+
ensure!(
224+
initial_reconcile_tx.send(()).is_ok(),
225+
SendInitialReconcileHeartbeatSnafu
226+
);
227227
}
228228
}
229229

crates/stackable-webhook/src/lib.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,10 @@ impl WebhookServer {
9797
pub const DEFAULT_HTTPS_PORT: u16 = 8443;
9898
/// The default IP address [`Ipv4Addr::UNSPECIFIED`] (`0.0.0.0`) the webhook server binds to,
9999
/// which represents binding on all network addresses.
100+
//
101+
// TODO: We might want to switch to `Ipv6Addr::UNSPECIFIED)` here, as this *normally* binds to IPv4
102+
// and IPv6. However, it's complicated and depends on the underlying system...
103+
// If we do so, we should set `set_only_v6(false)` on the socket to not rely on system defaults.
100104
pub const DEFAULT_LISTEN_ADDRESS: IpAddr = IpAddr::V4(Ipv4Addr::UNSPECIFIED);
101105
/// The default socket address `0.0.0.0:8443` the webhook server binds to.
102106
pub const DEFAULT_SOCKET_ADDRESS: SocketAddr =

0 commit comments

Comments
 (0)