catalog: give default cluster disk if cc size

The default cluster should be created with disk if it is using a cc
size. This brings the logic in line with how all other clusters are
created.

Author: benesch

src/catalog/src/durable/initialize.rs

@@ -12,7 +12,7 @@ use std::time::Duration;
 use itertools::max;
 use mz_audit_log::{EventV1, VersionedEvent};
 use mz_controller::clusters::ReplicaLogging;
-use mz_controller_types::{ClusterId, ReplicaId};
+use mz_controller_types::{is_cluster_size_v2, ClusterId, ReplicaId};
 use mz_ore::now::EpochMillis;
 use mz_pgrepr::oid::{
     FIRST_USER_OID, ROLE_PUBLIC_OID, SCHEMA_INFORMATION_SCHEMA_OID, SCHEMA_MZ_CATALOG_OID,
@@ -555,7 +555,7 @@ pub async fn initialize(
             replica_name: DEFAULT_USER_REPLICA_NAME.to_string(),
             replica_id: Some(DEFAULT_USER_REPLICA_ID.to_string()),
             logical_size: options.default_cluster_replica_size.to_string(),
-            disk: false,
+            disk: is_cluster_size_v2(&options.default_cluster_replica_size),
             billed_as: None,
             internal: false,
         }),
@@ -631,7 +631,7 @@ fn default_cluster_config(args: &BootstrapArgs) -> ClusterConfig {
                 interval: Some(Duration::from_secs(1)),
             },
             idle_arrangement_merge_effort: None,
-            disk: false,
+            disk: is_cluster_size_v2(&args.default_cluster_replica_size),
             optimizer_feature_overrides: Default::default(),
             schedule: Default::default(),
         }),
@@ -644,7 +644,7 @@ fn default_replica_config(args: &BootstrapArgs) -> ReplicaConfig {
         location: ReplicaLocation::Managed {
             size: args.default_cluster_replica_size.to_string(),
             availability_zone: None,
-            disk: false,
+            disk: is_cluster_size_v2(&args.default_cluster_replica_size),
             internal: false,
             billed_as: None,
         },