Skip to content

Do not emit additionalPrinterColumns, categories, shortNames when empty #1751

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Do not emit additionalPrinterColumns, categories, shortNames when empty #1751

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 19 additions & 7 deletions kube-derive/src/custom_resource.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -672,19 +672,17 @@ pub(crate) fn derive(input: proc_macro2::TokenStream) -> proc_macro2::TokenStrea
let jsondata = quote! {
#schemagen

let jsondata = #serde_json::json!({
let mut jsondata = #serde_json::json!({
"metadata": {
#crd_meta
},
"spec": {
"group": #group,
"scope": #scope,
"names": {
"categories": categories,
"plural": #plural,
"singular": #name,
"kind": #kind,
"shortNames": shorts
},
"versions": [{
"name": #version,
Expand All @@ -694,7 +692,6 @@ pub(crate) fn derive(input: proc_macro2::TokenStream) -> proc_macro2::TokenStrea
"schema": {
"openAPIV3Schema": schema,
},
"additionalPrinterColumns": columns,
#selectable
"subresources": subres,
}],
Expand All @@ -707,13 +704,10 @@ pub(crate) fn derive(input: proc_macro2::TokenStream) -> proc_macro2::TokenStrea
impl #extver::CustomResourceExt for #rootident {

fn crd() -> #apiext::CustomResourceDefinition {
let columns : Vec<#apiext::CustomResourceColumnDefinition> = #serde_json::from_str(#printers).expect("valid printer column json");
#k8s_openapi::k8s_if_ge_1_30! {
let fields : Vec<#apiext::SelectableField> = #serde_json::from_str(#fields).expect("valid selectableField column json");
}
let scale: Option<#apiext::CustomResourceSubresourceScale> = #scale;
let categories: Vec<String> = #serde_json::from_str(#categories_json).expect("valid categories");
let shorts : Vec<String> = #serde_json::from_str(#short_json).expect("valid shortnames");
let subres = if #has_status {
if let Some(s) = &scale {
#serde_json::json!({
Expand All @@ -728,6 +722,24 @@ pub(crate) fn derive(input: proc_macro2::TokenStream) -> proc_macro2::TokenStrea
};

#jsondata

// These fields should only be set if they are non-empty to avoid reconciliation issues as the kube
// server will omit them when empty.
let columns: Vec<#apiext::CustomResourceColumnDefinition> = #serde_json::from_str(#printers).expect("valid printer column json");
if !columns.is_empty() {
jsondata["spec"]["versions"][0]["additionalPrinterColumns"] = #serde_json::json!(columns);
}

let categories: Vec<String> = #serde_json::from_str(#categories_json).expect("valid categories");
if !categories.is_empty() {
jsondata["spec"]["names"]["categories"] = #serde_json::json!(categories);
}

let shorts: Vec<String> = #serde_json::from_str(#short_json).expect("valid shortnames");
if !shorts.is_empty() {
jsondata["spec"]["names"]["shortNames"] = #serde_json::json!(shorts);
}

#serde_json::from_value(jsondata)
.expect("valid custom resource from #[kube(attrs..)]")
}
Expand Down
Loading