From 4484340be256aaaae7dd80e3a036df8e933d4302 Mon Sep 17 00:00:00 2001 From: Siegfried Weber Date: Tue, 6 Sep 2022 17:37:36 +0200 Subject: [PATCH 1/3] Upgrade stackable-operator to version 0.25.0 --- CHANGELOG.md | 2 + Cargo.lock | 389 ++++++++++++++------- deploy/helm/secret-operator/crds/crds.yaml | 6 +- deploy/manifests/crds.yaml | 6 +- rust/operator-binary/Cargo.toml | 3 +- rust/operator-binary/src/main.rs | 16 +- 6 files changed, 292 insertions(+), 130 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f85f81ce..ba912710 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,8 +7,10 @@ All notable changes to this project will be documented in this file. ### Changed - Include chart name when installing with a custom release name ([#153]). +- operator-rs: 0.10.0 -> 0.25.0 ([#180]). [#153]: https://github.com/stackabletech/secret-operator/pull/153 +[#180]: https://github.com/stackabletech/secret-operator/pull/180 ## [0.5.0] - 2022-06-30 diff --git a/Cargo.lock b/Cargo.lock index fe6ab15e..76653664 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -119,7 +119,7 @@ dependencies = [ "sync_wrapper", "tokio", "tower", - "tower-http 0.3.4", + "tower-http", "tower-layer", "tower-service", ] @@ -155,6 +155,21 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +[[package]] +name = "bit-set" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +dependencies = [ + "bit-vec", +] + +[[package]] +name = "bit-vec" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" + [[package]] name = "bitflags" version = "1.3.2" @@ -178,6 +193,12 @@ version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d" +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + [[package]] name = "bytes" version = "1.2.1" @@ -250,7 +271,7 @@ version = "3.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" dependencies = [ - "heck 0.4.0", + "heck", "proc-macro-error", "proc-macro2", "quote", @@ -302,11 +323,31 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +[[package]] +name = "crossbeam-channel" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51887d4adc7b564537b15adcfb307936f8075dfcd5f00dde9a9f1d29383682bc" +dependencies = [ + "cfg-if", + "once_cell", +] + [[package]] name = "darling" -version = "0.13.4" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" +checksum = "4529658bdda7fd6769b8614be250cdcfc3aeb0ee72fe66f9e41e5e5eb73eac02" dependencies = [ "darling_core", "darling_macro", @@ -314,9 +355,9 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.13.4" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" +checksum = "649c91bc01e8b1eac09fb91e8dbc7d517684ca6be8ebc75bb9cafc894f9fdb6f" dependencies = [ "fnv", "ident_case", @@ -328,9 +369,9 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.13.4" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" +checksum = "ddfc69c5bfcbd2fc09a0f38451d2daf0e372e367986a83906d1b0dbc88134fb5" dependencies = [ "darling_core", "quote", @@ -451,6 +492,16 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" +[[package]] +name = "fancy-regex" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d95b4efe5be9104a4a18a9916e86654319895138be727b229820c39257c30dda" +dependencies = [ + "bit-set", + "regex", +] + [[package]] name = "fastrand" version = "1.8.0" @@ -634,15 +685,6 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -[[package]] -name = "heck" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] - [[package]] name = "heck" version = "0.4.0" @@ -722,6 +764,24 @@ dependencies = [ "want", ] +[[package]] +name = "hyper-openssl" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6ee5d7a8f718585d1c3c61dfde28ef5b0bb14734b4db13f5ada856cdc6c612b" +dependencies = [ + "http", + "hyper", + "linked_hash_set", + "once_cell", + "openssl", + "openssl-sys", + "parking_lot", + "tokio", + "tokio-openssl", + "tower-layer", +] + [[package]] name = "hyper-timeout" version = "0.4.1" @@ -797,6 +857,12 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "integer-encoding" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02" + [[package]] name = "itertools" version = "0.10.3" @@ -871,9 +937,9 @@ dependencies = [ [[package]] name = "k8s-openapi" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0489fc937cc7616a9abfa61bf39c250d7e32e1325ef028c8d9278dd24ea395b3" +checksum = "d2ae2c04fcee6b01b04e3aadd56bb418932c8e0a9d8a93f48bc68c6bdcdb559d" dependencies = [ "base64", "bytes", @@ -886,9 +952,9 @@ dependencies = [ [[package]] name = "kube" -version = "0.68.0" +version = "0.74.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d41f782ddd187a0d8965607679bbd741052106b75330696ce7d7712b13194d88" +checksum = "a527a8001a61d8d470dab27ac650889938760c243903e7cd90faaf7c60a34bdd" dependencies = [ "k8s-openapi", "kube-client", @@ -899,9 +965,9 @@ dependencies = [ [[package]] name = "kube-client" -version = "0.68.0" +version = "0.74.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cced1a3e738c2a4bccb52d33066632369c668f366a71c9c58139d9360e1a341d" +checksum = "c0d48f42df4e8342e9f488c4b97e3759d0042c4e7ab1a853cc285adb44409480" dependencies = [ "base64", "bytes", @@ -912,6 +978,7 @@ dependencies = [ "http", "http-body", "hyper", + "hyper-openssl", "hyper-timeout", "hyper-tls", "jsonpath_lib", @@ -923,21 +990,21 @@ dependencies = [ "secrecy", "serde", "serde_json", - "serde_yaml", + "serde_yaml 0.8.26", "thiserror", "tokio", "tokio-native-tls", - "tokio-util 0.6.10", + "tokio-util 0.7.3", "tower", - "tower-http 0.2.5", + "tower-http", "tracing", ] [[package]] name = "kube-core" -version = "0.68.0" +version = "0.74.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6878656f5e349ef08b0a48d2b1841f1e68c4cf1ef42524feadad2f9a109dd888" +checksum = "91f56027f862fdcad265d2e9616af416a355e28a1c620bb709083494753e070d" dependencies = [ "chrono", "form_urlencoded", @@ -953,9 +1020,9 @@ dependencies = [ [[package]] name = "kube-derive" -version = "0.68.0" +version = "0.74.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73f5fa510a64791242047fea4d807a5da06514ee714cace4b942d38a1126f0a8" +checksum = "66d74121eb41af4480052901f31142d8d9bbdf1b7c6b856da43bcb02f5b1b177" dependencies = [ "darling", "proc-macro2", @@ -966,9 +1033,9 @@ dependencies = [ [[package]] name = "kube-runtime" -version = "0.68.0" +version = "0.74.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0990fe3ab89a1217e6a4d4952e1ab0a24783265ed413228efbc489a00f86b3da" +checksum = "8fdcf5a20f968768e342ef1a457491bb5661fccd81119666d626c57500b16d99" dependencies = [ "ahash", "backoff", @@ -977,14 +1044,14 @@ dependencies = [ "json-patch", "k8s-openapi", "kube-client", - "parking_lot 0.11.2", + "parking_lot", "pin-project", "serde", "serde_json", "smallvec", "thiserror", "tokio", - "tokio-util 0.6.10", + "tokio-util 0.7.3", "tracing", ] @@ -1030,6 +1097,15 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" +[[package]] +name = "linked_hash_set" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47186c6da4d81ca383c7c47c1bfc80f4b95f4720514d860a5407aaf4233f9588" +dependencies = [ + "linked-hash-map", +] + [[package]] name = "lock_api" version = "0.4.8" @@ -1207,6 +1283,60 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "opentelemetry" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6105e89802af13fdf48c49d7646d3b533a70e536d818aae7e78ba0433d01acb8" +dependencies = [ + "async-trait", + "crossbeam-channel", + "futures-channel", + "futures-executor", + "futures-util", + "js-sys", + "lazy_static", + "percent-encoding", + "pin-project", + "rand", + "thiserror", + "tokio", + "tokio-stream", +] + +[[package]] +name = "opentelemetry-jaeger" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8c0b12cd9e3f9b35b52f6e0dac66866c519b26f424f4bbf96e3fe8bfbdc5229" +dependencies = [ + "async-trait", + "lazy_static", + "opentelemetry", + "opentelemetry-semantic-conventions", + "thiserror", + "thrift", + "tokio", +] + +[[package]] +name = "opentelemetry-semantic-conventions" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "985cc35d832d412224b2cffe2f9194b1b89b6aa5d0bef76d080dce09d90e62bd" +dependencies = [ + "opentelemetry", +] + +[[package]] +name = "ordered-float" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3305af35278dd29f46fcdd139e0b1fbfae2153f0e5928b39b035542dd31e37b7" +dependencies = [ + "num-traits", +] + [[package]] name = "ordered-float" version = "2.10.0" @@ -1222,17 +1352,6 @@ version = "6.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff" -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.5", -] - [[package]] name = "parking_lot" version = "0.12.1" @@ -1240,21 +1359,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.3", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall", - "smallvec", - "winapi", + "parking_lot_core", ] [[package]] @@ -1384,16 +1489,16 @@ dependencies = [ [[package]] name = "product-config" -version = "0.3.0" -source = "git+https://github.com/stackabletech/product-config.git?tag=0.3.0#602e7b8e1c235dd93fb3289662c1200eaa1a83db" +version = "0.4.0" +source = "git+https://github.com/stackabletech/product-config.git?tag=0.4.0#e1e5938b4f6120f85a088194e86d22433fdba731" dependencies = [ + "fancy-regex", "java-properties", - "regex", "schemars", "semver", "serde", "serde_json", - "serde_yaml", + "serde_yaml 0.8.26", "thiserror", "xml-rs", ] @@ -1415,7 +1520,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f835c582e6bd972ba8347313300219fed5bfa52caf175298d860b61ff6069bb" dependencies = [ "bytes", - "heck 0.4.0", + "heck", "itertools", "lazy_static", "log", @@ -1654,7 +1759,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c" dependencies = [ - "ordered-float", + "ordered-float 2.10.0", "serde", ] @@ -1704,6 +1809,19 @@ dependencies = [ "yaml-rust", ] +[[package]] +name = "serde_yaml" +version = "0.9.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89f31df3f50926cdf2855da5fd8812295c34752cb20438dae42a67f79e021ac3" +dependencies = [ + "indexmap", + "itoa 1.0.3", + "ryu", + "serde", + "unsafe-libyaml", +] + [[package]] name = "sharded-slab" version = "0.1.4" @@ -1764,7 +1882,7 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "410b26ed97440d90ced3e2488c868d56a86e2064f5d7d6f417909b286afe25e5" dependencies = [ - "heck 0.4.0", + "heck", "proc-macro2", "quote", "syn", @@ -1782,11 +1900,9 @@ dependencies = [ [[package]] name = "stackable-operator" -version = "0.10.0" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=0.10.0#143165cf58e66b5e36d9774c188821248e5e4009" +version = "0.25.0" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=0.25.0#490ef77e05d86a0bc2b555fd5950593d9f3a5d4b" dependencies = [ - "async-trait", - "backoff", "chrono", "clap", "const_format", @@ -1797,21 +1913,33 @@ dependencies = [ "k8s-openapi", "kube", "lazy_static", + "opentelemetry", + "opentelemetry-jaeger", "product-config", "rand", "regex", "schemars", "serde", "serde_json", - "serde_yaml", + "serde_yaml 0.9.11", + "stackable-operator-derive", "strum", - "strum_macros", "thiserror", "tokio", "tracing", - "tracing-futures", + "tracing-opentelemetry", "tracing-subscriber", - "uuid 0.8.2", +] + +[[package]] +name = "stackable-operator-derive" +version = "0.25.0" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=0.25.0#490ef77e05d86a0bc2b555fd5950593d9f3a5d4b" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -1831,7 +1959,6 @@ dependencies = [ "prost-types", "serde", "serde_json", - "serde_yaml", "snafu", "socket2", "stackable-operator", @@ -1843,7 +1970,7 @@ dependencies = [ "tonic-build", "tonic-reflection", "tracing", - "uuid 1.1.2", + "uuid", ] [[package]] @@ -1854,17 +1981,20 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "strum" -version = "0.23.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cae14b91c7d11c9a851d3fbc80a963198998c2a64eec840477fa92d8ce9b70bb" +checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" +dependencies = [ + "strum_macros", +] [[package]] name = "strum_macros" -version = "0.23.1" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bb0dc7ee9c15cea6199cde9a127fa16a4c5819af85395457ad72d68edc85a38" +checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ - "heck 0.3.3", + "heck", "proc-macro2", "quote", "rustversion", @@ -1959,6 +2089,28 @@ dependencies = [ "once_cell", ] +[[package]] +name = "threadpool" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" +dependencies = [ + "num_cpus", +] + +[[package]] +name = "thrift" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b82ca8f46f95b3ce96081fe3dd89160fdea970c254bb72925255d1b62aae692e" +dependencies = [ + "byteorder", + "integer-encoding", + "log", + "ordered-float 1.1.1", + "threadpool", +] + [[package]] name = "time" version = "0.1.44" @@ -2008,7 +2160,7 @@ dependencies = [ "mio", "num_cpus", "once_cell", - "parking_lot 0.12.1", + "parking_lot", "pin-project-lite", "signal-hook-registry", "socket2", @@ -2047,6 +2199,18 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-openssl" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08f9ffb7809f1b20c1b398d92acf4cc719874b3b2b2d9ea2f09b4a80350878a" +dependencies = [ + "futures-util", + "openssl", + "openssl-sys", + "tokio", +] + [[package]] name = "tokio-stream" version = "0.1.9" @@ -2069,7 +2233,6 @@ dependencies = [ "futures-sink", "log", "pin-project-lite", - "slab", "tokio", ] @@ -2083,6 +2246,7 @@ dependencies = [ "futures-core", "futures-sink", "pin-project-lite", + "slab", "tokio", "tracing", ] @@ -2176,32 +2340,13 @@ dependencies = [ "tracing", ] -[[package]] -name = "tower-http" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aba3f3efabf7fb41fae8534fc20a817013dd1c12cb45441efb6c82e6556b4cd8" -dependencies = [ - "base64", - "bitflags", - "bytes", - "futures-core", - "futures-util", - "http", - "http-body", - "http-range-header", - "pin-project-lite", - "tower-layer", - "tower-service", - "tracing", -] - [[package]] name = "tower-http" version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c530c8675c1dbf98facee631536fa116b5fb6382d7dd6dc1b118d970eafe3ba" dependencies = [ + "base64", "bitflags", "bytes", "futures-core", @@ -2213,6 +2358,7 @@ dependencies = [ "tower", "tower-layer", "tower-service", + "tracing", ] [[package]] @@ -2282,6 +2428,20 @@ dependencies = [ "tracing-core", ] +[[package]] +name = "tracing-opentelemetry" +version = "0.17.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbbe89715c1dbbb790059e2565353978564924ee85017b5fff365c872ff6721f" +dependencies = [ + "once_cell", + "opentelemetry", + "tracing", + "tracing-core", + "tracing-log", + "tracing-subscriber", +] + [[package]] name = "tracing-subscriber" version = "0.3.15" @@ -2336,18 +2496,18 @@ dependencies = [ "tinyvec", ] -[[package]] -name = "unicode-segmentation" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" - [[package]] name = "unicode-xid" version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04" +[[package]] +name = "unsafe-libyaml" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "931179334a56395bcf64ba5e0ff56781381c1a5832178280c7d7f91d1679aeb0" + [[package]] name = "url" version = "2.2.2" @@ -2360,15 +2520,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "uuid" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" -dependencies = [ - "getrandom", -] - [[package]] name = "uuid" version = "1.1.2" diff --git a/deploy/helm/secret-operator/crds/crds.yaml b/deploy/helm/secret-operator/crds/crds.yaml index 46c56932..bceb7ae8 100644 --- a/deploy/helm/secret-operator/crds/crds.yaml +++ b/deploy/helm/secret-operator/crds/crds.yaml @@ -19,7 +19,7 @@ spec: name: v1alpha1 schema: openAPIV3Schema: - description: "Auto-generated derived type for SecretClassSpec via `CustomResource`" + description: Auto-generated derived type for SecretClassSpec via `CustomResource` properties: spec: properties: @@ -42,10 +42,10 @@ spec: description: SecretReference represents a Secret Reference. It has enough information to retrieve secret in any namespace properties: name: - description: Name is unique within a namespace to reference a secret resource. + description: name is unique within a namespace to reference a secret resource. type: string namespace: - description: Namespace defines the space within which the secret name must be unique. + description: namespace defines the space within which the secret name must be unique. type: string type: object required: diff --git a/deploy/manifests/crds.yaml b/deploy/manifests/crds.yaml index 1f34d6f1..727d1435 100644 --- a/deploy/manifests/crds.yaml +++ b/deploy/manifests/crds.yaml @@ -20,7 +20,7 @@ spec: name: v1alpha1 schema: openAPIV3Schema: - description: "Auto-generated derived type for SecretClassSpec via `CustomResource`" + description: Auto-generated derived type for SecretClassSpec via `CustomResource` properties: spec: properties: @@ -43,10 +43,10 @@ spec: description: SecretReference represents a Secret Reference. It has enough information to retrieve secret in any namespace properties: name: - description: Name is unique within a namespace to reference a secret resource. + description: name is unique within a namespace to reference a secret resource. type: string namespace: - description: Namespace defines the space within which the secret name must be unique. + description: namespace defines the space within which the secret name must be unique. type: string type: object required: diff --git a/rust/operator-binary/Cargo.toml b/rust/operator-binary/Cargo.toml index ab13aa85..fa431d11 100644 --- a/rust/operator-binary/Cargo.toml +++ b/rust/operator-binary/Cargo.toml @@ -19,10 +19,9 @@ prost = "0.11" prost-types = "0.11" serde = "1.0.144" serde_json = "1.0.85" -serde_yaml = "0.8.24" snafu = "0.7.1" socket2 = { version = "0.4.7", features = ["all"] } -stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.10.0" } +stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.25.0" } sys-mount = { version = "1.5.1", default-features = false } time = "0.3.14" tokio = { version = "1.20.0", features = ["full"] } diff --git a/rust/operator-binary/src/main.rs b/rust/operator-binary/src/main.rs index aa5d6a9a..b35b6d98 100644 --- a/rust/operator-binary/src/main.rs +++ b/rust/operator-binary/src/main.rs @@ -7,7 +7,7 @@ use futures::{FutureExt, TryStreamExt}; use grpc::csi::v1::{ controller_server::ControllerServer, identity_server::IdentityServer, node_server::NodeServer, }; -use stackable_operator::kube::CustomResourceExt; +use stackable_operator::{logging::TracingTarget, CustomResourceExt}; use std::{os::unix::prelude::FileTypeExt, path::PathBuf}; use tokio::signal::unix::{signal, SignalKind}; use tokio_stream::wrappers::UnixListenerStream; @@ -20,6 +20,8 @@ mod csi_server; mod grpc; mod utils; +pub const APP_NAME: &str = "secret"; + #[derive(clap::Parser)] #[clap(author, version)] struct Opts { @@ -33,6 +35,9 @@ struct SecretOperatorRun { csi_endpoint: PathBuf, #[clap(long, env)] node_name: String, + /// Tracing log collector system + #[clap(long, env, default_value_t, arg_enum)] + pub tracing_target: TracingTarget, } mod built_info { @@ -42,16 +47,21 @@ mod built_info { #[tokio::main] async fn main() -> anyhow::Result<()> { - stackable_operator::logging::initialize_logging("SECRET_PROVISIONER_LOG"); let opts = Opts::parse(); match opts.cmd { stackable_operator::cli::Command::Crd => { - print!("{}", serde_yaml::to_string(&crd::SecretClass::crd())?) + crd::SecretClass::print_yaml_schema()?; } stackable_operator::cli::Command::Run(SecretOperatorRun { csi_endpoint, node_name, + tracing_target, }) => { + stackable_operator::logging::initialize_logging( + "SECRET_PROVISIONER_LOG", + APP_NAME, + tracing_target, + ); stackable_operator::utils::print_startup_string( crate_description!(), crate_version!(), From cd9c79c2f3adee7052358b2e364ebfa1ced4fc40 Mon Sep 17 00:00:00 2001 From: Siegfried Weber Date: Wed, 7 Sep 2022 09:37:21 +0200 Subject: [PATCH 2/3] Disable Clippy warning --- rust/operator-binary/src/backend/pod_info.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/rust/operator-binary/src/backend/pod_info.rs b/rust/operator-binary/src/backend/pod_info.rs index f9b42be7..a4af48f7 100644 --- a/rust/operator-binary/src/backend/pod_info.rs +++ b/rust/operator-binary/src/backend/pod_info.rs @@ -10,6 +10,7 @@ use stackable_operator::{ #[derive(Debug, Snafu)] #[snafu(module)] +#[allow(clippy::large_enum_variant)] pub enum FromPodError { #[snafu(display("failed to parse IP address {ip:?}"))] IllegalIp { From 714590fb6e8fe2090ed07326976d8a4eb49d68c2 Mon Sep 17 00:00:00 2001 From: Siegfried Weber Date: Wed, 7 Sep 2022 11:46:13 +0200 Subject: [PATCH 3/3] Fix build inputs in Nix builds --- default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/default.nix b/default.nix index c588423f..63ae89a3 100644 --- a/default.nix +++ b/default.nix @@ -4,14 +4,11 @@ , cargo ? import ./Cargo.nix { inherit nixpkgs pkgs; release = false; defaultCrateOverrides = pkgs.defaultCrateOverrides // { - prost-build = attrs: { - buildInputs = [ pkgs.protobuf ]; - }; tonic-reflection = attrs: { - buildInputs = [ pkgs.rustfmt ]; + buildInputs = [ pkgs.protobuf pkgs.rustfmt ]; }; stackable-secret-operator = attrs: { - buildInputs = [ pkgs.rustfmt ]; + buildInputs = [ pkgs.protobuf pkgs.rustfmt ]; }; }; }