@@ -68,31 +68,19 @@ pub struct ValidatedRoleConfig {
6868}
6969
7070/// Per-rolegroup configuration: the merged CRD config plus overrides.
71- ///
72- /// This is the generic [`stackable_operator::v2::role_utils::RoleGroupConfig`]: the merged config
73- /// fragment in `config`, the typed `config_overrides` (role-group merged over role) and the merged
74- /// `env_overrides`/`cli_overrides`/`pod_overrides`. The config overrides are kept typed
75- /// ([`AirflowConfigOverrides`]) and flattened into the rendered config file later, in the build step.
7671pub type AirflowRoleGroupConfig = stackable_operator:: v2:: role_utils:: RoleGroupConfig <
7772 ValidatedAirflowConfig ,
7873 stackable_operator:: v2:: role_utils:: GenericCommonConfig ,
7974 AirflowConfigOverrides ,
8075> ;
8176
8277/// A validated, merged Airflow role-group config: the merged [`AirflowConfig`] with its raw
83- /// `logging` replaced by the up-front-validated [`ValidatedLogging`] (so an invalid custom log
84- /// ConfigMap name or a missing Vector aggregator name fails reconciliation during validation).
85- // Not `Clone`/`Debug`/`PartialEq`: `git_sync_resources` (a `GitSyncResources`) implements none of
86- // them, mirroring nifi's `ValidatedNifiConfig`.
78+ /// `logging` replaced by the up-front-validated [`ValidatedLogging`].
8779pub struct ValidatedAirflowConfig {
8880 pub resources : Resources < AirflowStorageConfig , NoRuntimeLimits > ,
8981 pub logging : ValidatedLogging ,
9082 pub affinity : StackableAffinity ,
9183 pub graceful_shutdown_timeout : Option < Duration > ,
92- /// The git-sync resources (containers, volumes, mounts) for the DAGs, resolved up-front in the
93- /// [`validate`] step (the env vars and logging differ per role group / executor, so they are
94- /// computed there). Consumed by the StatefulSet, executor-template and env-var builders, which
95- /// read it off here rather than reconstructing it.
9684 pub git_sync_resources : git_sync:: v1alpha2:: GitSyncResources ,
9785}
9886
@@ -143,10 +131,6 @@ pub struct ValidatedExecutorTemplate {
143131}
144132
145133/// Validated logging configuration for the containers of a role-group (or Kubernetes-executor) Pod.
146- ///
147- /// `product_container` holds the validated log-config choice of the product's main container
148- /// (`Container::Airflow` for the role groups, `Container::Base` for the Kubernetes-executor pod
149- /// template). `git_sync_container` holds the log config of the git-sync sidecar (DAG fetching).
150134#[ derive( Clone , Debug , PartialEq ) ]
151135pub struct ValidatedLogging {
152136 pub product_container : ValidatedContainerLogConfigChoice ,
@@ -323,9 +307,6 @@ impl ValidatedCluster {
323307 }
324308
325309 /// Type-safe names for the resources of a role group.
326- ///
327- /// Infallible: the combined name length was validated during cluster validation
328- /// (see `validate::validate_cluster`).
329310 pub fn resource_names (
330311 & self ,
331312 role_name : & RoleName ,
@@ -399,9 +380,6 @@ impl ValidatedCluster {
399380
400381 /// Returns an [`ObjectMetaBuilder`] pre-filled with the namespace, the resource `name`, an owner
401382 /// reference back to this cluster, and the given recommended `labels`.
402- ///
403- /// Consolidates the metadata chain repeated by the child-resource builders. Call sites that need
404- /// extra labels or annotations chain them onto the returned builder before `.build()`.
405383 pub ( crate ) fn object_meta ( & self , name : impl Into < String > , labels : Labels ) -> ObjectMetaBuilder {
406384 let mut builder = ObjectMetaBuilder :: new ( ) ;
407385 builder
0 commit comments