Skip to content

Commit 6d6615b

Browse files
authored
chore: Bump k8s compilation version to 1.29. Also bump all dependencies (#769)
* Do the bump * chore: Bump k8s compilation version to 1.29. Also bump all dependencies * changelogs * Improve changelogs
1 parent 71a446b commit 6d6615b

File tree

8 files changed

+45
-39
lines changed

8 files changed

+45
-39
lines changed

Cargo.toml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ repository = "https://github.com/stackabletech/operator-rs"
1212
product-config = { git = "https://github.com/stackabletech/product-config.git", tag = "0.6.0" }
1313

1414
axum = "0.7.5"
15-
chrono = { version = "0.4.37", default-features = false }
15+
chrono = { version = "0.4.38", default-features = false }
1616
clap = { version = "4.5.4", features = ["derive", "cargo", "env"] }
1717
const_format = "0.2.32"
1818
const-oid = "0.9.6"
@@ -21,15 +21,15 @@ delegate = "0.12.0"
2121
derivative = "2.2.0"
2222
dockerfile-parser = "0.8.0"
2323
ecdsa = { version = "0.16.9", features = ["digest", "pem"] }
24-
either = "1.10.0"
24+
either = "1.11.0"
2525
futures = "0.3.30"
2626
futures-util = "0.3.30"
27-
hyper = { version = "1.2.0", features = ["full"] }
27+
hyper = { version = "1.3.1", features = ["full"] }
2828
hyper-util = "0.1.3"
2929
json-patch = "1.2.0"
30-
k8s-openapi = { version = "0.21.1", default-features = false, features = ["schemars", "v1_28"] }
30+
k8s-openapi = { version = "0.21.1", default-features = false, features = ["schemars", "v1_29"] }
3131
# We use rustls instead of openssl for easier portablitly, e.g. so that we can build stackablectl without the need to vendor (build from source) openssl
32-
kube = { version = "0.89.0", default-features = false, features = ["client", "jsonpatch", "runtime", "derive", "rustls-tls"] }
32+
kube = { version = "0.90.0", default-features = false, features = ["client", "jsonpatch", "runtime", "derive", "rustls-tls"] }
3333
lazy_static = "1.4.0"
3434
opentelemetry = "0.22.0"
3535
opentelemetry_sdk = { version = "0.22.1", features = ["rt-tokio"] }
@@ -39,27 +39,27 @@ opentelemetry-otlp = "0.15.0"
3939
opentelemetry-semantic-conventions = "0.14.0"
4040
p256 = { version = "0.13.2", features = ["ecdsa"] }
4141
pin-project = "1.1.5"
42-
proc-macro2 = "1.0.79"
43-
quote = "1.0.35"
42+
proc-macro2 = "1.0.81"
43+
quote = "1.0.36"
4444
rand = "0.8.5"
4545
rand_core = "0.6.4"
4646
regex = "1.10.4"
4747
rsa = { version = "0.9.6", features = ["sha2"] }
48-
rstest = "0.18.2"
48+
rstest = "0.19.0"
4949
schemars = { version = "0.8.16", features = ["url"] }
5050
semver = "1.0.22"
51-
serde = { version = "1.0.197", features = ["derive"] }
52-
serde_json = "1.0.115"
53-
serde_yaml = "0.9.34"
51+
serde = { version = "1.0.198", features = ["derive"] }
52+
serde_json = "1.0.116"
53+
serde_yaml = "0.9.34" # This is the last available version, see https://github.com/dtolnay/serde-yaml/releases/tag/0.9.34 for details
5454
sha2 = { version = "0.10.8", features = ["oid"] }
5555
signature = "2.2.0"
5656
snafu = "0.8.2"
5757
stackable-operator-derive = { path = "stackable-operator-derive" }
5858
strum = { version = "0.26.2", features = ["derive"] }
59-
syn = "2.0.55"
59+
syn = "2.0.60"
6060
tempfile = "3.10.1"
61-
time = { version = "0.3.34" }
62-
tokio = { version = "1.36.0", features = ["macros", "rt-multi-thread", "fs"] }
61+
time = { version = "0.3.36" }
62+
tokio = { version = "1.37.0", features = ["macros", "rt-multi-thread", "fs"] }
6363
tokio-rustls = "0.26.0"
6464
tokio-test = "0.4.4"
6565
tower = "0.4.13"
@@ -69,7 +69,7 @@ tracing-opentelemetry = "0.23.0"
6969
tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
7070
url = { version = "2.5.0", features = ["serde"] }
7171
x509-cert = { version = "0.2.5", features = ["builder"] }
72-
zeroize = "1.7.0"
72+
zeroize = "1.8.0"
7373

7474
# Use O3 in tests to improve the RSA key generation speed in the stackable-certs crate
7575
[profile.test.package.stackable-certs]

crates/stackable-certs/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,12 @@ All notable changes to this project will be documented in this file.
77
### Changed
88

99
- Bump kube to 0.89.0 and update all dependencies ([#762]).
10+
- BREAKING: Bump k8s compilation version to `1.29`. Also bump all dependencies.
11+
There are some breaking changes in k8s-openapi, e.g. PVCs now have `VolumeResourceRequirements` instead of `ResourceRequirements`,
12+
and `PodAffinityTerm` has two new fields `match_label_keys` and `mismatch_label_keys` ([#769]).
1013

1114
[#762]: https://github.com/stackabletech/operator-rs/pull/762
15+
[#769]: https://github.com/stackabletech/operator-rs/pull/769
1216

1317
## [0.2.0] - 2024-03-26
1418

crates/stackable-operator-derive/CHANGELOG.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,6 @@ All notable changes to this project will be documented in this file.
44

55
## [Unreleased]
66

7-
### Changed
8-
9-
- Bump kube to 0.89.0 and update all dependencies ([#762]).
10-
11-
[#762]: https://github.com/stackabletech/operator-rs/pull/762
12-
137
## [0.2.0] - 2024-03-26
148

159
### Changed

crates/stackable-operator/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,17 @@ All notable changes to this project will be documented in this file.
77
### Changed
88

99
- Bump kube to 0.89.0 and update all dependencies ([#762]).
10+
- BREAKING: Bump k8s compilation version to `1.29`. Also bump all dependencies.
11+
There are some breaking changes in k8s-openapi, e.g. PVCs now have `VolumeResourceRequirements` instead of `ResourceRequirements`,
12+
and `PodAffinityTerm` has two new fields `match_label_keys` and `mismatch_label_keys` ([#769]).
1013

1114
### Removed
1215

1316
- BREAKING: Remove `thiserror` dependency, and deprecated builder exports ([#761])
1417

1518
[#761]: https://github.com/stackabletech/operator-rs/pull/761
1619
[#762]: https://github.com/stackabletech/operator-rs/pull/762
20+
[#769]: https://github.com/stackabletech/operator-rs/pull/769
1721

1822
## [0.66.0] - 2024-03-26
1923

crates/stackable-operator/src/builder/pod/volume.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ use k8s_openapi::{
33
CSIVolumeSource, ConfigMapVolumeSource, DownwardAPIVolumeSource, EmptyDirVolumeSource,
44
EphemeralVolumeSource, HostPathVolumeSource, PersistentVolumeClaim,
55
PersistentVolumeClaimSpec, PersistentVolumeClaimTemplate,
6-
PersistentVolumeClaimVolumeSource, ProjectedVolumeSource, ResourceRequirements,
7-
SecretVolumeSource, Volume, VolumeMount,
6+
PersistentVolumeClaimVolumeSource, ProjectedVolumeSource, SecretVolumeSource, Volume,
7+
VolumeMount, VolumeResourceRequirements,
88
},
99
apimachinery::pkg::api::resource::Quantity,
1010
};
@@ -358,9 +358,9 @@ impl SecretOperatorVolumeSourceBuilder {
358358
metadata: Some(ObjectMetaBuilder::new().annotations(annotations).build()),
359359
spec: PersistentVolumeClaimSpec {
360360
storage_class_name: Some("secrets.stackable.tech".to_string()),
361-
resources: Some(ResourceRequirements {
361+
resources: Some(VolumeResourceRequirements {
362362
requests: Some([("storage".to_string(), Quantity("1".to_string()))].into()),
363-
..ResourceRequirements::default()
363+
..Default::default()
364364
}),
365365
access_modes: Some(vec!["ReadWriteOnce".to_string()]),
366366
..PersistentVolumeClaimSpec::default()
@@ -465,9 +465,9 @@ impl ListenerOperatorVolumeSourceBuilder {
465465
fn build_spec(&self) -> PersistentVolumeClaimSpec {
466466
PersistentVolumeClaimSpec {
467467
storage_class_name: Some("listeners.stackable.tech".to_string()),
468-
resources: Some(ResourceRequirements {
468+
resources: Some(VolumeResourceRequirements {
469469
requests: Some([("storage".to_string(), Quantity("1".to_string()))].into()),
470-
..ResourceRequirements::default()
470+
..Default::default()
471471
}),
472472
access_modes: Some(vec!["ReadWriteMany".to_string()]),
473473
..PersistentVolumeClaimSpec::default()

crates/stackable-operator/src/commons/affinity.rs

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,8 @@ pub fn affinity_between_role_pods(
8585
namespace_selector: None,
8686
namespaces: None,
8787
topology_key: TOPOLOGY_KEY_HOSTNAME.to_string(),
88+
match_label_keys: None,
89+
mismatch_label_keys: None,
8890
},
8991
weight,
9092
}
@@ -110,6 +112,8 @@ pub fn affinity_between_cluster_pods(
110112
namespace_selector: None,
111113
namespaces: None,
112114
topology_key: TOPOLOGY_KEY_HOSTNAME.to_string(),
115+
match_label_keys: None,
116+
mismatch_label_keys: None,
113117
},
114118
weight,
115119
}
@@ -183,9 +187,8 @@ mod tests {
183187
}]),
184188
match_labels: None,
185189
}),
186-
namespace_selector: None,
187-
namespaces: None,
188190
topology_key: "".to_string(),
191+
..Default::default()
189192
}
190193
])
191194
}),
@@ -207,9 +210,8 @@ mod tests {
207210
)
208211
]))
209212
}),
210-
namespace_selector: None,
211-
namespaces: None,
212213
topology_key: TOPOLOGY_KEY_HOSTNAME.to_string(),
214+
..Default::default()
213215
},
214216
weight: 70
215217
}
@@ -293,9 +295,8 @@ mod tests {
293295
)
294296
]))
295297
}),
296-
namespace_selector: None,
297-
namespaces: None,
298298
topology_key: "topology.kubernetes.io/zone".to_string(),
299+
..Default::default()
299300
}
300301
]),
301302
}),
@@ -330,9 +331,8 @@ mod tests {
330331
)
331332
]))
332333
}),
333-
namespace_selector: None,
334-
namespaces: None,
335334
topology_key: TOPOLOGY_KEY_HOSTNAME.to_string(),
335+
..Default::default()
336336
},
337337
weight: 70
338338
}
@@ -359,9 +359,8 @@ mod tests {
359359
)
360360
]))
361361
}),
362-
namespace_selector: None,
363-
namespaces: None,
364362
topology_key: TOPOLOGY_KEY_HOSTNAME.to_string(),
363+
..Default::default()
365364
},
366365
weight: 20
367366
}

