Skip to content

Commit 8f58e0e

Browse files
committed
remove Optional from config_overrides
1 parent c5dc376 commit 8f58e0e

2 files changed

Lines changed: 8 additions & 10 deletions

File tree

deploy/helm/trino-operator/crds/crds.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ spec:
112112
configOverrides:
113113
additionalProperties:
114114
type: string
115+
default: {}
115116
description: The `configOverrides` allow overriding arbitrary client protocol properties.
116-
nullable: true
117117
type: object
118118
enabled:
119119
description: Enable spooling protocol.

rust/operator-binary/src/crd/client_protocol.rs

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ pub struct ClientSpoolingProtocolConfig {
3838

3939
/// The `configOverrides` allow overriding arbitrary client protocol properties.
4040
#[serde(default)]
41-
pub config_overrides: Option<HashMap<String, String>>,
41+
pub config_overrides: HashMap<String, String>,
4242
}
4343

4444
#[derive(Clone, Debug, Deserialize, JsonSchema, PartialEq, Serialize)]
@@ -145,11 +145,9 @@ impl ResolvedSpoolingProtocolConfig {
145145
]);
146146

147147
// Finally, extend the spooling manager properties with any user configuration
148-
if let Some(user_config) = config.config_overrides.as_ref() {
149-
resolved_config
150-
.spooling_manager_properties
151-
.extend(user_config.clone());
152-
}
148+
resolved_config
149+
.spooling_manager_properties
150+
.extend(config.config_overrides.clone());
153151

154152
Ok(resolved_config)
155153
}
@@ -273,7 +271,7 @@ mod tests {
273271
max_error_retries: None,
274272
upload_part_size: None,
275273
}),
276-
config_overrides: None,
274+
config_overrides: HashMap::new(),
277275
};
278276

279277
let resolved_spooling_config = ResolvedSpoolingProtocolConfig::from_config(
@@ -314,10 +312,10 @@ mod tests {
314312
max_error_retries: None,
315313
upload_part_size: None,
316314
}),
317-
config_overrides: Some(HashMap::from([(
315+
config_overrides: HashMap::from([(
318316
"protocol.spooling.retrieval-mode".to_string(),
319317
"STORAGE".to_string(),
320-
)])),
318+
)]),
321319
};
322320

323321
let resolved_spooling_config = ResolvedSpoolingProtocolConfig::from_config(

0 commit comments

Comments
 (0)