Skip to content

Commit

Permalink
Bump CI to k8s-openapi v1_23 (#895)
Browse files Browse the repository at this point in the history
Signed-off-by: clux <sszynrae@gmail.com>
  • Loading branch information
clux authored May 4, 2022
1 parent bed451d commit b7b7d8a
Show file tree
Hide file tree
Showing 10 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,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_22 --open
RUSTDOCFLAGS="--cfg docsrs" cargo +nightly doc --lib --workspace --features=derive,ws,oauth,jsonpatch,client,derive,runtime,admission,k8s-openapi/v1_23 --open

test:
cargo test --lib --all
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Select a version of `kube` along with the generated [k8s-openapi](https://github
```toml
[dependencies]
kube = { version = "0.71.0", features = ["runtime", "derive"] }
k8s-openapi = { version = "0.14.0", features = ["v1_22"] }
k8s-openapi = { version = "0.14.0", features = ["v1_23"] }
```

[Features are available](https://github.com/kube-rs/kube-rs/blob/master/kube/Cargo.toml#L18).
Expand Down Expand Up @@ -157,7 +157,7 @@ Kube has basic support ([with caveats](https://github.com/kube-rs/kube-rs/issues
```toml
[dependencies]
kube = { version = "0.71.0", default-features = false, features = ["client", "rustls-tls"] }
k8s-openapi = { version = "0.14.0", features = ["v1_22"] }
k8s-openapi = { version = "0.14.0", features = ["v1_23"] }
```

This will pull in `rustls` and `hyper-rustls`.
Expand Down
2 changes: 1 addition & 1 deletion e2e/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ anyhow = "1.0.44"
env_logger = "0.9.0"
futures = "0.3.17"
kube = { path = "../kube", version = "^0.71.0", default-features = false, features = ["client", "rustls-tls"] }
k8s-openapi = { version = "0.14.0", features = ["v1_22"], default-features = false }
k8s-openapi = { version = "0.14.0", features = ["v1_23"], default-features = false }
log = "0.4.11"
serde_json = "1.0.68"
tokio = { version = "1.14.0", features = ["full"] }
2 changes: 1 addition & 1 deletion examples/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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_22"]
latest = ["k8s-openapi/v1_23"]

[dev-dependencies]
tokio-util = "0.7.0"
Expand Down
4 changes: 2 additions & 2 deletions kube-client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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_22"]
features = ["client", "native-tls", "rustls-tls", "openssl-tls", "ws", "oauth", "jsonpatch", "admission", "k8s-openapi/v1_23"]
# Define the configuration attribute `docsrs`. Used to enable `doc_cfg` feature.
rustdoc-args = ["--cfg", "docsrs"]

Expand Down Expand Up @@ -88,4 +88,4 @@ tower-test = "0.4.0"
[dev-dependencies.k8s-openapi]
version = "0.14.0"
default-features = false
features = ["v1_22"]
features = ["v1_23"]
4 changes: 2 additions & 2 deletions kube-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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_22"]
features = ["ws", "admission", "jsonpatch", "k8s-openapi/v1_23"]
rustdoc-args = ["--cfg", "docsrs"]

[features]
Expand Down Expand Up @@ -41,7 +41,7 @@ features = []
[dev-dependencies.k8s-openapi]
version = "0.14.0"
default-features = false
features = ["v1_22"]
features = ["v1_23"]

[dev-dependencies]
assert-json-diff = "2.0.1"
Expand Down
2 changes: 1 addition & 1 deletion kube-derive/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.14.0", default-features = false, features = ["v1_22"] }
k8s-openapi = { version = "0.14.0", default-features = false, features = ["v1_23"] }
schemars = { version = "0.8.6", features = ["chrono"] }
validator = { version = "0.14.0", features = ["derive"] }
chrono = { version = "0.4.19", default-features = false }
Expand Down
4 changes: 2 additions & 2 deletions kube-runtime/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ rust-version = "1.56"
edition = "2021"

[package.metadata.docs.rs]
features = ["k8s-openapi/v1_22"]
features = ["k8s-openapi/v1_23"]
# Define the configuration attribute `docsrs`. Used to enable `doc_cfg` feature.
rustdoc-args = ["--cfg", "docsrs"]

Expand Down Expand Up @@ -50,4 +50,4 @@ schemars = "0.8.6"
[dev-dependencies.k8s-openapi]
version = "0.14.0"
default-features = false
features = ["v1_22"]
features = ["v1_23"]
4 changes: 2 additions & 2 deletions kube/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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_22"]
features = ["client", "native-tls", "rustls-tls", "openssl-tls", "derive", "ws", "oauth", "jsonpatch", "admission", "runtime", "k8s-openapi/v1_23"]
# Define the configuration attribute `docsrs`. Used to enable `doc_cfg` feature.
rustdoc-args = ["--cfg", "docsrs"]

Expand All @@ -58,4 +58,4 @@ schemars = "0.8.6"
[dev-dependencies.k8s-openapi]
version = "0.14.0"
default-features = false
features = ["v1_22"]
features = ["v1_23"]
4 changes: 2 additions & 2 deletions release.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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_22
# 1X. - on failure: follow plan manually, cd into next dirs and publish insequence with cargo publish --features=k8s-openapi/v1_23
# 2. check consolidated commit
# 2X. - on failure: git commit --amend and insert version
# 3. ./scripts/release-post.sh
Expand All @@ -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_22"]
enable-features = ["k8s-openapi/v1_23"]

0 comments on commit b7b7d8a

Please sign in to comment.