crates/stackable-operator/src/commons/resources.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ use crate::{
7979
use derivative::Derivative;
8080
use k8s_openapi::api::core::v1::{
8181
Container, PersistentVolumeClaim, PersistentVolumeClaimSpec, PodSpec, ResourceRequirements,
82+
VolumeResourceRequirements,
8283
};
8384
use k8s_openapi::apimachinery::pkg::api::resource::Quantity;
8485
use k8s_openapi::apimachinery::pkg::apis::meta::v1::{LabelSelector, ObjectMeta};
@@ -316,15 +317,15 @@ impl PvcConfig {
316317
.map(|modes| modes.into_iter().map(String::from).collect()),
317318
selector: self.selectors.clone(),
318319
storage_class_name: self.storage_class.clone(),
319-
resources: Some(ResourceRequirements {
320+
resources: Some(VolumeResourceRequirements {
320321
requests: Some({
321322
let mut map = BTreeMap::new();
322323
if let Some(capacity) = &self.capacity {
323324
map.insert("storage".to_string(), capacity.clone());
324325
}
325326
map
326327
}),
327-
..ResourceRequirements::default()
328+
..Default::default()
328329
}),
329330
..PersistentVolumeClaimSpec::default()
330331
}),

crates/stackable-webhook/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,14 @@ All notable changes to this project will be documented in this file.
1212
### Changed
1313

1414
- Bump kube to 0.89.0 and update all dependencies ([#762]).
15+
- BREAKING: Bump k8s compilation version to `1.29`. Also bump all dependencies.
16+
There are some breaking changes in k8s-openapi, e.g. PVCs now have `VolumeResourceRequirements` instead of `ResourceRequirements`,
17+
and `PodAffinityTerm` has two new fields `match_label_keys` and `mismatch_label_keys` ([#769]).
1518

1619
[#758]: https://github.com/stackabletech/operator-rs/pull/758
1720
[#762]: https://github.com/stackabletech/operator-rs/pull/762
1821
[#767]: https://github.com/stackabletech/operator-rs/pull/767
22+
[#769]: https://github.com/stackabletech/operator-rs/pull/769
1923

2024
## [0.2.0] - 2024-03-26
2125

0 commit comments

Comments
 (0)