Skip to content

Commit 78f2e64

Browse files
committed
remove the "enabled" property
1 parent 8f58e0e commit 78f2e64

3 files changed

Lines changed: 5 additions & 19 deletions

File tree

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,6 @@ spec:
115115
default: {}
116116
description: The `configOverrides` allow overriding arbitrary client protocol properties.
117117
type: object
118-
enabled:
119-
description: Enable spooling protocol.
120-
type: boolean
121118
filesystem:
122119
oneOf:
123120
- required:
@@ -272,7 +269,6 @@ spec:
272269
location:
273270
type: string
274271
required:
275-
- enabled
276272
- filesystem
277273
- location
278274
type: object

docs/modules/trino/pages/usage-guide/client-spooling-protocol.adoc

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,14 @@ To enable it, you need to set the `spec.clusterConfig.clientSpoolingProtocol` co
1717
spec:
1818
clusterConfig:
1919
clientSpoolingProtocol:
20-
enabled: true # <1>
21-
location: "s3://spooling-bucket/trino/" # <2>
20+
location: "s3://spooling-bucket/trino/" # <1>
2221
filesystem:
23-
s3: # <3>
22+
s3: # <2>
2423
connection:
2524
reference: "minio"
2625
----
27-
<1> Enables the client spooling protocol
28-
<2> Specifies the location where spooled data will be stored. This example uses an S3 bucket.
29-
<3> Configures the filesystem type for spooling. Only S3 is supported currently via the custom resource definition.
26+
<1> Specifies the location where spooled data will be stored. This example uses an S3 bucket.
27+
<2> Configures the filesystem type for spooling. Only S3 is supported currently via the custom resource definition.
3028

3129
The operator automatically fills in additional settings required by Trino, such as the `protocol.spooling.shared-secret-key`.
3230
Users can change the contents of the `spooling-manager.properties` file by adding entries to the optional `spec.clusterConfig.clientSpoolingProtocol.config_overrides` map.

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

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ const SPOOLING_S3_AWS_SECRET_KEY: &str = "SPOOLING_S3_AWS_SECRET_KEY";
2626
#[derive(Clone, Debug, Deserialize, JsonSchema, PartialEq, Serialize)]
2727
#[serde(rename_all = "camelCase")]
2828
pub struct ClientSpoolingProtocolConfig {
29-
/// Enable spooling protocol.
30-
pub enabled: bool,
31-
3229
// Spool segment location. Each Trino cluster must have its own
3330
// location independent of any other clusters.
3431
pub location: String,
@@ -134,10 +131,7 @@ impl ResolvedSpoolingProtocolConfig {
134131

135132
// Enable spooling protocol
136133
resolved_config.config_properties.extend([
137-
(
138-
"protocol.spooling.enabled".to_string(),
139-
config.enabled.to_string(),
140-
),
134+
("protocol.spooling.enabled".to_string(), "true".to_string()),
141135
(
142136
"protocol.spooling.shared-secret-key".to_string(),
143137
format!("${{ENV:{secret}}}", secret = ENV_SPOOLING_SECRET),
@@ -259,7 +253,6 @@ mod tests {
259253
#[tokio::test]
260254
async fn test_spooling_config() {
261255
let config = ClientSpoolingProtocolConfig {
262-
enabled: true,
263256
location: "s3://my-bucket/spooling".to_string(),
264257
filesystem: SpoolingFileSystemConfig::S3(S3SpoolingConfig {
265258
connection:
@@ -300,7 +293,6 @@ mod tests {
300293
#[tokio::test]
301294
async fn test_spooling_config_overrides() {
302295
let config = ClientSpoolingProtocolConfig {
303-
enabled: true,
304296
location: "s3://my-bucket/spooling".to_string(),
305297
filesystem: SpoolingFileSystemConfig::S3(S3SpoolingConfig {
306298
connection:

0 commit comments

Comments
 (0)