Move sled-agent to V2 of the NTP admin client

Cargo.toml

@@ -20,7 +20,6 @@ members = [
     "clients/nexus-client",
     "clients/nexus-lockstep-client",
     "clients/ntp-admin-client",
-    "clients/ntp-admin-v1-client",
     "clients/oxide-client",
     "clients/oximeter-client",
     "clients/repo-depot-client",
@@ -211,7 +210,6 @@ default-members = [
     "clients/nexus-client",
     "clients/nexus-lockstep-client",
     "clients/ntp-admin-client",
-    "clients/ntp-admin-v1-client",
     "clients/oxide-client",
     "clients/oximeter-client",
     "clients/repo-depot-client",
@@ -620,7 +618,6 @@ maplit = "1.0.2"
 newtype_derive = "0.1.6"
 ntp-admin-api = { path = "ntp-admin/api" }
 ntp-admin-client = { path = "clients/ntp-admin-client" }
-ntp-admin-v1-client = { path = "clients/ntp-admin-v1-client" }
 ntp-admin-types = { path = "ntp-admin/types" }
 ntp-admin-types-versions = { path = "ntp-admin/types/versions" }
 mg-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "dc84a6ce494a9d004568b67e22add2285a04d887" }

dev-tools/ls-apis/api-manifest.toml

@@ -255,20 +255,6 @@ This is the server running inside CockroachDB zones that performs \
 configuration and monitoring that requires the `cockroach` CLI.
 """
 
-[[apis]]
-client_package_name = "ntp-admin-v1-client"
-label = "NTP Admin version 1"
-server_package_name = "ntp-admin-api"
-versioned_how = "client"
-versioned_how_reason = """
-Sled Agent (within the Host OS deployment unit) calls into NTP, and is updated \
-before NTP. This requires that the NTP Admin API be client-side versioned.
-"""
-notes = """
-This is the server running inside NTP zones that performs \
-monitoring on 'chrony'.
-"""
-
 [[apis]]
 client_package_name = "ntp-admin-client"
 label = "NTP Admin"

dev-tools/ls-apis/tests/api_check.out

@@ -37,9 +37,6 @@ Client-managed API:
     NTP Admin (ntp-admin-client, exposed by omicron-ntp-admin)
         reason: Sled Agent (within the Host OS deployment unit) calls into NTP, and is updated before NTP. This requires that the NTP Admin API be client-side versioned.
 
-    NTP Admin version 1 (ntp-admin-v1-client, exposed by omicron-ntp-admin)
-        reason: Sled Agent (within the Host OS deployment unit) calls into NTP, and is updated before NTP. This requires that the NTP Admin API be client-side versioned.
-
     Crucible Repair (repair-client, exposed by crucible-downstairs)
         reason: depends on itself (i.e., instances call each other)
     Repo Depot API (repo-depot-client, exposed by omicron-sled-agent)

dev-tools/ls-apis/tests/api_dependencies.out

@@ -82,11 +82,8 @@ Nexus Internal Lockstep API (client: nexus-lockstep-client)
 
 NTP Admin (client: ntp-admin-client)
     consumed by: omicron-nexus (omicron/nexus) via 2 paths
-    consumed by: sled-agent-rack-setup (omicron/sled-agent/rack-setup) via 1 path [embedded in omicron-sled-agent; rack-init only]
-
-NTP Admin version 1 (client: ntp-admin-v1-client)
     consumed by: omicron-sled-agent (omicron/sled-agent) via 1 path
-    consumed by: sled-agent-rack-setup (omicron/sled-agent/rack-setup) via 1 path [embedded in omicron-sled-agent; rack-init only]
+    consumed by: sled-agent-rack-setup (omicron/sled-agent/rack-setup) via 2 paths [embedded in omicron-sled-agent; rack-init only]
 
 External API (client: oxide-client)
 

sled-agent/config-reconciler/Cargo.toml

@@ -27,7 +27,7 @@ installinator-common.workspace = true
 key-manager.workspace = true
 key-manager-types.workspace = true
 sled-agent-types-versions.workspace = true
-ntp-admin-v1-client.workspace = true
+ntp-admin-client.workspace = true
 omicron-common.workspace = true
 omicron-ledger.workspace = true
 omicron-uuid-kinds.workspace = true

sled-agent/config-reconciler/src/reconciler_task/zones.rs

@@ -26,7 +26,7 @@ use illumos_utils::zone::Api as _;
 use illumos_utils::zone::DeleteAddressError;
 use illumos_utils::zone::OmicronZoneConfigExt;
 use illumos_utils::zone::Zones;
-use ntp_admin_v1_client::types::TimeSync;
+use ntp_admin_client::types::TimeSync;
 use omicron_common::address::Ipv6Subnet;
 use omicron_uuid_kinds::OmicronZoneUuid;
 use sled_agent_types::inventory::ConfigReconcilerInventoryResult;
@@ -77,9 +77,7 @@ pub enum TimeSyncError {
     #[error("multiple running NTP zones - this should never happen!")]
     MultipleRunningNtpZones,
     #[error("failed to communicate with NTP admin server")]
-    NtpAdmin(
-        #[from] ntp_admin_v1_client::Error<ntp_admin_v1_client::types::Error>,
-    ),
+    NtpAdmin(#[from] ntp_admin_client::Error<ntp_admin_client::types::Error>),
     #[error("failed to execute chronyc within NTP zone")]
     ExecuteChronyc(#[source] RunCommandError),
     #[error(
@@ -589,7 +587,7 @@ impl OmicronZones {
             return Err(TimeSyncError::MultipleRunningNtpZones);
         }
 
-        let client = ntp_admin_v1_client::Client::new(
+        let client = ntp_admin_client::Client::new(
             &format!("http://{ntp_admin_address}"),
             log.clone(),
         );