From 2519c9a339b7ce48f6611fac7667a15a6feef606 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 23 Nov 2023 02:59:46 +0000
Subject: [PATCH 1/2] Bump amp-common from v0.5.4 to v0.5.5

Bumps [amp-common](https://github.com/amphitheatre-app/common) from v0.5.4 to v0.5.5.
- [Commits](https://github.com/amphitheatre-app/common/compare/a11926a37118242b07e269031b08687cd16cb5ee...07468972db0ab9bf1873f8744fb9b3fb1a5cd3b6)

---
updated-dependencies:
- dependency-name: amp-common
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Cargo.lock | 177 +++++++++++++++++++++++++++++++++++++++++++++++------
 Cargo.toml |   2 +-
 2 files changed, 160 insertions(+), 19 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8823903..77ea306 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -74,7 +74,7 @@ dependencies = [
  "futures",
  "headers",
  "k8s-openapi",
- "kube",
+ "kube 0.86.0",
  "serde",
  "serde_json",
  "serde_yaml",
@@ -93,8 +93,8 @@ dependencies = [
 
 [[package]]
 name = "amp-common"
-version = "0.5.4"
-source = "git+https://github.com/amphitheatre-app/common?tag=v0.5.4#a11926a37118242b07e269031b08687cd16cb5ee"
+version = "0.5.5"
+source = "git+https://github.com/amphitheatre-app/common?tag=v0.5.5#07468972db0ab9bf1873f8744fb9b3fb1a5cd3b6"
 dependencies = [
  "anyhow",
  "chrono",
@@ -104,7 +104,7 @@ dependencies = [
  "dirs 5.0.1",
  "json_comments",
  "k8s-openapi",
- "kube",
+ "kube 0.87.1",
  "notify",
  "oci-distribution",
  "schemars",
@@ -132,7 +132,7 @@ dependencies = [
  "dotenv",
  "futures",
  "k8s-openapi",
- "kube",
+ "kube 0.86.0",
  "serde",
  "serde_json",
  "serde_yaml",
@@ -150,7 +150,7 @@ version = "0.6.9"
 dependencies = [
  "amp-common",
  "clap",
- "kube",
+ "kube 0.86.0",
  "serde",
  "serde_yaml",
  "tempfile",
@@ -163,7 +163,7 @@ dependencies = [
  "amp-common",
  "amp-resources",
  "k8s-openapi",
- "kube",
+ "kube 0.86.0",
  "thiserror",
  "toml 0.8.8",
  "tracing",
@@ -178,7 +178,7 @@ dependencies = [
  "anyhow",
  "k8s-metrics",
  "k8s-openapi",
- "kube",
+ "kube 0.86.0",
  "serde",
  "serde_json",
  "serde_yaml",
@@ -706,8 +706,18 @@ version = "0.14.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850"
 dependencies = [
- "darling_core",
- "darling_macro",
+ "darling_core 0.14.4",
+ "darling_macro 0.14.4",
+]
+
+[[package]]
+name = "darling"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e"
+dependencies = [
+ "darling_core 0.20.3",
+ "darling_macro 0.20.3",
 ]
 
 [[package]]
@@ -724,17 +734,42 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "darling_core"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim",
+ "syn 2.0.38",
+]
+
 [[package]]
 name = "darling_macro"
 version = "0.14.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e"
 dependencies = [
- "darling_core",
+ "darling_core 0.14.4",
  "quote",
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "darling_macro"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
+dependencies = [
+ "darling_core 0.20.3",
+ "quote",
+ "syn 2.0.38",
+]
+
 [[package]]
 name = "data-encoding"
 version = "2.4.0"
@@ -1510,10 +1545,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8647c2211a9b480d910b155d573602c52cd5f646acecb06a03d594865dc4784"
 dependencies = [
  "k8s-openapi",
- "kube-client",
- "kube-core",
- "kube-derive",
- "kube-runtime",
+ "kube-client 0.86.0",
+ "kube-core 0.86.0",
+ "kube-derive 0.86.0",
+ "kube-runtime 0.86.0",
+]
+
+[[package]]
+name = "kube"
+version = "0.87.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e34392aea935145070dcd5b39a6dea689ac6534d7d117461316c3d157b1d0fc3"
+dependencies = [
+ "k8s-openapi",
+ "kube-client 0.87.1",
+ "kube-core 0.87.1",
+ "kube-derive 0.87.1",
+ "kube-runtime 0.87.1",
 ]
 
 [[package]]
@@ -1535,7 +1583,43 @@ dependencies = [
  "hyper-timeout",
  "jsonpath_lib",
  "k8s-openapi",
- "kube-core",
+ "kube-core 0.86.0",
+ "pem",
+ "pin-project",
+ "rustls",
+ "rustls-pemfile",
+ "secrecy",
+ "serde",
+ "serde_json",
+ "serde_yaml",
+ "thiserror",
+ "tokio",
+ "tokio-util",
+ "tower",
+ "tower-http",
+ "tracing",
+]
+
+[[package]]
+name = "kube-client"
+version = "0.87.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7266548b9269d9fa19022620d706697e64f312fb2ba31b93e6986453fcc82c92"
+dependencies = [
+ "base64 0.21.4",
+ "bytes",
+ "chrono",
+ "either",
+ "futures",
+ "home",
+ "http",
+ "http-body",
+ "hyper",
+ "hyper-rustls",
+ "hyper-timeout",
+ "jsonpath_lib",
+ "k8s-openapi",
+ "kube-core 0.87.1",
  "pem",
  "pin-project",
  "rustls",
@@ -1570,19 +1654,50 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "kube-core"
+version = "0.87.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8321c315b96b59f59ef6b33f604b84b905ab8f9ff114a4f909d934c520227b1"
+dependencies = [
+ "chrono",
+ "form_urlencoded",
+ "http",
+ "json-patch",
+ "k8s-openapi",
+ "once_cell",
+ "schemars",
+ "serde",
+ "serde_json",
+ "thiserror",
+]
+
 [[package]]
 name = "kube-derive"
 version = "0.86.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a8dd623cf49cd632da4727a70e05d9cb948d5ea1098a1af49b1fd3bc9ec60b3c"
 dependencies = [
- "darling",
+ "darling 0.14.4",
  "proc-macro2",
  "quote",
  "serde_json",
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "kube-derive"
+version = "0.87.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d54591e1f37fc329d412c0fdaced010cc1305b546a39f283fc51700f8fb49421"
+dependencies = [
+ "darling 0.20.3",
+ "proc-macro2",
+ "quote",
+ "serde_json",
+ "syn 2.0.38",
+]
+
 [[package]]
 name = "kube-runtime"
 version = "0.86.0"
@@ -1597,7 +1712,33 @@ dependencies = [
  "hashbrown 0.14.1",
  "json-patch",
  "k8s-openapi",
- "kube-client",
+ "kube-client 0.86.0",
+ "parking_lot",
+ "pin-project",
+ "serde",
+ "serde_json",
+ "smallvec",
+ "thiserror",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
+[[package]]
+name = "kube-runtime"
+version = "0.87.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e511e2c1a368d9d4bf6e70db58197e535d818df355b5a2007a8aeb17a370a8ba"
+dependencies = [
+ "ahash",
+ "async-trait",
+ "backoff",
+ "derivative",
+ "futures",
+ "hashbrown 0.14.1",
+ "json-patch",
+ "k8s-openapi",
+ "kube-client 0.87.1",
  "parking_lot",
  "pin-project",
  "serde",
diff --git a/Cargo.toml b/Cargo.toml
index 2fe6c13..00969c3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -21,7 +21,7 @@ members = [
 # https://doc.rust-lang.org/cargo/reference/workspaces.html#the-workspacedependencies-table
 [workspace.dependencies]
 anyhow = "1.0"
-amp-common = { git = "https://github.com/amphitheatre-app/common", tag = "v0.5.4" }
+amp-common = { git = "https://github.com/amphitheatre-app/common", tag = "v0.5.5" }
 amp-resolver = { path = "resolver" }
 amp-resources = { path = "resources" }
 async-nats = "0.32.1"

From 7f142dbbf33d31028a119b456dfd85049d4d63a5 Mon Sep 17 00:00:00 2001
From: Eguo Wang <wangeguo@gmail.com>
Date: Thu, 30 Nov 2023 00:02:44 +0800
Subject: [PATCH 2/2] Bump kube-rs version to 0.87.1

---
 Cargo.lock | 179 +++++------------------------------------------------
 Cargo.toml |   2 +-
 2 files changed, 17 insertions(+), 164 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 77ea306..a16f203 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -74,7 +74,7 @@ dependencies = [
  "futures",
  "headers",
  "k8s-openapi",
- "kube 0.86.0",
+ "kube",
  "serde",
  "serde_json",
  "serde_yaml",
@@ -104,7 +104,7 @@ dependencies = [
  "dirs 5.0.1",
  "json_comments",
  "k8s-openapi",
- "kube 0.87.1",
+ "kube",
  "notify",
  "oci-distribution",
  "schemars",
@@ -132,7 +132,7 @@ dependencies = [
  "dotenv",
  "futures",
  "k8s-openapi",
- "kube 0.86.0",
+ "kube",
  "serde",
  "serde_json",
  "serde_yaml",
@@ -150,7 +150,7 @@ version = "0.6.9"
 dependencies = [
  "amp-common",
  "clap",
- "kube 0.86.0",
+ "kube",
  "serde",
  "serde_yaml",
  "tempfile",
@@ -163,7 +163,7 @@ dependencies = [
  "amp-common",
  "amp-resources",
  "k8s-openapi",
- "kube 0.86.0",
+ "kube",
  "thiserror",
  "toml 0.8.8",
  "tracing",
@@ -178,7 +178,7 @@ dependencies = [
  "anyhow",
  "k8s-metrics",
  "k8s-openapi",
- "kube 0.86.0",
+ "kube",
  "serde",
  "serde_json",
  "serde_yaml",
@@ -425,12 +425,6 @@ version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
-[[package]]
-name = "base64"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5"
-
 [[package]]
 name = "base64"
 version = "0.21.4"
@@ -700,38 +694,14 @@ dependencies = [
  "syn 2.0.38",
 ]
 
-[[package]]
-name = "darling"
-version = "0.14.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850"
-dependencies = [
- "darling_core 0.14.4",
- "darling_macro 0.14.4",
-]
-
 [[package]]
 name = "darling"
 version = "0.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e"
 dependencies = [
- "darling_core 0.20.3",
- "darling_macro 0.20.3",
-]
-
-[[package]]
-name = "darling_core"
-version = "0.14.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2",
- "quote",
- "strsim",
- "syn 1.0.109",
+ "darling_core",
+ "darling_macro",
 ]
 
 [[package]]
@@ -748,24 +718,13 @@ dependencies = [
  "syn 2.0.38",
 ]
 
-[[package]]
-name = "darling_macro"
-version = "0.14.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e"
-dependencies = [
- "darling_core 0.14.4",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "darling_macro"
 version = "0.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
 dependencies = [
- "darling_core 0.20.3",
+ "darling_core",
  "quote",
  "syn 2.0.38",
 ]
@@ -1538,19 +1497,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "kube"
-version = "0.86.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8647c2211a9b480d910b155d573602c52cd5f646acecb06a03d594865dc4784"
-dependencies = [
- "k8s-openapi",
- "kube-client 0.86.0",
- "kube-core 0.86.0",
- "kube-derive 0.86.0",
- "kube-runtime 0.86.0",
-]
-
 [[package]]
 name = "kube"
 version = "0.87.1"
@@ -1558,46 +1504,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e34392aea935145070dcd5b39a6dea689ac6534d7d117461316c3d157b1d0fc3"
 dependencies = [
  "k8s-openapi",
- "kube-client 0.87.1",
- "kube-core 0.87.1",
- "kube-derive 0.87.1",
- "kube-runtime 0.87.1",
-]
-
-[[package]]
-name = "kube-client"
-version = "0.86.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af8952521f3e8ce11920229e5f2965fef70525aecd9efc7b65e39bf9e2c6f66d"
-dependencies = [
- "base64 0.20.0",
- "bytes",
- "chrono",
- "either",
- "futures",
- "home",
- "http",
- "http-body",
- "hyper",
- "hyper-rustls",
- "hyper-timeout",
- "jsonpath_lib",
- "k8s-openapi",
- "kube-core 0.86.0",
- "pem",
- "pin-project",
- "rustls",
- "rustls-pemfile",
- "secrecy",
- "serde",
- "serde_json",
- "serde_yaml",
- "thiserror",
- "tokio",
- "tokio-util",
- "tower",
- "tower-http",
- "tracing",
+ "kube-client",
+ "kube-core",
+ "kube-derive",
+ "kube-runtime",
 ]
 
 [[package]]
@@ -1619,7 +1529,7 @@ dependencies = [
  "hyper-timeout",
  "jsonpath_lib",
  "k8s-openapi",
- "kube-core 0.87.1",
+ "kube-core",
  "pem",
  "pin-project",
  "rustls",
@@ -1636,24 +1546,6 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "kube-core"
-version = "0.86.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7608a0cd05dfa36167d2da982bb70f17feb5450f73ec601f6d428bbcf991c5b9"
-dependencies = [
- "chrono",
- "form_urlencoded",
- "http",
- "json-patch",
- "k8s-openapi",
- "once_cell",
- "schemars",
- "serde",
- "serde_json",
- "thiserror",
-]
-
 [[package]]
 name = "kube-core"
 version = "0.87.1"
@@ -1672,58 +1564,19 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "kube-derive"
-version = "0.86.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8dd623cf49cd632da4727a70e05d9cb948d5ea1098a1af49b1fd3bc9ec60b3c"
-dependencies = [
- "darling 0.14.4",
- "proc-macro2",
- "quote",
- "serde_json",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "kube-derive"
 version = "0.87.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d54591e1f37fc329d412c0fdaced010cc1305b546a39f283fc51700f8fb49421"
 dependencies = [
- "darling 0.20.3",
+ "darling",
  "proc-macro2",
  "quote",
  "serde_json",
  "syn 2.0.38",
 ]
 
-[[package]]
-name = "kube-runtime"
-version = "0.86.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fde2bd0b2d248be72f30c658b728f87e84c68495bec2c689dff7a3479eb29afd"
-dependencies = [
- "ahash",
- "async-trait",
- "backoff",
- "derivative",
- "futures",
- "hashbrown 0.14.1",
- "json-patch",
- "k8s-openapi",
- "kube-client 0.86.0",
- "parking_lot",
- "pin-project",
- "serde",
- "serde_json",
- "smallvec",
- "thiserror",
- "tokio",
- "tokio-util",
- "tracing",
-]
-
 [[package]]
 name = "kube-runtime"
 version = "0.87.1"
@@ -1738,7 +1591,7 @@ dependencies = [
  "hashbrown 0.14.1",
  "json-patch",
  "k8s-openapi",
- "kube-client 0.87.1",
+ "kube-client",
  "parking_lot",
  "pin-project",
  "serde",
diff --git a/Cargo.toml b/Cargo.toml
index 00969c3..460708d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -28,7 +28,7 @@ async-nats = "0.32.1"
 clap = { version = "4.4.8", features = ["derive", "env"] }
 dotenv = "0.15.0"
 futures = "0.3"
-kube = { version = "0.86.0", default-features = false, features = ["runtime", "derive", "rustls-tls"] }
+kube = { version = "0.87.1", default-features = false, features = ["runtime", "derive", "rustls-tls"] }
 k8s-openapi = { version = "0.20.0", default-features = false, features = ["schemars", "v1_28"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"