From 9ed4995031d7c3176dc15fe95b1a86029e44095f Mon Sep 17 00:00:00 2001 From: clux Date: Thu, 15 Sep 2022 21:52:12 +0100 Subject: [PATCH] just bump-k8s Signed-off-by: clux --- .github/workflows/ci.yml | 4 ++-- README.md | 6 +++--- e2e/Cargo.toml | 4 ++-- examples/Cargo.toml | 2 +- justfile | 2 +- kube-client/Cargo.toml | 4 ++-- kube-core/Cargo.toml | 4 ++-- kube-derive/Cargo.toml | 2 +- kube-runtime/Cargo.toml | 4 ++-- kube/Cargo.toml | 4 ++-- release.toml | 4 ++-- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6346e0549..13fcfc117 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -122,7 +122,7 @@ jobs: fail-fast: false matrix: # Run these tests against older clusters as well - k8s: [v1.19, latest] + k8s: [v1.20, latest] steps: - uses: actions/checkout@v2 - uses: actions-rs/toolchain@v1 @@ -201,7 +201,7 @@ jobs: - uses: nolar/setup-k3d-k3s@v1 with: - version: v1.19 + version: v1.20 # k3d-kube k3d-name: kube # Used to avoid rate limits when fetching the releases from k3s repo. diff --git a/README.md b/README.md index 07e4011ee..0ed1fb6d0 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Crates.io](https://img.shields.io/crates/v/kube.svg)](https://crates.io/crates/kube) [![Rust 1.60](https://img.shields.io/badge/MSRV-1.60-dea584.svg)](https://github.com/rust-lang/rust/releases/tag/1.60.0) -[![Tested against Kubernetes 1.19 and above](https://img.shields.io/badge/MK8SV-1.19-326ce5.svg)](https://kube.rs/kubernetes-version) +[![Tested against Kubernetes v1_20 and above](https://img.shields.io/badge/MK8SV-v1_20-326ce5.svg)](https://kube.rs/kubernetes-version) [![Best Practices](https://bestpractices.coreinfrastructure.org/projects/5413/badge)](https://bestpractices.coreinfrastructure.org/projects/5413) [![Discord chat](https://img.shields.io/discord/500028886025895936.svg?logo=discord&style=plastic)](https://discord.gg/tokio) @@ -17,7 +17,7 @@ Select a version of `kube` along with the generated [k8s-openapi](https://github ```toml [dependencies] kube = { version = "0.74.0", features = ["runtime", "derive"] } -k8s-openapi = { version = "0.15.0", features = ["v1_24"] } +k8s-openapi = { version = "0.15.0", features = ["v1_25"] } ``` [Features are available](https://github.com/kube-rs/kube-rs/blob/master/kube/Cargo.toml#L18). @@ -153,7 +153,7 @@ Kube has basic support ([with caveats](https://github.com/kube-rs/kube-rs/issues ```toml [dependencies] kube = { version = "0.74.0", default-features = false, features = ["client", "rustls-tls"] } -k8s-openapi = { version = "0.15.0", features = ["v1_24"] } +k8s-openapi = { version = "0.15.0", features = ["v1_25"] } ``` This will pull in `rustls` and `hyper-rustls`. diff --git a/e2e/Cargo.toml b/e2e/Cargo.toml index da7e3507b..051789b42 100644 --- a/e2e/Cargo.toml +++ b/e2e/Cargo.toml @@ -18,8 +18,8 @@ name = "boot" path = "boot.rs" [features] -latest = ["k8s-openapi/v1_24"] -mk8sv = ["k8s-openapi/v1_19"] +latest = ["k8s-openapi/v1_25"] +mk8sv = ["k8s-openapi/v1_20"] rustls = ["kube/rustls-tls"] openssl = ["kube/openssl-tls"] diff --git a/examples/Cargo.toml b/examples/Cargo.toml index e4bf3bf5e..44cb38833 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -20,7 +20,7 @@ openssl-tls = ["kube/client", "kube/openssl-tls"] rustls-tls = ["kube/client", "kube/rustls-tls"] runtime = ["kube/runtime"] ws = ["kube/ws"] -latest = ["k8s-openapi/v1_24"] +latest = ["k8s-openapi/v1_25"] [dev-dependencies] tokio-util = "0.7.0" diff --git a/justfile b/justfile index 411b4eba0..12e15303e 100644 --- a/justfile +++ b/justfile @@ -13,7 +13,7 @@ fmt: rustfmt +nightly --edition 2021 $(find . -type f -iname *.rs) doc: - RUSTDOCFLAGS="--cfg docsrs" cargo +nightly doc --lib --workspace --features=derive,ws,oauth,jsonpatch,client,derive,runtime,admission,k8s-openapi/v1_24 --open + RUSTDOCFLAGS="--cfg docsrs" cargo +nightly doc --lib --workspace --features=derive,ws,oauth,jsonpatch,client,derive,runtime,admission,k8s-openapi/v1_25 --open # Unit tests test: diff --git a/kube-client/Cargo.toml b/kube-client/Cargo.toml index cbebb9cf3..2f0804fc6 100644 --- a/kube-client/Cargo.toml +++ b/kube-client/Cargo.toml @@ -32,7 +32,7 @@ config = ["__non_core", "pem", "dirs"] __non_core = ["tracing", "serde_yaml", "base64"] [package.metadata.docs.rs] -features = ["client", "native-tls", "rustls-tls", "openssl-tls", "ws", "oauth", "jsonpatch", "admission", "k8s-openapi/v1_24"] +features = ["client", "native-tls", "rustls-tls", "openssl-tls", "ws", "oauth", "jsonpatch", "admission", "k8s-openapi/v1_25"] # Define the configuration attribute `docsrs`. Used to enable `doc_cfg` feature. rustdoc-args = ["--cfg", "docsrs"] @@ -88,4 +88,4 @@ tower-test = "0.4.0" [dev-dependencies.k8s-openapi] version = "0.16.0" default-features = false -features = ["v1_24"] +features = ["v1_25"] diff --git a/kube-core/Cargo.toml b/kube-core/Cargo.toml index d17db96af..62da8535b 100644 --- a/kube-core/Cargo.toml +++ b/kube-core/Cargo.toml @@ -13,7 +13,7 @@ repository = "https://github.com/kube-rs/kube-rs" readme = "../README.md" [package.metadata.docs.rs] -features = ["ws", "admission", "jsonpatch", "k8s-openapi/v1_24"] +features = ["ws", "admission", "jsonpatch", "k8s-openapi/v1_25"] rustdoc-args = ["--cfg", "docsrs"] [features] @@ -41,7 +41,7 @@ features = [] [dev-dependencies.k8s-openapi] version = "0.16.0" default-features = false -features = ["v1_24"] +features = ["v1_25"] [dev-dependencies] assert-json-diff = "2.0.1" diff --git a/kube-derive/Cargo.toml b/kube-derive/Cargo.toml index d5c27a4e6..1d7cc23b0 100644 --- a/kube-derive/Cargo.toml +++ b/kube-derive/Cargo.toml @@ -26,7 +26,7 @@ proc-macro = true serde = { version = "1.0.130", features = ["derive"] } serde_yaml = "0.8.21" kube = { path = "../kube", default-features = false, version = "<1.0.0, >=0.61.0", features = ["derive"] } -k8s-openapi = { version = "0.16.0", default-features = false, features = ["v1_24"] } +k8s-openapi = { version = "0.16.0", default-features = false, features = ["v1_25"] } schemars = { version = "0.8.6", features = ["chrono"] } validator = { version = "0.16.0", features = ["derive"] } chrono = { version = "0.4.19", default-features = false } diff --git a/kube-runtime/Cargo.toml b/kube-runtime/Cargo.toml index 31a63a426..bdf922a00 100644 --- a/kube-runtime/Cargo.toml +++ b/kube-runtime/Cargo.toml @@ -15,7 +15,7 @@ rust-version = "1.60.0" edition = "2021" [package.metadata.docs.rs] -features = ["k8s-openapi/v1_24"] +features = ["k8s-openapi/v1_25"] # Define the configuration attribute `docsrs`. Used to enable `doc_cfg` feature. rustdoc-args = ["--cfg", "docsrs"] @@ -50,4 +50,4 @@ schemars = "0.8.6" [dev-dependencies.k8s-openapi] version = "0.16.0" default-features = false -features = ["v1_24"] +features = ["v1_25"] diff --git a/kube/Cargo.toml b/kube/Cargo.toml index dc5414376..6254d80ed 100644 --- a/kube/Cargo.toml +++ b/kube/Cargo.toml @@ -31,7 +31,7 @@ config = ["kube-client/config"] runtime = ["kube-runtime"] [package.metadata.docs.rs] -features = ["client", "native-tls", "rustls-tls", "openssl-tls", "derive", "ws", "oauth", "jsonpatch", "admission", "runtime", "k8s-openapi/v1_24"] +features = ["client", "native-tls", "rustls-tls", "openssl-tls", "derive", "ws", "oauth", "jsonpatch", "admission", "runtime", "k8s-openapi/v1_25"] # Define the configuration attribute `docsrs`. Used to enable `doc_cfg` feature. rustdoc-args = ["--cfg", "docsrs"] @@ -58,4 +58,4 @@ schemars = "0.8.6" [dev-dependencies.k8s-openapi] version = "0.16.0" default-features = false -features = ["v1_24"] +features = ["v1_25"] diff --git a/release.toml b/release.toml index 56233a3d9..23387616d 100644 --- a/release.toml +++ b/release.toml @@ -4,7 +4,7 @@ # # 0. (optional) cargo release minor ; verify readme + changelog bumped; then git reset --hard # 1. PUBLISH_GRACE_SLEEP=20 cargo release minor --execute -# 1X. - on failure: follow plan manually, cd into next dirs and publish insequence with cargo publish --features=k8s-openapi/v1_24 +# 1X. - on failure: follow plan manually, cd into next dirs and publish insequence with cargo publish --features=k8s-openapi/v1_25 # 2. check consolidated commit # 2X. - on failure: git commit --amend and insert version # 3. ./scripts/release-post.sh @@ -21,4 +21,4 @@ push = false tag = false # A Kubernetes version is normally supplied by the application consuming the library in the end. # Since we don't have that when verifying, supply one ourselves. -enable-features = ["k8s-openapi/v1_24"] +enable-features = ["k8s-openapi/v1_25"]