From 25cd674d48a39fdab71119356c8665a76227ba5d Mon Sep 17 00:00:00 2001 From: yuanchao <yuanchao@yunshan.net> Date: Tue, 26 Sep 2023 18:19:20 +0800 Subject: [PATCH] Add v4.6 to SupportedVersion --- Cargo.toml | 5 +++-- src/lib.rs | 10 +++------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index f304a94..3b83ec4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,8 +35,9 @@ api = ["http", "percent-encoding", "url"] v4_2 = [ "k8s-openapi/v1_15" ] v4_3 = [ "k8s-openapi/v1_16" ] v4_4 = [ "k8s-openapi/v1_17" ] -v4_5 = [ "k8s-openapi/v1_18" ] -v4_6 = [ "k8s-openapi/v1_19" ] +# Currently, https://github.com/ctron/openshift-openapi only supports v4.5 and k8s-openapi feature v1_18, +# So v4.5 here actually uses the latest version v4.6 and k8s-openapi feature v1_19. +v4_5 = [ "k8s-openapi/v1_19" ] [patch.crates-io] #k8s-openapi = { git = "https://github.com/Arnavion/k8s-openapi", branch="master" } diff --git a/src/lib.rs b/src/lib.rs index f9ba9b5..78544a5 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -465,17 +465,13 @@ mod v4_4; #[cfg(feature = "v4_4")] pub use self::v4_4::*; +// Currently, https://github.com/ctron/openshift-openapi only supports v4.5, +// So v4.5 here actually uses the latest version v4.6. #[cfg(feature = "v4_5")] -mod v4_5; -#[cfg(feature = "v4_5")] -pub use self::v4_5::*; - -#[cfg(feature = "v4_6")] mod v4_6; -#[cfg(feature = "v4_6")] +#[cfg(feature = "v4_5")] pub use self::v4_6::*; - include!(concat!( env!("OUT_DIR"), "/conditional_compilation_macros.rs"