Don't provision clickhouse servers & keepers in RSS (oxidecomputer#6767)

Clickhouse clusters are only provisioned via reconfigurator as of
oxidecomputer#6627.

This drastically simplifies things since we don't have to put more
policy knobs in RSS and wicket. It also matches the fact that these
zones always need nexus running in order to get their configurations and
run the appropriate processes anyway.

This commit removes the vestigal zone creation that was never actually
used.

sled-agent/src/rack_setup/plan/service.rs

@@ -62,27 +62,7 @@ use uuid::Uuid;
 
 // TODO(https://github.com/oxidecomputer/omicron/issues/732): Remove
 // when Nexus provisions Clickhouse.
-// TODO(https://github.com/oxidecomputer/omicron/issues/4000): Use
-// omicron_common::policy::CLICKHOUSE_SERVER_REDUNDANCY once we enable
-// replicated ClickHouse.
-// Set to 0 when testing replicated ClickHouse.
 const CLICKHOUSE_COUNT: usize = 1;
-// TODO(https://github.com/oxidecomputer/omicron/issues/732): Remove
-// when Nexus provisions Clickhouse keeper.
-// TODO(https://github.com/oxidecomputer/omicron/issues/4000): Use
-// omicron_common::policy::CLICKHOUSE_KEEPER_REDUNDANCY once we enable
-// replicated ClickHouse
-// Set to 3 when testing replicated ClickHouse.
-const CLICKHOUSE_KEEPER_COUNT: usize = 0;
-// TODO(https://github.com/oxidecomputer/omicron/issues/732): Remove
-// when Nexus provisions Clickhouse server.
-// TODO(https://github.com/oxidecomputer/omicron/issues/4000): Use
-// omicron_common::policy::CLICKHOUSE_SERVER_REDUNDANCY once we enable
-// replicated ClickHouse.
-// Set to 2 when testing replicated ClickHouse
-const CLICKHOUSE_SERVER_COUNT: usize = 0;
-// TODO(https://github.com/oxidecomputer/omicron/issues/732): Remove.
-// when Nexus provisions Crucible.
 const MINIMUM_U2_COUNT: usize = 3;
 // TODO(https://github.com/oxidecomputer/omicron/issues/732): Remove.
 // when Nexus provisions the Pantry.
@@ -729,90 +709,6 @@ impl Plan {
             });
         }
 
-        // Provision Clickhouse server zones, continuing to stripe across sleds.
-        // TODO(https://github.com/oxidecomputer/omicron/issues/732): Remove
-        // Temporary linter rule until replicated Clickhouse is enabled
-        #[allow(clippy::reversed_empty_ranges)]
-        for _ in 0..CLICKHOUSE_SERVER_COUNT {
-            let sled = {
-                let which_sled =
-                    sled_allocator.next().ok_or(PlanError::NotEnoughSleds)?;
-                &mut sled_info[which_sled]
-            };
-            let id = OmicronZoneUuid::new_v4();
-            let ip = sled.addr_alloc.next().expect("Not enough addrs");
-            // TODO: This may need to be a different port if/when to have single node
-            // and replicated running side by side as per stage 1 of RFD 468.
-            let http_port = omicron_common::address::CLICKHOUSE_HTTP_PORT;
-            let http_address = SocketAddrV6::new(ip, http_port, 0, 0);
-            dns_builder
-                .host_zone_clickhouse(
-                    id,
-                    ip,
-                    ServiceName::ClickhouseServer,
-                    http_port,
-                )
-                .unwrap();
-            let dataset_name =
-                sled.alloc_dataset_from_u2s(DatasetKind::ClickhouseServer)?;
-            let filesystem_pool = Some(dataset_name.pool().clone());
-            sled.request.zones.push(BlueprintZoneConfig {
-                disposition: BlueprintZoneDisposition::InService,
-                id,
-                underlay_address: ip,
-                zone_type: BlueprintZoneType::ClickhouseServer(
-                    blueprint_zone_type::ClickhouseServer {
-                        address: http_address,
-                        dataset: OmicronZoneDataset {
-                            pool_name: dataset_name.pool().clone(),
-                        },
-                    },
-                ),
-                filesystem_pool,
-            });
-        }
-
-        // Provision Clickhouse Keeper zones, continuing to stripe across sleds.
-        // TODO(https://github.com/oxidecomputer/omicron/issues/732): Remove
-        // Temporary linter rule until replicated Clickhouse is enabled
-        #[allow(clippy::reversed_empty_ranges)]
-        for _ in 0..CLICKHOUSE_KEEPER_COUNT {
-            let sled = {
-                let which_sled =
-                    sled_allocator.next().ok_or(PlanError::NotEnoughSleds)?;
-                &mut sled_info[which_sled]
-            };
-            let id = OmicronZoneUuid::new_v4();
-            let ip = sled.addr_alloc.next().expect("Not enough addrs");
-            let port = omicron_common::address::CLICKHOUSE_KEEPER_TCP_PORT;
-            let address = SocketAddrV6::new(ip, port, 0, 0);
-            dns_builder
-                .host_zone_with_one_backend(
-                    id,
-                    ip,
-                    ServiceName::ClickhouseKeeper,
-                    port,
-                )
-                .unwrap();
-            let dataset_name =
-                sled.alloc_dataset_from_u2s(DatasetKind::ClickhouseKeeper)?;
-            let filesystem_pool = Some(dataset_name.pool().clone());
-            sled.request.zones.push(BlueprintZoneConfig {
-                disposition: BlueprintZoneDisposition::InService,
-                id,
-                underlay_address: ip,
-                zone_type: BlueprintZoneType::ClickhouseKeeper(
-                    blueprint_zone_type::ClickhouseKeeper {
-                        address,
-                        dataset: OmicronZoneDataset {
-                            pool_name: dataset_name.pool().clone(),
-                        },
-                    },
-                ),
-                filesystem_pool,
-            });
-        }
-
         // Provision Crucible Pantry zones, continuing to stripe across sleds.
         // TODO(https://github.com/oxidecomputer/omicron/issues/732): Remove
         for _ in 0..PANTRY_COUNT {