Skip to content

Commit c387429

Browse files
maltesandermaltesander
authored
bump dependencies (#591)
1 parent be58dda commit c387429

File tree

21 files changed

+2915
-1770
lines changed

21 files changed

+2915
-1770
lines changed

‎Cargo.lock

Lines changed: 538 additions & 487 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.nix

Lines changed: 1159 additions & 902 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,22 @@ repository = "https://github.com/stackabletech/trino-operator"
1212
[workspace.dependencies]
1313
anyhow = "1.0"
1414
async-trait = "0.1"
15-
built = { version = "0.6", features = ["chrono", "git2"] }
16-
clap = "4.3"
15+
built = { version = "0.7", features = ["chrono", "git2"] }
16+
clap = "4.5"
1717
futures = { version = "0.3", features = ["compat"] }
1818
indoc = "2.0"
1919
openssl = "0.10"
2020
pin-project = "1.1"
21-
rstest = "0.18"
21+
rstest = "0.19"
2222
semver = "1.0"
2323
serde = { version = "1.0", features = ["derive"] }
2424
serde_json = "1.0"
2525
serde_yaml = "0.9"
26-
snafu = "0.7"
27-
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.64.0" }
26+
snafu = "0.8"
27+
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.67.1" }
2828
product-config = { git = "https://github.com/stackabletech/product-config.git", tag = "0.6.0" }
29-
strum = { version = "0.25", features = ["derive"] }
30-
tokio = { version = "1.29", features = ["full"] }
29+
strum = { version = "0.26", features = ["derive"] }
30+
tokio = { version = "1.37", features = ["full"] }
3131
tracing = "0.1"
3232

3333
# [patch."https://github.com/stackabletech/operator-rs.git"]

‎crate-hashes.json

Lines changed: 293 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 844 additions & 284 deletions
Large diffs are not rendered by default.

‎rust/crd/src/affinity.rs

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -139,18 +139,17 @@ mod tests {
139139
WeightedPodAffinityTerm {
140140
pod_affinity_term: PodAffinityTerm {
141141
label_selector: Some(LabelSelector {
142-
match_expressions: None,
143142
match_labels: Some(BTreeMap::from([
144143
("app.kubernetes.io/name".to_string(), "trino".to_string()),
145144
(
146145
"app.kubernetes.io/instance".to_string(),
147146
"simple-trino".to_string(),
148147
),
149148
])),
149+
..LabelSelector::default()
150150
}),
151-
namespace_selector: None,
152-
namespaces: None,
153151
topology_key: "kubernetes.io/hostname".to_string(),
152+
..PodAffinityTerm::default()
154153
},
155154
weight: 20,
156155
}
@@ -162,7 +161,6 @@ mod tests {
162161
WeightedPodAffinityTerm {
163162
pod_affinity_term: PodAffinityTerm {
164163
label_selector: Some(LabelSelector {
165-
match_expressions: None,
166164
match_labels: Some(BTreeMap::from([
167165
("app.kubernetes.io/name".to_string(), "trino".to_string(),),
168166
(
@@ -173,11 +171,11 @@ mod tests {
173171
"app.kubernetes.io/component".to_string(),
174172
role.to_string(),
175173
)
176-
]))
174+
])),
175+
..LabelSelector::default()
177176
}),
178-
namespace_selector: None,
179-
namespaces: None,
180177
topology_key: "kubernetes.io/hostname".to_string(),
178+
..PodAffinityTerm::default()
181179
},
182180
weight: 70
183181
}
@@ -281,18 +279,17 @@ mod tests {
281279
let mut expected_affinities = vec![WeightedPodAffinityTerm {
282280
pod_affinity_term: PodAffinityTerm {
283281
label_selector: Some(LabelSelector {
284-
match_expressions: None,
285282
match_labels: Some(BTreeMap::from([
286283
("app.kubernetes.io/name".to_string(), "trino".to_string()),
287284
(
288285
"app.kubernetes.io/instance".to_string(),
289286
"simple-trino".to_string(),
290287
),
291288
])),
289+
..LabelSelector::default()
292290
}),
293-
namespace_selector: None,
294-
namespaces: None,
295291
topology_key: "kubernetes.io/hostname".to_string(),
292+
..PodAffinityTerm::default()
296293
},
297294
weight: 20,
298295
}];
@@ -302,7 +299,6 @@ mod tests {
302299
expected_affinities.push(WeightedPodAffinityTerm {
303300
pod_affinity_term: PodAffinityTerm {
304301
label_selector: Some(LabelSelector {
305-
match_expressions: None,
306302
match_labels: Some(BTreeMap::from([
307303
("app.kubernetes.io/name".to_string(), "hive".to_string()),
308304
(
@@ -314,17 +310,16 @@ mod tests {
314310
"metastore".to_string(),
315311
),
316312
])),
313+
..LabelSelector::default()
317314
}),
318-
namespace_selector: None,
319-
namespaces: None,
320315
topology_key: "kubernetes.io/hostname".to_string(),
316+
..PodAffinityTerm::default()
321317
},
322318
weight: 50,
323319
});
324320
expected_affinities.push(WeightedPodAffinityTerm {
325321
pod_affinity_term: PodAffinityTerm {
326322
label_selector: Some(LabelSelector {
327-
match_expressions: None,
328323
match_labels: Some(BTreeMap::from([
329324
("app.kubernetes.io/name".to_string(), "hive".to_string()),
330325
(
@@ -336,10 +331,10 @@ mod tests {
336331
"metastore".to_string(),
337332
),
338333
])),
334+
..LabelSelector::default()
339335
}),
340-
namespace_selector: None,
341-
namespaces: None,
342336
topology_key: "kubernetes.io/hostname".to_string(),
337+
..PodAffinityTerm::default()
343338
},
344339
weight: 50,
345340
});
@@ -348,7 +343,6 @@ mod tests {
348343
expected_affinities.push(WeightedPodAffinityTerm {
349344
pod_affinity_term: PodAffinityTerm {
350345
label_selector: Some(LabelSelector {
351-
match_expressions: None,
352346
match_labels: Some(BTreeMap::from([
353347
("app.kubernetes.io/name".to_string(), "hdfs".to_string()),
354348
(
@@ -360,10 +354,10 @@ mod tests {
360354
"datanode".to_string(),
361355
),
362356
])),
357+
..LabelSelector::default()
363358
}),
364-
namespace_selector: None,
365-
namespaces: None,
366359
topology_key: "kubernetes.io/hostname".to_string(),
360+
..PodAffinityTerm::default()
367361
},
368362
weight: 50,
369363
});
@@ -382,7 +376,6 @@ mod tests {
382376
WeightedPodAffinityTerm {
383377
pod_affinity_term: PodAffinityTerm {
384378
label_selector: Some(LabelSelector {
385-
match_expressions: None,
386379
match_labels: Some(BTreeMap::from([
387380
("app.kubernetes.io/name".to_string(), "trino".to_string(),),
388381
(
@@ -393,11 +386,11 @@ mod tests {
393386
"app.kubernetes.io/component".to_string(),
394387
role.to_string(),
395388
)
396-
]))
389+
])),
390+
..LabelSelector::default()
397391
}),
398-
namespace_selector: None,
399-
namespaces: None,
400392
topology_key: "kubernetes.io/hostname".to_string(),
393+
..PodAffinityTerm::default()
401394
},
402395
weight: 70
403396
}

‎rust/crd/src/authentication.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ use stackable_operator::{
1111
pub enum Error {
1212
#[snafu(display("Failed to retrieve AuthenticationClass"))]
1313
AuthenticationClassRetrieval {
14-
source: stackable_operator::error::Error,
14+
source: stackable_operator::client::Error,
1515
},
1616

1717
#[snafu(display("Invalid OIDC configuration"))]
1818
InvalidOidcConfiguration {
19-
source: stackable_operator::error::Error,
19+
source: stackable_operator::commons::authentication::Error,
2020
},
2121
}
2222

‎rust/crd/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ use stackable_operator::{
2828
},
2929
k8s_openapi::apimachinery::pkg::{api::resource::Quantity, apis::meta::v1::LabelSelector},
3030
kube::{runtime::reflector::ObjectRef, CustomResource, ResourceExt},
31-
product_config_utils::{ConfigError, Configuration},
31+
product_config_utils::{Configuration, Error as ConfigError},
3232
product_logging,
3333
product_logging::spec::Logging,
3434
role_utils::{GenericRoleConfig, Role, RoleGroup, RoleGroupRef},
@@ -554,7 +554,7 @@ impl Configuration for TrinoConfigFragment {
554554
// Therefore from here on we can use resource.get_server_tls() as the only source
555555
// of truth when enabling client TLS.
556556
if authentication_enabled && !server_tls_enabled {
557-
return Err(ConfigError::InvalidConfiguration {
557+
return Err(ConfigError::InvalidProductSpecificConfiguration {
558558
reason:
559559
"Trino requires client TLS to be enabled if any authentication method is enabled! TLS was set to null. \
560560
Please set 'spec.clusterConfig.tls.secretClass' or use the provided default value.".to_string(),

‎rust/operator-binary/build.rs

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
use std::path::PathBuf;
2-
31
fn main() {
4-
let out_dir = PathBuf::from(std::env::var("OUT_DIR").expect("OUT_DIR is required"));
5-
built::write_built_file_with_opts(
6-
// built's env module depends on a whole bunch of variables that crate2nix doesn't provide
7-
// so we grab the specific env variables that we care about out ourselves instead.
8-
built::Options::default().set_env(false),
9-
"Cargo.toml".as_ref(),
10-
&out_dir.join("built.rs"),
11-
)
12-
.unwrap();
2+
built::write_built_file().unwrap();
133
}

‎rust/operator-binary/src/authentication/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use std::collections::{BTreeMap, HashMap};
1111

1212
use snafu::{OptionExt, ResultExt, Snafu};
1313
use stackable_operator::{
14-
builder::{ContainerBuilder, PodBuilder},
14+
builder::pod::{container::ContainerBuilder, PodBuilder},
1515
commons::{
1616
authentication::{AuthenticationClass, AuthenticationClassProvider},
1717
product_image_selection::ResolvedProductImage,

0 commit comments

Comments
 (0)