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
1 change: 1 addition & 0 deletions crates/stackable-versioned-macros/src/attrs/k8s.rs
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ pub(crate) struct KubernetesSkipArguments {
#[derive(Clone, Debug, FromMeta)]
pub(crate) struct KubernetesCrateArguments {
pub(crate) kube_core: Option<Path>,
pub(crate) kube_client: Option<Path>,
pub(crate) k8s_openapi: Option<Path>,
pub(crate) schemars: Option<Path>,
pub(crate) serde: Option<Path>,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,7 @@ impl From<KubernetesArguments> for KubernetesOptions {

#[derive(Debug)]
pub(crate) struct KubernetesCrateOptions {
pub(crate) kube_client: Override<Path>,
pub(crate) kube_core: Override<Path>,
pub(crate) k8s_openapi: Override<Path>,
pub(crate) schemars: Override<Path>,
Expand All @@ -319,6 +320,7 @@ pub(crate) struct KubernetesCrateOptions {
impl Default for KubernetesCrateOptions {
fn default() -> Self {
Self {
kube_client: Override::Default(parse_quote! { ::kube::client }),
k8s_openapi: Override::Default(parse_quote! { ::k8s_openapi }),
serde_json: Override::Default(parse_quote! { ::serde_json }),
kube_core: Override::Default(parse_quote! { ::kube::core }),
Expand All @@ -344,6 +346,10 @@ impl From<KubernetesCrateArguments> for KubernetesCrateOptions {
crate_options.kube_core = Override::Overridden(kube_core);
}

if let Some(kube_client) = args.kube_client {
crate_options.kube_client = Override::Overridden(kube_client);
}

if let Some(schemars) = args.schemars {
crate_options.schemars = Override::Overridden(schemars);
}
Expand All @@ -361,6 +367,7 @@ impl ToTokens for KubernetesCrateOptions {
let mut crate_overrides = TokenStream::new();

let KubernetesCrateOptions {
kube_client: _,
k8s_openapi,
serde_json,
kube_core,
Expand Down
7 changes: 7 additions & 0 deletions crates/stackable-versioned/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,18 @@ All notable changes to this project will be documented in this file.

## [Unreleased]

### Added

- Add `kube_client` crate override to `k8s(crates())` to specify a custom import path. This override
will not be passed to the `#[kube()]` attribute, but will only be available to internal
`#[versioned]` macro code ([#1038]).

### Fixed

- Correctly handle fields added in later versions ([#1031]).

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

## [0.7.1] - 2025-04-02

Expand Down
Loading