Skip to content

Commit da3a988

Browse files
authored
Upgrade k8s-openapi to 0.19.0 for v1_27 support (#1271)
* cargo upgrade k8s-openapi Signed-off-by: clux <[email protected]> * just bump-k8s Signed-off-by: clux <[email protected]> --------- Signed-off-by: clux <[email protected]>
1 parent 14cb58e commit da3a988

File tree

11 files changed

+30
-30
lines changed

11 files changed

+30
-30
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ jobs:
131131
fail-fast: false
132132
matrix:
133133
# Run these tests against older clusters as well
134-
k8s: [v1.21, latest]
134+
k8s: [v1.22, latest]
135135
steps:
136136
- uses: actions/checkout@v2
137137
- uses: actions-rs/toolchain@v1
@@ -205,7 +205,7 @@ jobs:
205205

206206
- uses: nolar/setup-k3d-k3s@v1
207207
with:
208-
version: v1.21
208+
version: v1.22
209209
# k3d-kube
210210
k3d-name: kube
211211
# Used to avoid rate limits when fetching the releases from k3s repo.

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[![Crates.io](https://img.shields.io/crates/v/kube.svg)](https://crates.io/crates/kube)
44
[![Rust 1.64](https://img.shields.io/badge/MSRV-1.64-dea584.svg)](https://github.com/rust-lang/rust/releases/tag/1.64.0)
5-
[![Tested against Kubernetes v1_21 and above](https://img.shields.io/badge/MK8SV-v1_21-326ce5.svg)](https://kube.rs/kubernetes-version)
5+
[![Tested against Kubernetes v1_22 and above](https://img.shields.io/badge/MK8SV-v1_22-326ce5.svg)](https://kube.rs/kubernetes-version)
66
[![Best Practices](https://bestpractices.coreinfrastructure.org/projects/5413/badge)](https://bestpractices.coreinfrastructure.org/projects/5413)
77
[![Discord chat](https://img.shields.io/discord/500028886025895936.svg?logo=discord&style=plastic)](https://discord.gg/tokio)
88

@@ -17,7 +17,7 @@ Select a version of `kube` along with the generated [k8s-openapi](https://github
1717
```toml
1818
[dependencies]
1919
kube = { version = "0.84.0", features = ["runtime", "derive"] }
20-
k8s-openapi = { version = "0.18.0", features = ["v1_26"] }
20+
k8s-openapi = { version = "0.19.0", features = ["v1_27"] }
2121
```
2222

2323
[Features are available](https://github.com/kube-rs/kube/blob/main/kube/Cargo.toml#L18).
@@ -153,7 +153,7 @@ By default `openssl` is used for TLS, but [rustls](https://github.com/ctz/rustls
153153
```toml
154154
[dependencies]
155155
kube = { version = "0.84.0", default-features = false, features = ["client", "rustls-tls"] }
156-
k8s-openapi = { version = "0.18.0", features = ["v1_26"] }
156+
k8s-openapi = { version = "0.19.0", features = ["v1_27"] }
157157
```
158158

159159
This will pull in `rustls` and `hyper-rustls`. If `default-features` is left enabled, you will pull in two TLS stacks, and the default will remain as `openssl`.

e2e/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ name = "boot"
1818
path = "boot.rs"
1919

2020
[features]
21-
latest = ["k8s-openapi/v1_26"]
22-
mk8sv = ["k8s-openapi/v1_21"]
21+
latest = ["k8s-openapi/v1_27"]
22+
mk8sv = ["k8s-openapi/v1_22"]
2323
rustls = ["kube/rustls-tls"]
2424
openssl = ["kube/openssl-tls"]
2525

@@ -29,6 +29,6 @@ tracing = "0.1.36"
2929
tracing-subscriber = "0.3.3"
3030
futures = "0.3.17"
3131
kube = { path = "../kube", version = "^0.84.0", default-features = false, features = ["client", "runtime", "ws", "admission", "gzip"] }
32-
k8s-openapi = { version = "0.18.0", default-features = false }
32+
k8s-openapi = { version = "0.19.0", default-features = false }
3333
serde_json = "1.0.68"
3434
tokio = { version = "1.14.0", features = ["full"] }

examples/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ rustls-tls = ["kube/client", "kube/rustls-tls"]
2121
runtime = ["kube/runtime", "kube/unstable-runtime"]
2222
refresh = ["kube/oauth", "kube/oidc"]
2323
ws = ["kube/ws"]
24-
latest = ["k8s-openapi/v1_26"]
24+
latest = ["k8s-openapi/v1_27"]
2525

2626
[dev-dependencies]
2727
tokio-util = "0.7.0"
@@ -32,7 +32,7 @@ futures = "0.3.17"
3232
jsonpath_lib = "0.3.0"
3333
kube = { path = "../kube", version = "^0.84.0", default-features = false, features = ["admission"] }
3434
kube-derive = { path = "../kube-derive", version = "^0.84.0", default-features = false } # only needed to opt out of schema
35-
k8s-openapi = { version = "0.18.0", default-features = false }
35+
k8s-openapi = { version = "0.19.0", default-features = false }
3636
serde = { version = "1.0.130", features = ["derive"] }
3737
serde_json = "1.0.68"
3838
serde_yaml = "0.9.19"

justfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ fmt:
1515
rustfmt +nightly --edition 2021 $(find . -type f -iname *.rs)
1616

1717
doc:
18-
RUSTDOCFLAGS="--cfg docsrs" cargo +nightly doc --lib --workspace --features=derive,ws,oauth,oidc,jsonpatch,client,derive,runtime,admission,k8s-openapi/v1_26,unstable-runtime --open
18+
RUSTDOCFLAGS="--cfg docsrs" cargo +nightly doc --lib --workspace --features=derive,ws,oauth,oidc,jsonpatch,client,derive,runtime,admission,k8s-openapi/v1_27,unstable-runtime --open
1919

2020
deny:
2121
# might require rm Cargo.lock first to match CI

kube-client/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ config = ["__non_core", "pem", "home"]
3232
__non_core = ["tracing", "serde_yaml", "base64"]
3333

3434
[package.metadata.docs.rs]
35-
features = ["client", "rustls-tls", "openssl-tls", "ws", "oauth", "oidc", "jsonpatch", "admission", "k8s-openapi/v1_26"]
35+
features = ["client", "rustls-tls", "openssl-tls", "ws", "oauth", "oidc", "jsonpatch", "admission", "k8s-openapi/v1_27"]
3636
# Define the configuration attribute `docsrs`. Used to enable `doc_cfg` feature.
3737
rustdoc-args = ["--cfg", "docsrs"]
3838

@@ -72,7 +72,7 @@ hyper-openssl = { version = "0.9.2", optional = true }
7272
form_urlencoded = { version = "1.2.0", optional = true }
7373

7474
[dependencies.k8s-openapi]
75-
version = "0.18.0"
75+
version = "0.19.0"
7676
default-features = false
7777
features = []
7878

@@ -85,6 +85,6 @@ tokio-test = "0.4.0"
8585
tower-test = "0.4.0"
8686

8787
[dev-dependencies.k8s-openapi]
88-
version = "0.18.0"
88+
version = "0.19.0"
8989
default-features = false
90-
features = ["v1_26"]
90+
features = ["v1_27"]

kube-core/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ repository = "https://github.com/kube-rs/kube"
1515
readme = "../README.md"
1616

1717
[package.metadata.docs.rs]
18-
features = ["ws", "admission", "jsonpatch", "k8s-openapi/v1_26"]
18+
features = ["ws", "admission", "jsonpatch", "k8s-openapi/v1_27"]
1919
rustdoc-args = ["--cfg", "docsrs"]
2020

2121
[features]
@@ -36,14 +36,14 @@ chrono = { version = "0.4.19", default-features = false, features = ["clock"] }
3636
schemars = { version = "0.8.6", optional = true }
3737

3838
[dependencies.k8s-openapi]
39-
version = "0.18.0"
39+
version = "0.19.0"
4040
default-features = false
4141
features = []
4242

4343
[dev-dependencies.k8s-openapi]
44-
version = "0.18.0"
44+
version = "0.19.0"
4545
default-features = false
46-
features = ["v1_26"]
46+
features = ["v1_27"]
4747

4848
[dev-dependencies]
4949
assert-json-diff = "2.0.1"

kube-derive/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ proc-macro = true
2929
serde = { version = "1.0.130", features = ["derive"] }
3030
serde_yaml = "0.9.19"
3131
kube = { path = "../kube", version = "<1.0.0, >=0.61.0", features = ["derive", "client"] }
32-
k8s-openapi = { version = "0.18.0", default-features = false, features = ["v1_26"] }
32+
k8s-openapi = { version = "0.19.0", default-features = false, features = ["v1_27"] }
3333
schemars = { version = "0.8.6", features = ["chrono"] }
3434
chrono = { version = "0.4.19", default-features = false }
3535
trybuild = "1.0.48"

kube-runtime/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ unstable-runtime-stream-control = []
2222
unstable-runtime-reconcile-on = []
2323

2424
[package.metadata.docs.rs]
25-
features = ["k8s-openapi/v1_26", "unstable-runtime"]
25+
features = ["k8s-openapi/v1_27", "unstable-runtime"]
2626
# Define the configuration attribute `docsrs`. Used to enable `doc_cfg` feature.
2727
rustdoc-args = ["--cfg", "docsrs"]
2828

@@ -46,7 +46,7 @@ async-trait = "0.1.64"
4646
hashbrown = "0.14.0"
4747

4848
[dependencies.k8s-openapi]
49-
version = "0.18.0"
49+
version = "0.19.0"
5050
default-features = false
5151

5252
[dev-dependencies]
@@ -58,6 +58,6 @@ schemars = "0.8.6"
5858
tracing-subscriber = "0.3.17"
5959

6060
[dev-dependencies.k8s-openapi]
61-
version = "0.18.0"
61+
version = "0.19.0"
6262
default-features = false
63-
features = ["v1_26"]
63+
features = ["v1_27"]

kube/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ runtime = ["kube-runtime"]
3232
unstable-runtime = ["kube-runtime/unstable-runtime"]
3333

3434
[package.metadata.docs.rs]
35-
features = ["client", "rustls-tls", "openssl-tls", "derive", "ws", "oauth", "jsonpatch", "admission", "runtime", "k8s-openapi/v1_26", "unstable-runtime"]
35+
features = ["client", "rustls-tls", "openssl-tls", "derive", "ws", "oauth", "jsonpatch", "admission", "runtime", "k8s-openapi/v1_27", "unstable-runtime"]
3636
# Define the configuration attribute `docsrs`. Used to enable `doc_cfg` feature.
3737
rustdoc-args = ["--cfg", "docsrs"]
3838

@@ -45,7 +45,7 @@ kube-runtime = { path = "../kube-runtime", version = "=0.84.0", optional = true}
4545
# Not used directly, but required by resolver 2.0 to ensure that the k8s-openapi dependency
4646
# is considered part of the "deps" graph rather than just the "dev-deps" graph
4747
[dependencies.k8s-openapi]
48-
version = "0.18.0"
48+
version = "0.19.0"
4949
default-features = false
5050

5151
[dev-dependencies]
@@ -60,6 +60,6 @@ tower-test = "0.4.0"
6060
anyhow = "1.0.71"
6161

6262
[dev-dependencies.k8s-openapi]
63-
version = "0.18.0"
63+
version = "0.19.0"
6464
default-features = false
65-
features = ["v1_26"]
65+
features = ["v1_27"]

release.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# 0. (optional) cargo release minor ; verify readme + changelog bumped; then git reset --hard
66
# 1. PUBLISH_GRACE_SLEEP=20 cargo release minor --execute
7-
# 1X. - on failure: follow plan manually, cd into next dirs and publish insequence with cargo publish --features=k8s-openapi/v1_26
7+
# 1X. - on failure: follow plan manually, cd into next dirs and publish insequence with cargo publish --features=k8s-openapi/v1_27
88
# 2. check consolidated commit
99
# 2X. - on failure: git commit --amend and insert version
1010
# 3. ./scripts/release-post.sh
@@ -21,4 +21,4 @@ push = false
2121
tag = false
2222
# A Kubernetes version is normally supplied by the application consuming the library in the end.
2323
# Since we don't have that when verifying, supply one ourselves.
24-
enable-features = ["k8s-openapi/v1_26"]
24+
enable-features = ["k8s-openapi/v1_27"]

0 commit comments

Comments
 (0)