Skip to content

fix: Implement custom schema for config.affinity.nodeSelector #752

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Mar 26, 2024
Merged

fix: Implement custom schema for config.affinity.nodeSelector #752

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
605bb90
fix: Fixed wrong schema for `config.affinity.nodeSelector`
sbernauer Mar 22, 2024
d70baf1
Merge remote-tracking branch 'origin/main' into fix/node-selector-schema
sbernauer Mar 22, 2024
8053290
changelog
sbernauer Mar 22, 2024
9107737
Update CHANGELOG.md
sbernauer Mar 22, 2024
68f85f3
Add docs on stackable_node_selector_schema
sbernauer Mar 22, 2024
2ae3ac9
Rename stackable_node_selector_schema -> optional_stackable_node_sele…
sbernauer Mar 22, 2024
861bfc2
USe #[schemars(deny_unknown_fields)]
sbernauer Mar 25, 2024
ba50416
improve wording
sbernauer Mar 25, 2024
faf34a0
Merge branch 'main' into fix/node-selector-schema
sbernauer Mar 25, 2024
f05807d
typo
sbernauer Mar 25, 2024
5aba9ee
Merge remote-tracking branch 'origin/main' into fix/node-selector-schema
sbernauer Mar 25, 2024
8442946
changelog
sbernauer Mar 25, 2024
425e734
doccomment -> normal comment
sbernauer Mar 25, 2024
f6c311d
Merge branch 'main' into fix/node-selector-schema
sbernauer Mar 26, 2024
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
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,13 @@ All notable changes to this project will be documented in this file.
- Add `stackable_webhook` crate which provides utilities to create webhooks with TLS termination ([#730]).
- Add `ConversionReview` re-export in `stackable_webhook` crate ([#749]).

## Fixed

- Fix wrong schema (and thus CRD) for `config.affinity.nodeSelector` ([#752]).

[#730]: https://github.com/stackabletech/operator-rs/pull/730
[#749]: https://github.com/stackabletech/operator-rs/pull/749
[#752]: https://github.com/stackabletech/operator-rs/pull/752

## Changed

Expand Down
10 changes: 10 additions & 0 deletions crates/stackable-operator/src/commons/affinity.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,18 @@ pub struct StackableAffinity {
pub node_selector: Option<StackableNodeSelector>,
}

/// We can not simply use [`BTreeMap<String, String>`] in [`StackableAffinity`], as the fields need to be [`Atomic`].
/// 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
/// expected.
// FIXME: The generated JsonSchema will be wrong, so until https://github.com/GREsau/schemars/issues/259 is fixed, we
// need to use `#[schemars(deny_unknown_fields)]`.
// See https://github.com/stackabletech/operator-rs/pull/752#issuecomment-2017630433 for details.
#[derive(Clone, Debug, Eq, Deserialize, JsonSchema, PartialEq, Serialize)]
#[serde(rename_all = "camelCase")]
#[schemars(deny_unknown_fields)]
pub struct StackableNodeSelector {
#[serde(flatten)]
pub node_selector: BTreeMap<String, String>,
Expand Down