From 24dd8491789d7472cacd3ab64dacd6020d6ab13a Mon Sep 17 00:00:00 2001 From: Malte Sander Date: Thu, 25 May 2023 10:02:12 +0200 Subject: [PATCH 1/4] bumped operator-rs to 0.41.0 --- Cargo.lock | 310 +++++++++--------- rust/operator-binary/Cargo.toml | 4 +- .../src/pod_enrichment_controller.rs | 7 +- .../src/restart_controller/pod.rs | 6 +- .../src/restart_controller/statefulset.rs | 8 +- 5 files changed, 174 insertions(+), 161 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 72fd203..4128397 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -16,9 +16,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "0.7.20" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" dependencies = [ "memchr", ] @@ -40,13 +40,13 @@ checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" [[package]] name = "async-trait" -version = "0.1.59" +version = "0.1.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6e93155431f3931513b243d371981bb2770112b370c82745a1d19d2f99364" +checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.16", ] [[package]] @@ -72,6 +72,18 @@ 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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f1e31e207a6b8fb791a38ea3105e6cb541f55e4d029902d3039a4ad07cc4105" + [[package]] name = "bit-set" version = "0.5.3" @@ -164,12 +176,22 @@ dependencies = [ [[package]] name = "clap" -version = "4.1.1" +version = "4.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec7a4128863c188deefe750ac1d1dfe66c236909f845af04beed823638dc1b2" +checksum = "906f7fe1da4185b7a282b2bc90172a496f9def1aca4545fe7526810741591e14" dependencies = [ - "bitflags", + "clap_builder", "clap_derive", + "once_cell", +] + +[[package]] +name = "clap_builder" +version = "4.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "351f9ad9688141ed83dfd8f5fb998a06225ef444b48ff4dc43de6d409b7fd10b" +dependencies = [ + "bitflags", "clap_lex", "is-terminal", "once_cell", @@ -179,25 +201,21 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.1.0" +version = "4.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8" +checksum = "81d7dc0031c3a59a04fc2ba395c8e2dd463cba1859275f065d225f6122221b45" dependencies = [ "heck", - "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 2.0.16", ] [[package]] name = "clap_lex" -version = "0.3.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8" -dependencies = [ - "os_str_bytes", -] +checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" [[package]] name = "codespan-reporting" @@ -278,7 +296,7 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn", + "syn 1.0.109", ] [[package]] @@ -295,7 +313,7 @@ checksum = "1362b0ddcfc4eb0a1f57b68bd77dd99f0e826958a96abd0ae9bd092e114ffed6" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -319,7 +337,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn", + "syn 1.0.109", ] [[package]] @@ -330,7 +348,7 @@ checksum = "7618812407e9402654622dd402b0a89dff9ba93badd6540781526117b92aab7e" dependencies = [ "darling_core", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -354,7 +372,7 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -392,9 +410,9 @@ checksum = "4f94fa09c2aeea5b8839e414b7b841bf429fd25b9c522116ac97ee87856d88b2" [[package]] name = "either" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "encoding" @@ -529,9 +547,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" [[package]] name = "futures" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" dependencies = [ "futures-channel", "futures-core", @@ -544,9 +562,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" dependencies = [ "futures-core", "futures-sink", @@ -554,15 +572,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" [[package]] name = "futures-executor" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" dependencies = [ "futures-core", "futures-task", @@ -571,38 +589,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] name = "futures-macro" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.16", ] [[package]] name = "futures-sink" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" [[package]] name = "futures-task" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" [[package]] name = "futures-util" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ "futures 0.1.31", "futures-channel", @@ -888,12 +906,13 @@ dependencies = [ [[package]] name = "json-patch" -version = "0.2.7" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3fa5a61630976fc4c353c70297f2e93f1930e3ccee574d59d618ccbd5154ce" +checksum = "1f54898088ccb91df1b492cc80029a6fdf1c48ca0db7c6822a8babad69c94658" dependencies = [ "serde", "serde_json", + "thiserror", "treediff", ] @@ -910,11 +929,11 @@ dependencies = [ [[package]] name = "k8s-openapi" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d9455388f4977de4d0934efa9f7d36296295537d774574113a20f6082de03da" +checksum = "cd990069640f9db34b3b0f7a1afc62a05ffaa3be9b66aa3c313f58346df7f788" dependencies = [ - "base64", + "base64 0.21.1", "bytes", "chrono", "schemars", @@ -925,9 +944,9 @@ dependencies = [ [[package]] name = "kube" -version = "0.76.0" +version = "0.82.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcf241a3a42bca4a2d1c21f2f34a659655032a7858270c7791ad4433aa8d79cb" +checksum = "dc7d3d52dd5c871991679102e80dfb192faaaa09fecdbccdd8c55af264ce7a8f" dependencies = [ "k8s-openapi", "kube-client", @@ -938,16 +957,16 @@ dependencies = [ [[package]] name = "kube-client" -version = "0.76.0" +version = "0.82.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e442b4e6d55c4b3d0c0c70d79a8865bf17e2c33725f9404bfcb8a29ee002ffe" +checksum = "544339f1665488243f79080441cacb09c997746fd763342303e66eebb9d3ba13" dependencies = [ - "base64", + "base64 0.20.0", "bytes", "chrono", "dirs-next", "either", - "futures 0.3.25", + "futures 0.3.28", "http", "http-body", "hyper", @@ -962,7 +981,7 @@ dependencies = [ "secrecy", "serde", "serde_json", - "serde_yaml 0.8.26", + "serde_yaml 0.9.21", "thiserror", "tokio", "tokio-util", @@ -973,9 +992,9 @@ dependencies = [ [[package]] name = "kube-core" -version = "0.76.0" +version = "0.82.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eca2e1b1528287ba61602bbd17d0aa717fbb4d0fb257f4fa3a5fa884116ef778" +checksum = "25983d07f414dfffba08c5951fe110f649113416b1d8e22f7c89c750eb2555a7" dependencies = [ "chrono", "form_urlencoded", @@ -991,27 +1010,28 @@ dependencies = [ [[package]] name = "kube-derive" -version = "0.76.0" +version = "0.82.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1af50996adb7e1251960d278859772fa30df99879dc154d792e36832209637cb" +checksum = "5af652b642aca19ef5194de3506aa39f89d788d5326a570da68b13a02d6c5ba2" dependencies = [ "darling", "proc-macro2", "quote", "serde_json", - "syn", + "syn 1.0.109", ] [[package]] name = "kube-runtime" -version = "0.76.0" +version = "0.82.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b9b312c38884a3f41d67e2f7580824b6f45d360b98497325b5630664b3a359d" +checksum = "125331201e3073707ac79c294c89021faa76c84da3a566a3749a2a93d295c98a" dependencies = [ "ahash", + "async-trait", "backoff", "derivative", - "futures 0.3.25", + "futures 0.3.28", "json-patch", "k8s-openapi", "kube-client", @@ -1126,6 +1146,12 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + [[package]] name = "mio" version = "0.8.5" @@ -1206,7 +1232,7 @@ checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1239,7 +1265,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e785d273968748578931e4dc3b4f5ec86b26e09d9e0d66b55adda7fce742f7a" dependencies = [ "async-trait", - "futures 0.3.25", + "futures 0.3.28", "futures-executor", "once_cell", "opentelemetry", @@ -1314,12 +1340,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "os_str_bytes" -version = "6.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" - [[package]] name = "overload" version = "0.1.1" @@ -1355,7 +1375,7 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03c64931a1a212348ec4f3b4362585eca7159d0d09cbdf4a7f74f02173596fd4" dependencies = [ - "base64", + "base64 0.13.1", ] [[package]] @@ -1381,7 +1401,7 @@ checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1408,35 +1428,11 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - [[package]] name = "proc-macro2" -version = "1.0.47" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" +checksum = "fa1fb82fc0c281dd9671101b66b771ebbe1eaf967b96ac8740dcba4b70005ca8" dependencies = [ "unicode-ident", ] @@ -1459,9 +1455,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.21" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" dependencies = [ "proc-macro2", ] @@ -1518,13 +1514,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.7.0" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" +checksum = "d1a59b5d8e97dee33696bf13c5ba8ab85341c002922fba050069326b9c498974" dependencies = [ "aho-corasick", "memchr", - "regex-syntax", + "regex-syntax 0.7.2", ] [[package]] @@ -1533,7 +1529,7 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" dependencies = [ - "regex-syntax", + "regex-syntax 0.6.28", ] [[package]] @@ -1542,6 +1538,12 @@ version = "0.6.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" +[[package]] +name = "regex-syntax" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" + [[package]] name = "rustix" version = "0.36.5" @@ -1589,7 +1591,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn", + "syn 1.0.109", ] [[package]] @@ -1625,9 +1627,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.149" +version = "1.0.163" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "256b9932320c590e707b94576e3cc1f7c9024d0ee6612dfbcf1cb106cbe8e055" +checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" dependencies = [ "serde_derive", ] @@ -1644,13 +1646,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.149" +version = "1.0.163" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4eae9b04cbffdfd550eb462ed33bc6a1b68c935127d008b27444d08380f94e4" +checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.16", ] [[package]] @@ -1661,14 +1663,14 @@ checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "serde_json" -version = "1.0.89" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db" +checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" dependencies = [ "indexmap", "itoa", @@ -1690,9 +1692,9 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.14" +version = "0.9.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d232d893b10de3eb7258ff01974d6ee20663d8e833263c99409d4b13a0209da" +checksum = "d9d684e3ec7de3bf5466b32bd75303ac16f0736426e5a4e0d6e489559ce1249c" dependencies = [ "indexmap", "itoa", @@ -1736,9 +1738,9 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "snafu" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a152ba99b054b22972ee794cf04e5ef572da1229e33b65f3c57abbff0525a454" +checksum = "cb0656e7e3ffb70f6c39b3c2a86332bb74aa3c679da781642590f3c1118c5045" dependencies = [ "doc-comment", "snafu-derive", @@ -1746,14 +1748,14 @@ dependencies = [ [[package]] name = "snafu-derive" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5e79cdebbabaebb06a9bdbaedc7f159b410461f63611d4d0e3fb0fab8fed850" +checksum = "475b3bbe5245c26f2d8a6f62d67c1f30eb9fffeccee721c45d162c3ebbdf81b2" dependencies = [ "heck", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1773,7 +1775,7 @@ dependencies = [ "anyhow", "built", "clap", - "futures 0.3.25", + "futures 0.3.28", "serde", "serde_json", "snafu", @@ -1785,15 +1787,15 @@ dependencies = [ [[package]] name = "stackable-operator" -version = "0.28.0" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=0.28.0#8bc19d4f1d7df7729dfbaa5746607ba1f21d9a9c" +version = "0.41.0" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=0.41.0#270b52aeea0f4496c351cfd0e2d22f928fbefd91" dependencies = [ "chrono", "clap", "const_format", "derivative", "either", - "futures 0.3.25", + "futures 0.3.28", "json-patch", "k8s-openapi", "kube", @@ -1806,7 +1808,7 @@ dependencies = [ "schemars", "serde", "serde_json", - "serde_yaml 0.9.14", + "serde_yaml 0.9.21", "snafu", "stackable-operator-derive", "strum", @@ -1819,13 +1821,13 @@ dependencies = [ [[package]] name = "stackable-operator-derive" -version = "0.28.0" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=0.28.0#8bc19d4f1d7df7729dfbaa5746607ba1f21d9a9c" +version = "0.41.0" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=0.41.0#270b52aeea0f4496c351cfd0e2d22f928fbefd91" dependencies = [ "darling", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1853,14 +1855,25 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn", + "syn 1.0.109", +] + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", ] [[package]] name = "syn" -version = "1.0.105" +version = "2.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908" +checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01" dependencies = [ "proc-macro2", "quote", @@ -1878,22 +1891,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.37" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.37" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.16", ] [[package]] @@ -1977,7 +1990,7 @@ checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -2046,11 +2059,11 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.3.5" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" +checksum = "5d1d42a9b3f3ec46ba828e8d376aec14592ea199f70a06a548587ecd1c4ab658" dependencies = [ - "base64", + "base64 0.20.0", "bitflags", "bytes", "futures-core", @@ -2058,6 +2071,7 @@ dependencies = [ "http", "http-body", "http-range-header", + "mime", "pin-project-lite", "tower-layer", "tower-service", @@ -2097,7 +2111,7 @@ checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -2155,9 +2169,9 @@ dependencies = [ [[package]] name = "treediff" -version = "3.0.2" +version = "4.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "761e8d5ad7ce14bb82b7e61ccc0ca961005a275a060b9644a2431aa11553c2ff" +checksum = "52984d277bdf2a751072b5df30ec0377febdb02f7696d64c2d7d54630bac4303" dependencies = [ "serde_json", ] @@ -2203,9 +2217,9 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] name = "unsafe-libyaml" -version = "0.2.4" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1e5fa573d8ac5f1a856f8d7be41d390ee973daf97c806b2c1a465e4e1406e68" +checksum = "1865806a559042e51ab5414598446a5871b561d21b6764f2eabb0dd481d880a6" [[package]] name = "url" @@ -2273,7 +2287,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "wasm-bindgen-shared", ] @@ -2295,7 +2309,7 @@ checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", "wasm-bindgen-backend", "wasm-bindgen-shared", ] diff --git a/rust/operator-binary/Cargo.toml b/rust/operator-binary/Cargo.toml index ea75276..1bc2164 100644 --- a/rust/operator-binary/Cargo.toml +++ b/rust/operator-binary/Cargo.toml @@ -15,11 +15,11 @@ futures = { version = "0.3", features = ["compat"] } serde = "1.0" serde_json = "1.0" snafu = "0.7" -stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.28.0" } +stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.41.0" } strum = { version = "0.24", features = ["derive"] } tokio = { version = "1.25", features = ["macros", "rt-multi-thread"] } tracing = "0.1" [build-dependencies] built = { version = "0.5", features = ["chrono", "git2"] } -stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.28.0" } +stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.41.0" } diff --git a/rust/operator-binary/src/pod_enrichment_controller.rs b/rust/operator-binary/src/pod_enrichment_controller.rs index 77b362c..218e432 100644 --- a/rust/operator-binary/src/pod_enrichment_controller.rs +++ b/rust/operator-binary/src/pod_enrichment_controller.rs @@ -5,9 +5,8 @@ use snafu::{ResultExt, Snafu}; use stackable_operator::{ k8s_openapi::api::core::v1::{Node, Pod}, kube::{ - api::ListParams, core::ObjectMeta, - runtime::{controller, reflector::ObjectRef, Controller}, + runtime::{controller, reflector::ObjectRef, Controller, watcher}, }, logging::controller::{report_controller_reconciled, ReconcilerError}, }; @@ -50,13 +49,13 @@ impl ReconcilerError for Error { pub async fn start(client: &stackable_operator::client::Client) { let controller = Controller::new( client.get_all_api::(), - ListParams::default().labels("enrichment.stackable.tech/enabled=true"), + watcher::Config::default().labels("enrichment.stackable.tech/enabled=true"), ); let pods = controller.store(); controller .watches( client.get_all_api::(), - ListParams::default(), + watcher::Config::default(), move |node| { pods.state() .into_iter() diff --git a/rust/operator-binary/src/restart_controller/pod.rs b/rust/operator-binary/src/restart_controller/pod.rs index 37f2483..450d294 100644 --- a/rust/operator-binary/src/restart_controller/pod.rs +++ b/rust/operator-binary/src/restart_controller/pod.rs @@ -10,9 +10,9 @@ use stackable_operator::{ }, kube::{ self, - api::{EvictParams, ListParams}, + api::{EvictParams}, core::DynamicObject, - runtime::{controller::Action, reflector::ObjectRef, Controller}, + runtime::{controller::Action, reflector::ObjectRef, Controller, watcher}, }, logging::controller::{report_controller_reconciled, ReconcilerError}, }; @@ -61,7 +61,7 @@ impl ReconcilerError for Error { } pub async fn start(client: &Client) { - let controller = Controller::new(client.get_all_api::(), ListParams::default()); + let controller = Controller::new(client.get_all_api::(), watcher::Config::default()); controller .run( reconcile, diff --git a/rust/operator-binary/src/restart_controller/statefulset.rs b/rust/operator-binary/src/restart_controller/statefulset.rs index 364670a..dc8f7dd 100644 --- a/rust/operator-binary/src/restart_controller/statefulset.rs +++ b/rust/operator-binary/src/restart_controller/statefulset.rs @@ -12,7 +12,7 @@ use stackable_operator::k8s_openapi::api::core::v1::{ ConfigMap, EnvFromSource, EnvVar, PodSpec, Secret, Volume, }; use stackable_operator::kube; -use stackable_operator::kube::api::{ListParams, Patch, PatchParams}; +use stackable_operator::kube::api::{Patch, PatchParams}; use stackable_operator::kube::core::DynamicObject; use stackable_operator::kube::runtime::controller::{ trigger_self, trigger_with, Action, ReconcileRequest, @@ -84,13 +84,13 @@ pub async fn start(client: &Client) { stream::select( stream::select( trigger_all( - reflector(cm_store, watcher(cms, ListParams::default())) + reflector(cm_store, watcher(cms, watcher::Config::default())) .inspect(|_| cms_inited.store(true, std::sync::atomic::Ordering::SeqCst)) .touched_objects(), sts_store.as_reader(), ), trigger_all( - reflector(secret_store, watcher(secrets, ListParams::default())) + reflector(secret_store, watcher(secrets, watcher::Config::default())) .inspect(|_| { secrets_inited.store(true, std::sync::atomic::Ordering::SeqCst) }) @@ -103,7 +103,7 @@ pub async fn start(client: &Client) { sts_store, watcher( stses, - ListParams::default().labels("restarter.stackable.tech/enabled=true"), + watcher::Config::default().labels("restarter.stackable.tech/enabled=true"), ), ) .applied_objects(), From c2bebb51ee1e3c0eafdbbb4a15f5e96602f76cb8 Mon Sep 17 00:00:00 2001 From: Malte Sander Date: Thu, 25 May 2023 10:03:21 +0200 Subject: [PATCH 2/4] adapted changelog --- CHANGELOG.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6867583..678dd6c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,12 @@ All notable changes to this project will be documented in this file. - Generate OLM bundle for Release 23.4.0 ([#160]). -[#160]: https://github.com/stackabletech/zookeeper-operator/pull/160 +### Changed + +- `operator-rs` `0.28.0` -> `0.41.0` ([#161]). + +[#160]: https://github.com/stackabletech/commons-operator/pull/160 +[#161]: https://github.com/stackabletech/commons-operator/pull/161 ## [23.4.0] - 2023-04-17 From 583fe27417aaa8a38619dcd88cd17394f016edd3 Mon Sep 17 00:00:00 2001 From: Malte Sander Date: Thu, 25 May 2023 10:07:15 +0200 Subject: [PATCH 3/4] rustfmt --- rust/operator-binary/src/pod_enrichment_controller.rs | 2 +- rust/operator-binary/src/restart_controller/pod.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rust/operator-binary/src/pod_enrichment_controller.rs b/rust/operator-binary/src/pod_enrichment_controller.rs index 218e432..65eaeb8 100644 --- a/rust/operator-binary/src/pod_enrichment_controller.rs +++ b/rust/operator-binary/src/pod_enrichment_controller.rs @@ -6,7 +6,7 @@ use stackable_operator::{ k8s_openapi::api::core::v1::{Node, Pod}, kube::{ core::ObjectMeta, - runtime::{controller, reflector::ObjectRef, Controller, watcher}, + runtime::{controller, reflector::ObjectRef, watcher, Controller}, }, logging::controller::{report_controller_reconciled, ReconcilerError}, }; diff --git a/rust/operator-binary/src/restart_controller/pod.rs b/rust/operator-binary/src/restart_controller/pod.rs index 450d294..c6c69f2 100644 --- a/rust/operator-binary/src/restart_controller/pod.rs +++ b/rust/operator-binary/src/restart_controller/pod.rs @@ -10,9 +10,9 @@ use stackable_operator::{ }, kube::{ self, - api::{EvictParams}, + api::EvictParams, core::DynamicObject, - runtime::{controller::Action, reflector::ObjectRef, Controller, watcher}, + runtime::{controller::Action, reflector::ObjectRef, watcher, Controller}, }, logging::controller::{report_controller_reconciled, ReconcilerError}, }; From 3a1ca0bd6bf04864717e75ba5da5d9721d098070 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Natalie=20Klestrup=20R=C3=B6ijezon?= Date: Thu, 25 May 2023 10:53:59 +0200 Subject: [PATCH 4/4] Fix Nix build --- rust/operator-binary/build.rs | 12 +++++++++++- rust/operator-binary/src/main.rs | 11 ++++++----- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/rust/operator-binary/build.rs b/rust/operator-binary/build.rs index d8f91cb..ed36fcf 100644 --- a/rust/operator-binary/build.rs +++ b/rust/operator-binary/build.rs @@ -1,3 +1,13 @@ +use std::path::PathBuf; + fn main() { - built::write_built_file().expect("Failed to acquire build-time information"); + let out_dir = PathBuf::from(std::env::var("OUT_DIR").expect("OUT_DIR is required")); + built::write_built_file_with_opts( + // built's env module depends on a whole bunch of variables that crate2nix doesn't provide + // so we grab the specific env variables that we care about out ourselves instead. + built::Options::default().set_env(false), + "Cargo.toml".as_ref(), + &out_dir.join("built.rs"), + ) + .unwrap(); } diff --git a/rust/operator-binary/src/main.rs b/rust/operator-binary/src/main.rs index e7fb9d4..ba8f89a 100644 --- a/rust/operator-binary/src/main.rs +++ b/rust/operator-binary/src/main.rs @@ -4,7 +4,7 @@ mod restart_controller; use futures::pin_mut; use stackable_operator::cli::{Command, ProductOperatorRun}; -use clap::Parser; +use clap::{crate_description, crate_version, Parser}; use stackable_operator::commons::{ authentication::AuthenticationClass, s3::{S3Bucket, S3Connection}, @@ -13,10 +13,11 @@ use stackable_operator::CustomResourceExt; mod built_info { include!(concat!(env!("OUT_DIR"), "/built.rs")); + pub const TARGET_PLATFORM: Option<&str> = option_env!("TARGET"); } #[derive(Parser)] -#[clap(about = built_info::PKG_DESCRIPTION, author = stackable_operator::cli::AUTHOR)] +#[clap(about, author)] struct Opts { #[clap(subcommand)] cmd: Command, @@ -42,10 +43,10 @@ async fn main() -> anyhow::Result<()> { tracing_target, ); stackable_operator::utils::print_startup_string( - built_info::PKG_DESCRIPTION, - built_info::PKG_VERSION, + crate_description!(), + crate_version!(), built_info::GIT_VERSION, - built_info::TARGET, + built_info::TARGET_PLATFORM.unwrap_or("unknown target"), built_info::BUILT_TIME_UTC, built_info::RUSTC_VERSION, );