Update to kube v0.63 (#7170)

* Update to kube v0.63 (cherry picked from commit b2392b2) Signed-off-by: Oliver Gould <ver@buoyant.io>
linkerd · Mar 31, 2022 · bb40cfe · bb40cfe
1 parent 8074613
commit bb40cfe
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 18 deletions.
diff --git a/Cargo.lock b/Cargo.lock
@@ -743,9 +743,22 @@ dependencies = [
 
 [[package]]
 name = "kube"
-version = "0.61.0"
+version = "0.63.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbaea4edf25bd83d77eebacd353bacd35d659678d57238aae07a8d739b26f1cd"
+checksum = "2c19c08adecde7d68052bfccf9f8ae663f680380e297f20249cef7943df66f54"
+dependencies = [
+ "k8s-openapi",
+ "kube-client",
+ "kube-core",
+ "kube-derive",
+ "kube-runtime",
+]
+
+[[package]]
+name = "kube-client"
+version = "0.63.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da7ca26f7b912055aec302c376de4f3e1c749d121fbed91088203848e3dbd978"
 dependencies = [
  "base64",
  "bytes",
@@ -762,7 +775,6 @@ dependencies = [
  "jsonpath_lib",
  "k8s-openapi",
  "kube-core",
- "kube-derive",
  "openssl",
  "pem",
  "pin-project 1.0.8",
@@ -783,9 +795,9 @@ dependencies = [
 
 [[package]]
 name = "kube-core"
-version = "0.61.0"
+version = "0.63.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa3021021480d7034e2cbe50bff9e8176e5ce33ddd6ba0c26ea9cfe310304c63"
+checksum = "56229a53d7ce86e3e31c4aaf18a957b6f68305126ebfb12523312b2c8a43f19c"
 dependencies = [
  "chrono",
  "form_urlencoded",
@@ -800,9 +812,9 @@ dependencies = [
 
 [[package]]
 name = "kube-derive"
-version = "0.61.0"
+version = "0.63.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fc225a2402b84bb8237399177424276e5e9e3ff1e3efebb19e4793b540773f4"
+checksum = "45a9c6f93a170382c384eddf05ba165a96b38ecc63db8814d750db2ee349bd89"
 dependencies = [
  "darling",
  "proc-macro2",
@@ -813,16 +825,16 @@ dependencies = [
 
 [[package]]
 name = "kube-runtime"
-version = "0.61.0"
+version = "0.63.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b10dde88f05e8dc156d72736639476b62ae1bedf99680dc32556ac4de274a9ea"
+checksum = "a168bfeebab8913a0fca198c1f30d8d8c5f04d3eee1645aa5619a27a0a656c14"
 dependencies = [
  "dashmap",
  "derivative",
  "futures",
  "json-patch",
  "k8s-openapi",
- "kube",
+ "kube-client",
  "pin-project 1.0.8",
  "serde",
  "serde_json",
@@ -905,7 +917,6 @@ dependencies = [
  "futures",
  "k8s-openapi",
  "kube",
- "kube-runtime",
  "schemars",
  "serde",
  "serde_json",

diff --git a/policy-controller/Cargo.toml b/policy-controller/Cargo.toml
@@ -15,7 +15,7 @@ anyhow = "1"
 drain = "0.1"
 futures = { version = "0.3", default-features = false }
 hyper = { version = "0.14", features = ["http1", "http2", "runtime", "server"] }
-kube = { version = "0.61", default-features = false, features = ["admission", "client"] }
+kube = { version = "0.63", default-features = false, features = ["admission", "client"] }
 linkerd-policy-controller-core = { path = "./core" }
 linkerd-policy-controller-grpc = { path = "./grpc" }
 linkerd-policy-controller-k8s-index = { path = "./k8s/index" }

diff --git a/policy-controller/k8s/api/Cargo.toml b/policy-controller/k8s/api/Cargo.toml
@@ -8,8 +8,7 @@ publish = false
 [dependencies]
 futures = { version = "0.3", default-features = false }
 k8s-openapi = { version = "0.13", default-features = false, features = ["v1_20"] }
-kube = { version = "0.61", default-features = false, features = ["derive"] }
-kube-runtime = { version = "0.61", default-features = false }
+kube = { version = "0.63", default-features = false, features = ["client", "derive", "runtime"] }
 schemars = "0.8"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"

diff --git a/policy-controller/k8s/api/src/lib.rs b/policy-controller/k8s/api/src/lib.rs
@@ -13,9 +13,11 @@ pub use k8s_openapi::api::{
     self,
     core::v1::{Namespace, Node, NodeSpec, Pod, PodSpec, PodStatus},
 };
-use kube::api::{Api, ListParams};
 pub use kube::api::{ObjectMeta, ResourceExt};
-use kube_runtime::watcher;
+use kube::{
+    api::{Api, ListParams},
+    runtime::watcher,
+};
 use tracing::info_span;
 
 /// Resource watches.

diff --git a/policy-controller/k8s/api/src/watch.rs b/policy-controller/k8s/api/src/watch.rs
@@ -1,10 +1,9 @@
 use futures::prelude::*;
+pub use kube::runtime::watcher::{Event, Result};
 use std::pin::Pin;
 use tokio::time;
 use tracing::{info, Instrument};
 
-pub use kube_runtime::watcher::{Event, Result};
-
 /// Wraps an event stream that never terminates.
 pub struct Watch<T> {
     initialized: bool,