Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 8 additions & 8 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,9 @@ checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"

[[package]]
name = "cc"
version = "1.2.27"
version = "1.2.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d487aa071b5f64da6f19a3e848e3578944b726ee5a4854b82172f02aa876bfdc"
checksum = "c3a42d84bb6b69d3a8b3eaacf0d88f179e1929695e1ad012b6cf64d9caaa5fd2"
dependencies = [
"shlex",
]
Expand Down Expand Up @@ -470,6 +470,8 @@ dependencies = [
"hyper-util",
"k8s-openapi",
"kube",
"kube-core",
"kube-derive",
"once_cell",
"regex-lite",
"schemars",
Expand All @@ -489,7 +491,6 @@ dependencies = [
"gateway-api",
"hyper-util",
"k8s-openapi",
"kube",
"serde_json",
"tokio",
"tower",
Expand Down Expand Up @@ -828,7 +829,6 @@ dependencies = [
"k8s-openapi",
"kube-client",
"kube-core",
"kube-derive",
]

[[package]]
Expand Down Expand Up @@ -1287,9 +1287,9 @@ checksum = "989e6739f80c4ad5b13e0fd7fe89531180375b18520cc8c82080e4dc4035b84f"

[[package]]
name = "rustls"
version = "0.23.28"
version = "0.23.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7160e3e10bf4535308537f3c4e1641468cd0e485175d6163087c0393c7d46643"
checksum = "c0ebcbd2f03de0fc1122ad9bb24b127a5a6cd51d72604a3f3c50ac459762b6cc"
dependencies = [
"log",
"once_cell",
Expand Down Expand Up @@ -1345,9 +1345,9 @@ dependencies = [

[[package]]
name = "rustls-webpki"
version = "0.103.3"
version = "0.103.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e4a72fe2bcf7a6ac6fd7d0b9e5cb68aeb7d4c0a0271730218b3e92d43b4eb435"
checksum = "0a17884ae0c1b773f1ccd2bd4a8c72f16da897310a98b0e84bf349ad5ead92fc"
dependencies = [
"ring",
"rustls-pki-types",
Expand Down
4 changes: 3 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ version = "0.16.0"
anyhow = "1.0.98"
delegate = "0.13.4"
hyper-util = "0.1.16"
kube = { version = "1.1.0" }
kube = { version = "1.1.0", default-features = false }
kube-core = { version = "1.1.0", default-features = false }
kube-derive = { version = "1.1.0" }
k8s-openapi = { version = "0.25.0" }
once_cell = "1.21.3"
regex = { package = "regex-lite", version = "0.1.6" }
Expand Down
5 changes: 3 additions & 2 deletions gateway-api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ version.workspace = true
[dependencies]
delegate.workspace = true
k8s-openapi = { workspace = true, features = ["schemars"] }
kube = { workspace = true, features = ["derive"] }
kube-core = { workspace = true, features = ["schema"] }
kube-derive.workspace = true
once_cell.workspace = true
regex.workspace = true
schemars.workspace = true
Expand All @@ -26,7 +27,7 @@ serde_yaml.workspace = true

[dev-dependencies]
k8s-openapi = { workspace = true, features = ["v1_32", "schemars"] }
kube = { workspace = true, features = ["derive"] }
kube = { workspace = true, features = ["client", "rustls-tls", "ring"] }

anyhow.workspace = true
hyper-util.workspace = true
Expand Down
1 change: 0 additions & 1 deletion gateway-api/examples/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ gateway-api = { path = "../" }
anyhow.workspace = true
hyper-util.workspace = true
k8s-openapi.workspace = true
kube.workspace = true
serde_json.workspace = true
tokio.workspace = true
tower.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion gateway-api/src/apis/experimental/common.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#[allow(unused_imports)]
mod prelude {
pub use k8s_openapi::apimachinery::pkg::apis::meta::v1::Condition;
pub use kube::CustomResource;
pub use kube_derive::CustomResource;
pub use schemars::JsonSchema;
pub use serde::{Deserialize, Serialize};
pub use std::collections::BTreeMap;
Expand Down
3 changes: 2 additions & 1 deletion gateway-api/src/apis/experimental/gatewayclasses.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use super::common::*;
#[allow(unused_imports)]
mod prelude {
pub use k8s_openapi::apimachinery::pkg::apis::meta::v1::Condition;
pub use kube::CustomResource;
pub use kube_derive::CustomResource;
pub use schemars::JsonSchema;
pub use serde::{Deserialize, Serialize};
}
Expand All @@ -17,6 +17,7 @@ use self::prelude::*;
kind = "GatewayClass",
plural = "gatewayclasses"
)]
#[kube(crates(kube_core = "::kube_core"))]
#[kube(status = "GatewayClassStatus")]
#[kube(derive = "Default")]
#[kube(derive = "PartialEq")]
Expand Down
3 changes: 2 additions & 1 deletion gateway-api/src/apis/experimental/gateways.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use super::common::*;
#[allow(unused_imports)]
mod prelude {
pub use k8s_openapi::apimachinery::pkg::apis::meta::v1::Condition;
pub use kube::CustomResource;
pub use kube_derive::CustomResource;
pub use schemars::JsonSchema;
pub use serde::{Deserialize, Serialize};
pub use std::collections::BTreeMap;
Expand All @@ -18,6 +18,7 @@ use self::prelude::*;
kind = "Gateway",
plural = "gateways"
)]
#[kube(crates(kube_core = "::kube_core"))]
#[kube(namespaced)]
#[kube(status = "GatewayStatus")]
#[kube(derive = "Default")]
Expand Down
3 changes: 2 additions & 1 deletion gateway-api/src/apis/experimental/grpcroutes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use super::common::*;
#[allow(unused_imports)]
mod prelude {
pub use k8s_openapi::apimachinery::pkg::apis::meta::v1::Condition;
pub use kube::CustomResource;
pub use kube_derive::CustomResource;
pub use schemars::JsonSchema;
pub use serde::{Deserialize, Serialize};
}
Expand All @@ -17,6 +17,7 @@ use self::prelude::*;
kind = "GRPCRoute",
plural = "grpcroutes"
)]
#[kube(crates(kube_core = "::kube_core"))]
#[kube(namespaced)]
#[kube(status = "RouteStatus")]
#[kube(derive = "Default")]
Expand Down
3 changes: 2 additions & 1 deletion gateway-api/src/apis/experimental/httproutes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use super::common::*;
#[allow(unused_imports)]
mod prelude {
pub use k8s_openapi::apimachinery::pkg::apis::meta::v1::Condition;
pub use kube::CustomResource;
pub use kube_derive::CustomResource;
pub use schemars::JsonSchema;
pub use serde::{Deserialize, Serialize};
}
Expand All @@ -17,6 +17,7 @@ use self::prelude::*;
kind = "HTTPRoute",
plural = "httproutes"
)]
#[kube(crates(kube_core = "::kube_core"))]
#[kube(namespaced)]
#[kube(status = "RouteStatus")]
#[kube(derive = "Default")]
Expand Down
3 changes: 2 additions & 1 deletion gateway-api/src/apis/experimental/referencegrants.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#[allow(unused_imports)]
mod prelude {
pub use kube::CustomResource;
pub use kube_derive::CustomResource;
pub use schemars::JsonSchema;
pub use serde::{Deserialize, Serialize};
}
Expand All @@ -15,6 +15,7 @@ use self::prelude::*;
kind = "ReferenceGrant",
plural = "referencegrants"
)]
#[kube(crates(kube_core = "::kube_core"))]
#[kube(namespaced)]
#[kube(derive = "Default")]
#[kube(derive = "PartialEq")]
Expand Down
3 changes: 2 additions & 1 deletion gateway-api/src/apis/experimental/tcproutes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use super::common::*;
#[allow(unused_imports)]
mod prelude {
pub use k8s_openapi::apimachinery::pkg::apis::meta::v1::Condition;
pub use kube::CustomResource;
pub use kube_derive::CustomResource;
pub use schemars::JsonSchema;
pub use serde::{Deserialize, Serialize};
}
Expand All @@ -17,6 +17,7 @@ use self::prelude::*;
kind = "TCPRoute",
plural = "tcproutes"
)]
#[kube(crates(kube_core = "::kube_core"))]
#[kube(namespaced)]
#[kube(status = "RouteStatus")]
#[kube(derive = "Default")]
Expand Down
3 changes: 2 additions & 1 deletion gateway-api/src/apis/experimental/tlsroutes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use super::common::*;
#[allow(unused_imports)]
mod prelude {
pub use k8s_openapi::apimachinery::pkg::apis::meta::v1::Condition;
pub use kube::CustomResource;
pub use kube_derive::CustomResource;
pub use schemars::JsonSchema;
pub use serde::{Deserialize, Serialize};
}
Expand All @@ -17,6 +17,7 @@ use self::prelude::*;
kind = "TLSRoute",
plural = "tlsroutes"
)]
#[kube(crates(kube_core = "::kube_core"))]
#[kube(namespaced)]
#[kube(status = "RouteStatus")]
#[kube(derive = "Default")]
Expand Down
3 changes: 2 additions & 1 deletion gateway-api/src/apis/experimental/udproutes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use super::common::*;
#[allow(unused_imports)]
mod prelude {
pub use k8s_openapi::apimachinery::pkg::apis::meta::v1::Condition;
pub use kube::CustomResource;
pub use kube_derive::CustomResource;
pub use schemars::JsonSchema;
pub use serde::{Deserialize, Serialize};
}
Expand All @@ -17,6 +17,7 @@ use self::prelude::*;
kind = "UDPRoute",
plural = "udproutes"
)]
#[kube(crates(kube_core = "::kube_core"))]
#[kube(namespaced)]
#[kube(status = "RouteStatus")]
#[kube(derive = "Default")]
Expand Down
2 changes: 1 addition & 1 deletion gateway-api/src/apis/standard/common.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#[allow(unused_imports)]
mod prelude {
pub use k8s_openapi::apimachinery::pkg::apis::meta::v1::Condition;
pub use kube::CustomResource;
pub use kube_derive::CustomResource;
pub use schemars::JsonSchema;
pub use serde::{Deserialize, Serialize};
pub use std::collections::BTreeMap;
Expand Down
3 changes: 2 additions & 1 deletion gateway-api/src/apis/standard/gatewayclasses.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#[allow(unused_imports)]
mod prelude {
pub use k8s_openapi::apimachinery::pkg::apis::meta::v1::Condition;
pub use kube::CustomResource;
pub use kube_derive::CustomResource;
pub use schemars::JsonSchema;
pub use serde::{Deserialize, Serialize};
}
Expand All @@ -16,6 +16,7 @@ use self::prelude::*;
kind = "GatewayClass",
plural = "gatewayclasses"
)]
#[kube(crates(kube_core = "::kube_core"))]
#[kube(status = "GatewayClassStatus")]
#[kube(derive = "Default")]
#[kube(derive = "PartialEq")]
Expand Down
3 changes: 2 additions & 1 deletion gateway-api/src/apis/standard/gateways.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use super::common::*;
#[allow(unused_imports)]
mod prelude {
pub use k8s_openapi::apimachinery::pkg::apis::meta::v1::Condition;
pub use kube::CustomResource;
pub use kube_derive::CustomResource;
pub use schemars::JsonSchema;
pub use serde::{Deserialize, Serialize};
pub use std::collections::BTreeMap;
Expand All @@ -18,6 +18,7 @@ use self::prelude::*;
kind = "Gateway",
plural = "gateways"
)]
#[kube(crates(kube_core = "::kube_core"))]
#[kube(namespaced)]
#[kube(status = "GatewayStatus")]
#[kube(derive = "Default")]
Expand Down
3 changes: 2 additions & 1 deletion gateway-api/src/apis/standard/grpcroutes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use super::common::*;
#[allow(unused_imports)]
mod prelude {
pub use k8s_openapi::apimachinery::pkg::apis::meta::v1::Condition;
pub use kube::CustomResource;
pub use kube_derive::CustomResource;
pub use schemars::JsonSchema;
pub use serde::{Deserialize, Serialize};
}
Expand All @@ -17,6 +17,7 @@ use self::prelude::*;
kind = "GRPCRoute",
plural = "grpcroutes"
)]
#[kube(crates(kube_core = "::kube_core"))]
#[kube(namespaced)]
#[kube(status = "RouteStatus")]
#[kube(derive = "Default")]
Expand Down
3 changes: 2 additions & 1 deletion gateway-api/src/apis/standard/httproutes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use super::common::*;
#[allow(unused_imports)]
mod prelude {
pub use k8s_openapi::apimachinery::pkg::apis::meta::v1::Condition;
pub use kube::CustomResource;
pub use kube_derive::CustomResource;
pub use schemars::JsonSchema;
pub use serde::{Deserialize, Serialize};
}
Expand All @@ -17,6 +17,7 @@ use self::prelude::*;
kind = "HTTPRoute",
plural = "httproutes"
)]
#[kube(crates(kube_core = "::kube_core"))]
#[kube(namespaced)]
#[kube(status = "RouteStatus")]
#[kube(derive = "Default")]
Expand Down
3 changes: 2 additions & 1 deletion gateway-api/src/apis/standard/referencegrants.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#[allow(unused_imports)]
mod prelude {
pub use kube::CustomResource;
pub use kube_derive::CustomResource;
pub use schemars::JsonSchema;
pub use serde::{Deserialize, Serialize};
}
Expand All @@ -15,6 +15,7 @@ use self::prelude::*;
kind = "ReferenceGrant",
plural = "referencegrants"
)]
#[kube(crates(kube_core = "::kube_core"))]
#[kube(namespaced)]
#[kube(derive = "Default")]
#[kube(derive = "PartialEq")]
Expand Down
2 changes: 1 addition & 1 deletion gateway-api/src/duration.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
//! digits each. See https://gateway-api.sigs.k8s.io/geps/gep-2257 for the
//! complete specification.

use kube::core::Duration as k8sDuration;
use kube_core::Duration as k8sDuration;
use once_cell::sync::Lazy;
use regex::Regex;
use std::fmt;
Expand Down
2 changes: 1 addition & 1 deletion type-reducer/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ pub const COMMON_TYPES_MOD_NAME: &str = "common";
const COMMON_TYPES_FILE_PREAMBLE: &str = "#[allow(unused_imports)]
mod prelude {
pub use k8s_openapi::apimachinery::pkg::apis::meta::v1::Condition;
pub use kube::CustomResource;
pub use kube_derive::CustomResource;
pub use schemars::JsonSchema;
pub use serde::{Deserialize, Serialize};
pub use std::collections::BTreeMap;
Expand Down
Loading