Skip to content

Commit 208b663

Browse files
committed
8496 issue
1 parent cbd3ae5 commit 208b663

File tree

3 files changed

+9
-1
lines changed

3 files changed

+9
-1
lines changed

nexus/reconfigurator/execution/src/omicron_zones.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,9 @@ async fn oximeter_cleanup(
168168
Ok(())
169169
}
170170

171+
// TODO(https://github.com/oxidecomputer/omicron/issues/8496): If this service
172+
// was fully in DNS, this would not be necessary.
173+
//
171174
// Helper trait that is implemented by `Resolver`, but allows unit tests to
172175
// inject a fake resolver that points to a mock server when calling
173176
// `decommission_cockroachdb_node()`.

nexus/src/app/background/tasks/crdb_node_id_collector.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,9 @@ impl CockroachNodeIdCollector {
128128
// This trait exists so we can inject addresses in our unit tests below that
129129
// aren't required to have admin servers listening on the fixed
130130
// `COCKROACH_ADMIN_PORT`.
131+
//
132+
// TODO(https://github.com/oxidecomputer/omicron/issues/8496): Add the admin
133+
// service to DNS, remove this?
131134
trait CockroachAdminFromBlueprint {
132135
fn cockroach_admin_addrs<'a>(
133136
&'a self,

nexus/src/app/background/tasks/inventory_collection.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,9 @@ async fn inventory_activate(
199199
.await
200200
.context("looking up cockroach addresses")?;
201201

202-
// TODO: Allow a hard-coded option to find the admin interface here.
202+
// TODO(https://github.com/oxidecomputer/omicron/issues/8496): If
203+
// we could look up the admin service, instead of hard-coding it as
204+
// "same as cockroach, but different port", that be preferable.
203205
let admin_addresses: Vec<_> = cockroach_addresses
204206
.into_iter()
205207
.map(|mut addr| {

0 commit comments

Comments
 (0)