From 5a12cf9f30d8f9b7fa353d62a793139e49247df7 Mon Sep 17 00:00:00 2001 From: Moritz Hoffmann Date: Tue, 29 Sep 2026 22:44:59 +0200 Subject: [PATCH] build(deps): bump kube to 4.2, k8s-openapi to 0.28, and k8s-controller to 0.14 kube 4 builds CRDs as typed `CustomResourceDefinition`s, which omit the empty `spec.names.categories` list, so the exported VpcEndpoint CRD changes accordingly. k8s-controller exposes kube types, and 0.14 is its first release on kube 4. Co-Authored-By: Claude Opus 5.5 --- Cargo.lock | 87 +++++++++++++++---- Cargo.toml | 6 +- deny.toml | 3 +- .../src/crd/generated/vpcendpoints.json | 2 +- 4 files changed, 74 insertions(+), 24 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3c00e349aa527..b7473fdd9243f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -275,6 +275,12 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d62b7694a562cdf5a74227903507c56ab2cc8bdd1f781ed5cb4cf9c9f810bfc" +[[package]] +name = "arraydeque" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d902e3d592a523def97af8f317b08ce16b7ab854c1985a0c671e6f15cebc236" + [[package]] name = "arrayvec" version = "0.5.2" @@ -3558,6 +3564,15 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "encoding_rs_io" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fba3fe847045ecff794b9c138293a80db914678c453ad63fbf0c6a9eb6e00b22" +dependencies = [ + "encoding_rs", +] + [[package]] name = "enum-as-inner" version = "0.6.1" @@ -4263,6 +4278,16 @@ dependencies = [ "web-time", ] +[[package]] +name = "granit-parser" +version = "0.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d03f81ad4732830d85cfd417a9f62cde6dadda4354d37d078a6084a19560aa2d" +dependencies = [ + "arraydeque", + "smallvec", +] + [[package]] name = "group" version = "0.13.0" @@ -5320,9 +5345,9 @@ dependencies = [ [[package]] name = "k8s-controller" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25b4b06f56a445e20f50c52894e412b2a3c5f2be97d03dd4326c6c768558dee1" +checksum = "db7bd4877f3335aa9245ac1bb35620ab33727df3d11cdbb13a9e6c956098b13d" dependencies = [ "async-trait", "futures", @@ -5330,7 +5355,7 @@ dependencies = [ "kube", "kube-runtime", "prometheus", - "rand 0.9.4", + "rand 0.10.3", "serde", "serde_json", "thiserror 2.0.21", @@ -5340,9 +5365,9 @@ dependencies = [ [[package]] name = "k8s-openapi" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05a6d6f3611ad1d21732adbd7a2e921f598af6c92d71ae6e2620da4b67ee1f0d" +checksum = "d9c6922f6afe80418dd6019818af5d0d34584c371780ff09b9752370c25b4abb" dependencies = [ "base64 0.22.1", "jiff", @@ -5362,9 +5387,9 @@ dependencies = [ [[package]] name = "kube" -version = "3.1.0" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acc5a6a69da2975ed9925d56b5dcfc9cc739b66f37add06785b7c9f6d1e88741" +checksum = "208d7fe1380066abb194812a8a8e303cb896a33bb3d7b3177b71bd03ff39bf18" dependencies = [ "k8s-openapi", "kube-client", @@ -5375,9 +5400,9 @@ dependencies = [ [[package]] name = "kube-client" -version = "3.1.0" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcaf2d1f1a91e1805d4cd82e8333c022767ae8ffd65909bbef6802733a7dd40" +checksum = "31e940a73033a7c5c7918b5ece7851d84571b58be25e937198da37fa13f116d3" dependencies = [ "base64 0.22.1", "bytes", @@ -5396,10 +5421,11 @@ dependencies = [ "kube-core", "pem 3.0.6", "rustls", + "rustls-platform-verifier", "secrecy", "serde", + "serde-saphyr", "serde_json", - "serde_yaml", "thiserror 2.0.21", "tokio", "tokio-util", @@ -5410,9 +5436,9 @@ dependencies = [ [[package]] name = "kube-core" -version = "3.1.0" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f126d2db7a8b532ec1d839ece2a71e2485dc3bbca6cc3c3f929becaa810e719e" +checksum = "a9d2353c118cf3462c352ee0b5bd5b0cf17990af456dfd8662d136ff9812eeb4" dependencies = [ "derive_more", "form_urlencoded", @@ -5429,9 +5455,9 @@ dependencies = [ [[package]] name = "kube-derive" -version = "3.1.0" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6b9b97e121fce957f9cafc6da534abc4276983ab03190b76c09361e2df849fa" +checksum = "92141c19e1fa83bf91633c1234c66b03375c29aa8ca5486331ddb47e3a3da9c0" dependencies = [ "darling 0.23.0", "proc-macro2", @@ -5443,9 +5469,9 @@ dependencies = [ [[package]] name = "kube-runtime" -version = "3.1.0" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c072737075826ee74d3e615e80334e41e617ca3d14fb46ef7cdfda822d6f15f2" +checksum = "3eb064ef71c7bea55e934a443960da9e9ec31fbb2ba63e47e4aeca32603d5cc7" dependencies = [ "ahash 0.8.12", "async-broadcast", @@ -9288,6 +9314,12 @@ dependencies = [ "cidr", ] +[[package]] +name = "nohash-hasher" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" + [[package]] name = "nom" version = "7.1.3" @@ -12504,6 +12536,25 @@ dependencies = [ "typeid", ] +[[package]] +name = "serde-saphyr" +version = "0.0.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bd22781911de0ca6debda95f073c8f18bec65d1a94f1fa9573f3102e514cea4" +dependencies = [ + "ahash 0.8.12", + "annotate-snippets", + "base64 0.22.1", + "encoding_rs_io", + "getrandom 0.3.3", + "granit-parser", + "nohash-hasher", + "num-traits", + "serde_core", + "smallvec", + "zmij", +] + [[package]] name = "serde-value" version = "0.7.0" @@ -12839,9 +12890,9 @@ checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5" [[package]] name = "smallvec" -version = "1.16.2" +version = "1.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9395f0f0eee849a9b707b2f06bb92a6a422090e2123bb2ef8e87a0e61892a8e" +checksum = "8ed6a63f02c8539c91a8685a86f4099661ba3da017932f6ebbea6de3f0fa7c90" dependencies = [ "serde", ] diff --git a/Cargo.toml b/Cargo.toml index 6e720411edb46..52630f3aa25b7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -404,9 +404,9 @@ itertools = "0.15.0" jemalloc_pprof = "0.9.0" jsonwebtoken = { version = "11.1.0", features = ["aws_lc_rs"] } junit-report = "0.9.1" -k8s-controller = "0.13.0" -k8s-openapi = { version = "0.27.0", features = ["schemars", "v1_34"] } -kube = { version = "3.1.0", default-features = false, features = ["aws-lc-rs", "client", "derive", "runtime", "rustls-tls"] } +k8s-controller = "0.14.0" +k8s-openapi = { version = "0.28.0", features = ["schemars", "v1_34"] } +kube = { version = "4.2.0", default-features = false, features = ["aws-lc-rs", "client", "derive", "runtime", "rustls-tls"] } # Only the `hyper` feature on both LaunchDarkly crates. `hyper-rustls-native-roots` # would enable the transport crate's `hyper-rustls` dependency, which it # hardcodes to the `ring` provider. diff --git a/deny.toml b/deny.toml index a762ca592db05..58ae86719de35 100644 --- a/deny.toml +++ b/deny.toml @@ -331,8 +331,7 @@ ignore = [ # `launchdarkly-server-sdk` requires `lru ^0.16.3` in its latest release. "RUSTSEC-2026-0253", # `unsafe-libyaml` is unmaintained. Pulled in by `serde_yaml`, which - # `mz-debug` and `mz-metrics-catalog` use directly and `kube-client` 3.x - # requires. kube-client 4 uses `serde-saphyr` instead. + # `mz-debug` and `mz-metrics-catalog` use directly. "RUSTSEC-2024-0449", ] diff --git a/src/cloud-resources/src/crd/generated/vpcendpoints.json b/src/cloud-resources/src/crd/generated/vpcendpoints.json index 64c5ede8402ae..1a6f1dd187d50 100644 --- a/src/cloud-resources/src/crd/generated/vpcendpoints.json +++ b/src/cloud-resources/src/crd/generated/vpcendpoints.json @@ -1 +1 @@ -{"apiVersion":"apiextensions.k8s.io/v1","kind":"CustomResourceDefinition","metadata":{"name":"vpcendpoints.materialize.cloud"},"spec":{"group":"materialize.cloud","names":{"categories":[],"kind":"VpcEndpoint","plural":"vpcendpoints","shortNames":["vpce"],"singular":"vpcendpoint"},"scope":"Namespaced","versions":[{"additionalPrinterColumns":[{"description":"Name of the VPC Endpoint Service to connect to.","jsonPath":".spec.awsServiceName","name":"AwsServiceName","priority":1,"type":"string"},{"description":"Availability Zone IDs","jsonPath":".spec.availabilityZoneIds","name":"AvailabilityZoneIDs","priority":1,"type":"string"}],"name":"v1","schema":{"openAPIV3Schema":{"description":"Auto-generated derived type for VpcEndpointSpec via `CustomResource`","properties":{"spec":{"description":"Describes an AWS VPC endpoint to create.","properties":{"availabilityZoneIds":{"description":"The IDs of the availability zones in which the service is available.","items":{"type":"string"},"type":"array"},"awsServiceName":{"description":"The name of the service to connect to.","type":"string"},"roleSuffix":{"description":"A suffix to use in the name of the IAM role that is created.","type":"string"}},"required":["availabilityZoneIds","awsServiceName","roleSuffix"],"type":"object"},"status":{"nullable":true,"properties":{"autoAssignedAzs":{"items":{"type":"string"},"nullable":true,"type":"array"},"conditions":{"items":{"description":"Condition contains details for one aspect of the current state of this API Resource.","properties":{"lastTransitionTime":{"description":"lastTransitionTime is the last time the condition transitioned from one status to another. This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.","format":"date-time","type":"string"},"message":{"description":"message is a human readable message indicating details about the transition. This may be an empty string.","type":"string"},"observedGeneration":{"description":"observedGeneration represents the .metadata.generation that the condition was set based upon. For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date with respect to the current state of the instance.","format":"int64","type":"integer"},"reason":{"description":"reason contains a programmatic identifier indicating the reason for the condition's last transition. Producers of specific condition types may define expected values and meanings for this field, and whether the values are considered a guaranteed API. The value should be a CamelCase string. This field may not be empty.","type":"string"},"status":{"description":"status of the condition, one of True, False, Unknown.","type":"string"},"type":{"description":"type of condition in CamelCase or in foo.example.com/CamelCase.","type":"string"}},"required":["lastTransitionTime","message","reason","status","type"],"type":"object"},"nullable":true,"type":"array"},"state":{"description":"The AWS SDK State enum is not serializable, so we have to make our own.","enum":["pendingServiceDiscovery","creatingEndpoint","recreatingEndpoint","updatingEndpoint","available","deleted","deleting","expired","failed","pending","pendingAcceptance","rejected","unknown","missingAvailabilityZones",null],"nullable":true,"type":"string"},"vpcEndpointId":{"nullable":true,"type":"string"}},"type":"object"}},"required":["spec"],"title":"VpcEndpoint","type":"object"}},"served":true,"storage":true,"subresources":{"status":{}}}]}} +{"apiVersion":"apiextensions.k8s.io/v1","kind":"CustomResourceDefinition","metadata":{"name":"vpcendpoints.materialize.cloud"},"spec":{"group":"materialize.cloud","names":{"kind":"VpcEndpoint","plural":"vpcendpoints","shortNames":["vpce"],"singular":"vpcendpoint"},"scope":"Namespaced","versions":[{"additionalPrinterColumns":[{"description":"Name of the VPC Endpoint Service to connect to.","jsonPath":".spec.awsServiceName","name":"AwsServiceName","priority":1,"type":"string"},{"description":"Availability Zone IDs","jsonPath":".spec.availabilityZoneIds","name":"AvailabilityZoneIDs","priority":1,"type":"string"}],"name":"v1","schema":{"openAPIV3Schema":{"description":"Auto-generated derived type for VpcEndpointSpec via `CustomResource`","properties":{"spec":{"description":"Describes an AWS VPC endpoint to create.","properties":{"availabilityZoneIds":{"description":"The IDs of the availability zones in which the service is available.","items":{"type":"string"},"type":"array"},"awsServiceName":{"description":"The name of the service to connect to.","type":"string"},"roleSuffix":{"description":"A suffix to use in the name of the IAM role that is created.","type":"string"}},"required":["availabilityZoneIds","awsServiceName","roleSuffix"],"type":"object"},"status":{"nullable":true,"properties":{"autoAssignedAzs":{"items":{"type":"string"},"nullable":true,"type":"array"},"conditions":{"items":{"description":"Condition contains details for one aspect of the current state of this API Resource.","properties":{"lastTransitionTime":{"description":"lastTransitionTime is the last time the condition transitioned from one status to another. This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.","format":"date-time","type":"string"},"message":{"description":"message is a human readable message indicating details about the transition. This may be an empty string.","type":"string"},"observedGeneration":{"description":"observedGeneration represents the .metadata.generation that the condition was set based upon. For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date with respect to the current state of the instance.","format":"int64","type":"integer"},"reason":{"description":"reason contains a programmatic identifier indicating the reason for the condition's last transition. Producers of specific condition types may define expected values and meanings for this field, and whether the values are considered a guaranteed API. The value should be a CamelCase string. This field may not be empty.","type":"string"},"status":{"description":"status of the condition, one of True, False, Unknown.","type":"string"},"type":{"description":"type of condition in CamelCase or in foo.example.com/CamelCase.","type":"string"}},"required":["lastTransitionTime","message","reason","status","type"],"type":"object"},"nullable":true,"type":"array"},"state":{"description":"The AWS SDK State enum is not serializable, so we have to make our own.","enum":["pendingServiceDiscovery","creatingEndpoint","recreatingEndpoint","updatingEndpoint","available","deleted","deleting","expired","failed","pending","pendingAcceptance","rejected","unknown","missingAvailabilityZones",null],"nullable":true,"type":"string"},"vpcEndpointId":{"nullable":true,"type":"string"}},"type":"object"}},"required":["spec"],"title":"VpcEndpoint","type":"object"}},"served":true,"storage":true,"subresources":{"status":{}}}]}}