Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 25 additions & 25 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ schemars = { version = "1.2.2", features = ["url2"] }
semver = "1.0.28"
serde = { version = "1.0.229", features = ["derive"] }
serde_json = "1.0.151"
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
yaml_serde = "0.10.7"
# Pinned to the old RustCrypto generation, see the const-oid comment above. sha2 0.11 uses
# digest 0.11 and signature 3.0, which rsa 0.9 does not support.
sha2 = { version = "0.10.9", features = ["oid"] }
Expand Down
6 changes: 6 additions & 0 deletions crates/k8s-version/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.

## [Unreleased]

### Changed

- Replace serde_yaml with yaml_serde ([#1298]).

[#1298]: https://github.com/stackabletech/operator-rs/pull/1298

## [0.1.3] - 2025-05-19

### Added
Expand Down
2 changes: 1 addition & 1 deletion crates/k8s-version/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ rstest.workspace = true
rstest_reuse.workspace = true
quote.workspace = true
proc-macro2.workspace = true
serde_yaml.workspace = true
yaml_serde.workspace = true
syn.workspace = true

[lints]
Expand Down
4 changes: 2 additions & 2 deletions crates/k8s-version/src/api_version/serde.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ mod tests {
#[test]
fn deserialize() {
let _: ApiVersion =
serde_yaml::from_str("extensions.k8s.io/v1alpha1").expect("api version is valid");
yaml_serde::from_str("extensions.k8s.io/v1alpha1").expect("api version is valid");
}

#[test]
Expand All @@ -56,7 +56,7 @@ mod tests {
ApiVersion::from_str("extensions.k8s.io/v1alpha1").expect("api version is valid");
assert_eq!(
"extensions.k8s.io/v1alpha1\n",
serde_yaml::to_string(&api_version).expect("api version must serialize")
yaml_serde::to_string(&api_version).expect("api version must serialize")
);
}
}
4 changes: 2 additions & 2 deletions crates/k8s-version/src/group.rs
Original file line number Diff line number Diff line change
Expand Up @@ -72,15 +72,15 @@ mod tests {

#[test]
fn deserialize() {
let _: Group = serde_yaml::from_str("extensions.k8s.io").expect("group is valid");
let _: Group = yaml_serde::from_str("extensions.k8s.io").expect("group is valid");
}

#[test]
fn serialize() {
let group = Group("extensions.k8s.io".into());
assert_eq!(
"extensions.k8s.io\n",
serde_yaml::to_string(&group).expect("group must serialize")
yaml_serde::to_string(&group).expect("group must serialize")
);
}
}
4 changes: 2 additions & 2 deletions crates/k8s-version/src/level/serde.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,15 @@ mod tests {

#[test]
fn deserialize() {
let _: Level = serde_yaml::from_str("alpha1").expect("level is valid");
let _: Level = yaml_serde::from_str("alpha1").expect("level is valid");
}

#[test]
fn serialize() {
let api_version = Level::from_str("alpha1").expect("level is valid");
assert_eq!(
"alpha1\n",
serde_yaml::to_string(&api_version).expect("level must serialize")
yaml_serde::to_string(&api_version).expect("level must serialize")
);
}
}
4 changes: 2 additions & 2 deletions crates/k8s-version/src/version/serde.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,15 @@ mod tests {

#[test]
fn deserialize() {
let _: Version = serde_yaml::from_str("v1alpha1").expect("version is valid");
let _: Version = yaml_serde::from_str("v1alpha1").expect("version is valid");
}

#[test]
fn serialize() {
let api_version = Version::from_str("v1alpha1").expect("version is valid");
assert_eq!(
"v1alpha1\n",
serde_yaml::to_string(&api_version).expect("version must serialize")
yaml_serde::to_string(&api_version).expect("version must serialize")
);
}
}
6 changes: 6 additions & 0 deletions crates/stackable-operator/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.

## [Unreleased]

### Changed

- Replace serde_yaml with yaml_serde ([#1298]).

[#1298]: https://github.com/stackabletech/operator-rs/pull/1298

## [0.120.0] - 2026-10-12

### Added
Expand Down
2 changes: 1 addition & 1 deletion crates/stackable-operator/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ regex.workspace = true
schemars.workspace = true
semver = { workspace = true, features = ["serde"] }
serde_json.workspace = true
serde_yaml.workspace = true
yaml_serde.workspace = true
serde.workspace = true
sha2.workspace = true
snafu.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion crates/stackable-operator/src/builder/pdb.rs
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ mod tests {
)]
#[kube(group = "test", version = "v1", kind = "TrinoCluster", namespaced)]
pub struct TrinoClusterSpec {}
let trino: TrinoCluster = serde_yaml::from_str(
let trino: TrinoCluster = yaml_serde::from_str(
"
apiVersion: test/v1
kind: TrinoCluster
Expand Down
4 changes: 2 additions & 2 deletions crates/stackable-operator/src/builder/pod/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ impl PodBuilder {
/// storageClassName: listeners.stackable.tech
/// name: listener
/// ",
/// serde_yaml::to_string(&pod).unwrap()
/// yaml_serde::to_string(&pod).unwrap()
/// )
/// ```
pub fn add_listener_volume_by_listener_class(
Expand Down Expand Up @@ -481,7 +481,7 @@ impl PodBuilder {
/// storageClassName: listeners.stackable.tech
/// name: listener
/// ",
/// serde_yaml::to_string(&pod).unwrap()
/// yaml_serde::to_string(&pod).unwrap()
/// )
/// ```
pub fn add_listener_volume_by_listener_name(
Expand Down
6 changes: 3 additions & 3 deletions crates/stackable-operator/src/commons/affinity.rs
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ pub struct StackableAffinity {
// We can not mark it as [`Atomic`], as [`crate::config::fragment::FromFragment`] is already implemented for
// [`BTreeMap<String, String>`].
//
// We `#[serde(flatten)]` the contained [`BTreeMap<String, String>`], so `serde_yaml` can deserialize everything as
// We `#[serde(flatten)]` the contained [`BTreeMap<String, String>`], so `yaml_serde` can deserialize everything as
// expected.
#[derive(Clone, Debug, Eq, Deserialize, JsonSchema, PartialEq, Serialize)]
#[serde(rename_all = "camelCase")]
Expand Down Expand Up @@ -176,7 +176,7 @@ mod tests {
disktype: ssd
";
let mut role_affinity: StackableAffinityFragment =
serde_yaml::from_str(role_input).expect("illegal test input");
yaml_serde::from_str(role_input).expect("illegal test input");

role_affinity.merge(&default_affinity);
let merged_affinity: StackableAffinity = fragment::validate(role_affinity).unwrap();
Expand Down Expand Up @@ -277,7 +277,7 @@ mod tests {
topologyKey: topology.kubernetes.io/zone
";
let mut role_affinity: StackableAffinityFragment =
serde_yaml::from_str(role_input).expect("illegal test input");
yaml_serde::from_str(role_input).expect("illegal test input");

role_affinity.merge(&default_affinity);
let merged_affinity: StackableAffinity = fragment::validate(role_affinity).unwrap();
Expand Down
2 changes: 1 addition & 1 deletion crates/stackable-operator/src/commons/cache.rs
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ mod tests {

#[test]
fn test_deserialization() {
let my_cache: MyCache = serde_yaml::from_str("entryTimeToLive: 13h\n").unwrap();
let my_cache: MyCache = yaml_serde::from_str("entryTimeToLive: 13h\n").unwrap();

assert_eq!(
my_cache.entry_time_to_live,
Expand Down
4 changes: 2 additions & 2 deletions crates/stackable-operator/src/commons/opa.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
//! opa: Option<OpaConfig>,
//! }
//!
//! let cluster: TestCluster = serde_yaml::from_str(
//! let cluster: TestCluster = yaml_serde::from_str(
//! "
//! apiVersion: test.stackable.tech/v1alpha1
//! kind: TestCluster
Expand Down Expand Up @@ -353,7 +353,7 @@ mod tests {
}

fn build_test_cluster() -> TestCluster {
serde_yaml::from_str(&format!(
yaml_serde::from_str(&format!(
"
apiVersion: test/v1
kind: TestCluster
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -760,7 +760,7 @@ mod tests {
#[case] input: String,
#[case] expected: ResolvedProductImage,
) {
let product_image: ProductImage = serde_yaml::from_str(&input).expect("Illegal test input");
let product_image: ProductImage = yaml_serde::from_str(&input).expect("Illegal test input");
let operator_version = operator_version.parse().expect("invalid operator version");
let resolved_product_image = product_image
.resolve(&image_name, &image_repository, &operator_version)
Expand All @@ -787,7 +787,7 @@ mod tests {
"data did not match any variant of untagged enum ProductImageSelection"
)]
fn resolved_image_fail(#[case] input: String, #[case] expected: String) {
let err = serde_yaml::from_str::<ProductImage>(&input).expect_err("Must be error");
let err = yaml_serde::from_str::<ProductImage>(&input).expect_err("Must be error");

assert_eq!(err.to_string(), expected);
}
Expand Down
2 changes: 1 addition & 1 deletion crates/stackable-operator/src/commons/rbac.rs
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ mod tests {
}

fn build_test_resource() -> TestCluster {
serde_yaml::from_str(&format!(
yaml_serde::from_str(&format!(
"
apiVersion: test/v1
kind: TestCluster
Expand Down
Loading
Loading