diff --git a/CHANGELOG.md b/CHANGELOG.md index f3243125..ad20c155 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,9 +13,12 @@ All notable changes to this project will be documented in this file. - BREAKING (behaviour): Specified CPU resources are now applied correctly (instead of rounding it to the next whole number). This might affect your jobs, as they now e.g. only have 200m CPU resources requested instead of the 1000m it had so far, meaning they might slow down significantly ([#408]). +- Processing of corrupted log events fixed; If errors occur, the error + messages are added to the log event ([#412]). [#401]: https://github.com/stackabletech/spark-k8s-operator/pull/401 [#408]: https://github.com/stackabletech/spark-k8s-operator/pull/408 +[#412]: https://github.com/stackabletech/spark-k8s-operator/pull/412 ## [24.3.0] - 2024-03-20 diff --git a/Cargo.lock b/Cargo.lock index bab69bf2..944c4f23 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -146,7 +146,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -157,7 +157,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -311,7 +311,7 @@ dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim 0.11.1", + "strsim", ] [[package]] @@ -323,7 +323,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -419,9 +419,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" dependencies = [ "darling_core", "darling_macro", @@ -429,27 +429,27 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "strsim 0.10.0", - "syn 2.0.61", + "strsim", + "syn 2.0.66", ] [[package]] name = "darling_macro" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ "darling_core", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -460,7 +460,7 @@ checksum = "4e018fccbeeb50ff26562ece792ed06659b9c2dae79ece77c4456bb10d9bf79b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -512,9 +512,9 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" [[package]] name = "either" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" +checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" [[package]] name = "encoding_rs" @@ -648,7 +648,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -1110,7 +1110,7 @@ dependencies = [ "proc-macro2", "quote", "serde_json", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -1443,7 +1443,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -1474,7 +1474,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -1503,9 +1503,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.82" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" +checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" dependencies = [ "unicode-ident", ] @@ -1664,7 +1664,7 @@ dependencies = [ "regex", "relative-path", "rustc_version", - "syn 2.0.61", + "syn 2.0.66", "unicode-ident", ] @@ -1761,9 +1761,9 @@ dependencies = [ [[package]] name = "schemars" -version = "0.8.19" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc6e7ed6919cb46507fb01ff1654309219f62b4d603822501b0b80d42f6f21ef" +checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92" dependencies = [ "dyn-clone", "schemars_derive", @@ -1774,14 +1774,14 @@ dependencies = [ [[package]] name = "schemars_derive" -version = "0.8.19" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "185f2b7aa7e02d418e453790dde16890256bbd2bcd04b7dc5348811052b53f49" +checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e" dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -1831,9 +1831,9 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.201" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "780f1cebed1629e4753a1a38a3c72d30b97ec044f0aef68cb26650a3c5cf363c" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] @@ -1850,13 +1850,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.201" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5e405930b9796f1c00bee880d03fc7e0bb4b9a11afc776885ffe84320da2865" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -1867,7 +1867,7 @@ checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -1999,7 +1999,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -2020,8 +2020,8 @@ checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] name = "stackable-operator" -version = "0.67.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.67.1#9ba3ab1ea4164ba9946d7febdfae5911decc0f4b" +version = "0.69.3" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.69.3#cb5943f03587eb8c90048b67a810c396de42a579" dependencies = [ "chrono", "clap", @@ -2057,12 +2057,12 @@ dependencies = [ [[package]] name = "stackable-operator-derive" version = "0.3.0" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.67.1#9ba3ab1ea4164ba9946d7febdfae5911decc0f4b" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.69.3#cb5943f03587eb8c90048b67a810c396de42a579" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -2104,12 +2104,6 @@ dependencies = [ "tracing-futures", ] -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - [[package]] name = "strsim" version = "0.11.1" @@ -2135,7 +2129,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -2157,9 +2151,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.61" +version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" dependencies = [ "proc-macro2", "quote", @@ -2183,7 +2177,7 @@ checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -2260,7 +2254,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -2367,7 +2361,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -2574,7 +2568,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", "wasm-bindgen-shared", ] @@ -2596,7 +2590,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2810,7 +2804,7 @@ checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] diff --git a/Cargo.nix b/Cargo.nix index 489de2f5..d7d59a08 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -436,7 +436,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.61"; + packageId = "syn 2.0.66"; features = [ "full" "visit-mut" ]; } ]; @@ -462,7 +462,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.61"; + packageId = "syn 2.0.66"; features = [ "full" "visit-mut" ]; } ]; @@ -918,7 +918,7 @@ rec { } { name = "strsim"; - packageId = "strsim 0.11.1"; + packageId = "strsim"; optional = true; } ]; @@ -957,7 +957,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.61"; + packageId = "syn 2.0.66"; features = [ "full" ]; } ]; @@ -1199,9 +1199,9 @@ rec { }; "darling" = rec { crateName = "darling"; - version = "0.20.8"; - edition = "2018"; - sha256 = "14a38qsi9104kvk1z11rqj0bnz1866dyhnvgvbgzz17d2g6nzqsl"; + version = "0.20.9"; + edition = "2021"; + sha256 = "1q9zdyiva4p1ly6ip4lg9y8mfk6b59n6iphpxnjxsayij16ypcl3"; authors = [ "Ted Driggs " ]; @@ -1224,9 +1224,9 @@ rec { }; "darling_core" = rec { crateName = "darling_core"; - version = "0.20.8"; - edition = "2018"; - sha256 = "03x7s149p06xfwcq0lgkk4yxh6jf7jckny18nzp1yyk87b1g2b4w"; + version = "0.20.9"; + edition = "2021"; + sha256 = "086i3kisa1yq8jsskahv1ywi2qbrym8r20lram7a0wmc1gz8f9k2"; authors = [ "Ted Driggs " ]; @@ -1249,12 +1249,12 @@ rec { } { name = "strsim"; - packageId = "strsim 0.10.0"; + packageId = "strsim"; optional = true; } { name = "syn"; - packageId = "syn 2.0.61"; + packageId = "syn 2.0.66"; features = [ "full" "extra-traits" ]; } ]; @@ -1266,9 +1266,9 @@ rec { }; "darling_macro" = rec { crateName = "darling_macro"; - version = "0.20.8"; - edition = "2018"; - sha256 = "0gwkz0cjfy3fgcc1zmm7azzhj5qpja34s0cklcria4l38sjyss56"; + version = "0.20.9"; + edition = "2021"; + sha256 = "0y015yy33p85sgpq7shm49clss78p71871gf7sss3cc26jsang3k"; procMacro = true; authors = [ "Ted Driggs " @@ -1284,7 +1284,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.61"; + packageId = "syn 2.0.66"; } ]; @@ -1310,7 +1310,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.61"; + packageId = "syn 2.0.66"; features = [ "full" "visit-mut" ]; } ]; @@ -1438,9 +1438,9 @@ rec { }; "either" = rec { crateName = "either"; - version = "1.11.0"; + version = "1.12.0"; edition = "2018"; - sha256 = "18l0cwyw18syl8b52syv6balql8mnwfyhihjqqllx5pms93iqz54"; + sha256 = "12xmhlrv5gfsraimh6xaxcmb0qh6cc7w7ap4sw40ky9wfm095jix"; authors = [ "bluss" ]; @@ -1795,7 +1795,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.61"; + packageId = "syn 2.0.66"; features = [ "full" ]; } ]; @@ -3375,7 +3375,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.61"; + packageId = "syn 2.0.66"; features = [ "extra-traits" ]; } ]; @@ -4445,7 +4445,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.61"; + packageId = "syn 2.0.66"; } ]; features = { @@ -4516,7 +4516,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.61"; + packageId = "syn 2.0.66"; features = [ "full" "visit-mut" ]; } ]; @@ -4564,9 +4564,9 @@ rec { }; "proc-macro2" = rec { crateName = "proc-macro2"; - version = "1.0.82"; + version = "1.0.85"; edition = "2021"; - sha256 = "06qk88hbf6wg4v1i961zibhjz512873jwkz3myx1z82ip6dd9lwa"; + sha256 = "08zwg5l5f3czp62g4cvzgjwnk176lsrwq6kdi4x0arm9bbhlq912"; libName = "proc_macro2"; authors = [ "David Tolnay " @@ -5099,7 +5099,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.61"; + packageId = "syn 2.0.66"; features = [ "full" "parsing" "extra-traits" "visit" "visit-mut" ]; } { @@ -5371,9 +5371,9 @@ rec { }; "schemars" = rec { crateName = "schemars"; - version = "0.8.19"; + version = "0.8.21"; edition = "2021"; - sha256 = "1vr1dwpx900b3d824f309lmzc6cj61a1dzq1zc3nbd4wj7b7wvpw"; + sha256 = "14lyx04388wgbilgcm0nl75w6359nw16glswfqv7x2rpi9329h09"; authors = [ "Graham Esau " ]; @@ -5437,9 +5437,9 @@ rec { }; "schemars_derive" = rec { crateName = "schemars_derive"; - version = "0.8.19"; + version = "0.8.21"; edition = "2021"; - sha256 = "0j9znm9110a8agfbf16d5fynn9chd3hxv41p8n742bg0lxx2npqq"; + sha256 = "03ncmrkldfmdc9skmlyysx2vqdlyyz91r5mbavw77zwaay4fbvmi"; procMacro = true; authors = [ "Graham Esau " @@ -5459,7 +5459,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.61"; + packageId = "syn 2.0.66"; features = [ "extra-traits" ]; } ]; @@ -5597,9 +5597,9 @@ rec { }; "serde" = rec { crateName = "serde"; - version = "1.0.201"; + version = "1.0.203"; edition = "2018"; - sha256 = "0g1nrz2s6l36na6gdbph8k07xf9h5p3s6f0s79sy8a8nxpmiq3vq"; + sha256 = "1500ghq198n6py5anvz5qbqagd9h1hq04f4qpsvjzrvix56snlvj"; authors = [ "Erick Tryzelaar " "David Tolnay " @@ -5651,9 +5651,9 @@ rec { }; "serde_derive" = rec { crateName = "serde_derive"; - version = "1.0.201"; + version = "1.0.203"; edition = "2015"; - sha256 = "0r98v8h47s7zhml7gz0sl6wv82vyzh1hv27f1g0g35lp1f9hbr65"; + sha256 = "1fmmqmfza3mwxb1v80737dj01gznrh8mhgqgylkndx5npq7bq32h"; procMacro = true; authors = [ "Erick Tryzelaar " @@ -5674,7 +5674,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.61"; + packageId = "syn 2.0.66"; usesDefaultFeatures = false; features = [ "clone-impls" "derive" "parsing" "printing" "proc-macro" ]; } @@ -5704,7 +5704,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.61"; + packageId = "syn 2.0.66"; usesDefaultFeatures = false; features = [ "clone-impls" "derive" "parsing" "printing" ]; } @@ -6077,7 +6077,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.61"; + packageId = "syn 2.0.66"; features = [ "full" ]; } ]; @@ -6138,13 +6138,13 @@ rec { }; "stackable-operator" = rec { crateName = "stackable-operator"; - version = "0.67.1"; + version = "0.69.3"; edition = "2021"; workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "9ba3ab1ea4164ba9946d7febdfae5911decc0f4b"; - sha256 = "179kqkj6pw5cn98cngcmxn5kmy5snydhsdq4qx6hza862sx0828j"; + rev = "cb5943f03587eb8c90048b67a810c396de42a579"; + sha256 = "192bwr3ll1hwsvq9qrk3rsmax8m3zpn55cb44c9r201krmgn51gz"; }; authors = [ "Stackable GmbH " @@ -6292,8 +6292,8 @@ rec { workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "9ba3ab1ea4164ba9946d7febdfae5911decc0f4b"; - sha256 = "179kqkj6pw5cn98cngcmxn5kmy5snydhsdq4qx6hza862sx0828j"; + rev = "cb5943f03587eb8c90048b67a810c396de42a579"; + sha256 = "192bwr3ll1hwsvq9qrk3rsmax8m3zpn55cb44c9r201krmgn51gz"; }; procMacro = true; authors = [ @@ -6314,7 +6314,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.61"; + packageId = "syn 2.0.66"; } ]; @@ -6478,17 +6478,7 @@ rec { ]; }; - "strsim 0.10.0" = rec { - crateName = "strsim"; - version = "0.10.0"; - edition = "2015"; - sha256 = "08s69r4rcrahwnickvi0kq49z524ci50capybln83mg6b473qivk"; - authors = [ - "Danny Guo " - ]; - - }; - "strsim 0.11.1" = rec { + "strsim" = rec { crateName = "strsim"; version = "0.11.1"; edition = "2015"; @@ -6556,7 +6546,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.61"; + packageId = "syn 2.0.66"; features = [ "parsing" "extra-traits" ]; } ]; @@ -6609,11 +6599,11 @@ rec { }; resolvedDefaultFeatures = [ "clone-impls" "default" "derive" "extra-traits" "full" "parsing" "printing" "proc-macro" "quote" "visit" ]; }; - "syn 2.0.61" = rec { + "syn 2.0.66" = rec { crateName = "syn"; - version = "2.0.61"; + version = "2.0.66"; edition = "2021"; - sha256 = "1j8zhf5mmd2l5niwhiniw5wcp9v6fbd4a61v6rbfhsm5rf6fv4y9"; + sha256 = "1xfgrprsbz8j31kabvfinb4fyhajlk2q7lxa18fb006yl90kyby4"; authors = [ "David Tolnay " ]; @@ -6679,7 +6669,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.61"; + packageId = "syn 2.0.66"; } ]; @@ -6930,7 +6920,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.61"; + packageId = "syn 2.0.66"; features = [ "full" ]; } ]; @@ -7376,7 +7366,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.61"; + packageId = "syn 2.0.66"; usesDefaultFeatures = false; features = [ "full" "parsing" "printing" "visit-mut" "clone-impls" "extra-traits" "proc-macro" ]; } @@ -8019,7 +8009,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.61"; + packageId = "syn 2.0.66"; features = [ "full" ]; } { @@ -8076,7 +8066,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.61"; + packageId = "syn 2.0.66"; features = [ "visit" "full" ]; } { @@ -9047,7 +9037,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.61"; + packageId = "syn 2.0.66"; } ]; diff --git a/Cargo.toml b/Cargo.toml index 09d7d30b..f8782055 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,7 @@ serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" serde_yaml = "0.9" snafu = "0.8" -stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.67.1" } +stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.69.3" } strum = { version = "0.26", features = ["derive"] } tokio = { version = "1.37", features = ["full"] } tracing = "0.1" diff --git a/crate-hashes.json b/crate-hashes.json index 5623023b..f28dcafb 100644 --- a/crate-hashes.json +++ b/crate-hashes.json @@ -1,5 +1,5 @@ { - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.67.1#stackable-operator-derive@0.3.0": "179kqkj6pw5cn98cngcmxn5kmy5snydhsdq4qx6hza862sx0828j", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.67.1#stackable-operator@0.67.1": "179kqkj6pw5cn98cngcmxn5kmy5snydhsdq4qx6hza862sx0828j", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.69.3#stackable-operator-derive@0.3.0": "192bwr3ll1hwsvq9qrk3rsmax8m3zpn55cb44c9r201krmgn51gz", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.69.3#stackable-operator@0.69.3": "192bwr3ll1hwsvq9qrk3rsmax8m3zpn55cb44c9r201krmgn51gz", "git+https://github.com/stackabletech/product-config.git?tag=0.6.0#product-config@0.6.0": "1ixc2x7540sxdmc92hqdcwm24rj8i1ivjsvwk2d57pdsq03j2x41" } \ No newline at end of file diff --git a/tests/templates/kuttl/logging/09-assert.yaml b/tests/templates/kuttl/logging/09-assert.yaml deleted file mode 100644 index 64d967e4..00000000 --- a/tests/templates/kuttl/logging/09-assert.yaml +++ /dev/null @@ -1,12 +0,0 @@ ---- -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 300 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: test-runner -status: - readyReplicas: 1 - replicas: 1 diff --git a/tests/templates/kuttl/logging/09-copy-prepared-logs.yaml b/tests/templates/kuttl/logging/09-copy-prepared-logs.yaml new file mode 100644 index 00000000..23e837c8 --- /dev/null +++ b/tests/templates/kuttl/logging/09-copy-prepared-logs.yaml @@ -0,0 +1,8 @@ +--- +apiVersion: kuttl.dev/v1beta1 +kind: TestStep +commands: + - script: > + kubectl cp ./prepared-logs.log4j2.xml + $NAMESPACE/spark-history-node-automatic-log-config-0:/stackable/log/spark-history/prepared-logs.log4j2.xml + --container vector diff --git a/tests/templates/kuttl/logging/10-assert.yaml b/tests/templates/kuttl/logging/10-assert.yaml index 69eaf9e6..64d967e4 100644 --- a/tests/templates/kuttl/logging/10-assert.yaml +++ b/tests/templates/kuttl/logging/10-assert.yaml @@ -1,8 +1,12 @@ --- apiVersion: kuttl.dev/v1beta1 kind: TestAssert -timeout: 600 -commands: - - script: >- - kubectl exec --namespace=$NAMESPACE test-runner-0 -- - python /tmp/test_log_aggregation.py -n $NAMESPACE +timeout: 300 +--- +apiVersion: apps/v1 +kind: StatefulSet +metadata: + name: test-runner +status: + readyReplicas: 1 + replicas: 1 diff --git a/tests/templates/kuttl/logging/09-install-test-runner.yaml b/tests/templates/kuttl/logging/10-install-test-runner.yaml similarity index 100% rename from tests/templates/kuttl/logging/09-install-test-runner.yaml rename to tests/templates/kuttl/logging/10-install-test-runner.yaml diff --git a/tests/templates/kuttl/logging/11-assert.yaml b/tests/templates/kuttl/logging/11-assert.yaml new file mode 100644 index 00000000..69eaf9e6 --- /dev/null +++ b/tests/templates/kuttl/logging/11-assert.yaml @@ -0,0 +1,8 @@ +--- +apiVersion: kuttl.dev/v1beta1 +kind: TestAssert +timeout: 600 +commands: + - script: >- + kubectl exec --namespace=$NAMESPACE test-runner-0 -- + python /tmp/test_log_aggregation.py -n $NAMESPACE diff --git a/tests/templates/kuttl/logging/10-test-log-aggregation.yaml b/tests/templates/kuttl/logging/11-test-log-aggregation.yaml similarity index 100% rename from tests/templates/kuttl/logging/10-test-log-aggregation.yaml rename to tests/templates/kuttl/logging/11-test-log-aggregation.yaml diff --git a/tests/templates/kuttl/logging/prepared-logs.log4j2.xml b/tests/templates/kuttl/logging/prepared-logs.log4j2.xml new file mode 100644 index 00000000..37474797 --- /dev/null +++ b/tests/templates/kuttl/logging/prepared-logs.log4j2.xml @@ -0,0 +1,72 @@ + + + Valid log event with all possible tags and attributes + + + + + + + + + + Valid log event without the Instant tag + + + + + Invalid log event without epochSecond + + + + + Invalid log event without nanoOfSecond + + + + + Invalid log event with invalid epochSecond + + + + Invalid log event without a timestamp + + + + Invalid log event with invalid timeMillis + + + + + Invalid log event without a logger + + + + + Invalid log event without a level + + + + + Invalid log event with an unknown level + + + + + + + + + + Invalid log event without the Event tag + + + + Unparsable log event + + + + + Valid log event after the unparsable one + diff --git a/tests/templates/kuttl/logging/spark-vector-aggregator-values.yaml.j2 b/tests/templates/kuttl/logging/spark-vector-aggregator-values.yaml.j2 index 91b785db..47e28781 100644 --- a/tests/templates/kuttl/logging/spark-vector-aggregator-values.yaml.j2 +++ b/tests/templates/kuttl/logging/spark-vector-aggregator-values.yaml.j2 @@ -20,30 +20,34 @@ customConfig: type: vector version: "2" transforms: + validEvents: + type: filter + inputs: [vector] + condition: is_null(.errors) # SparkHistoryServer spark-history filteredSparkHistoryAutomaticLogConfigSparkHistory: type: filter - inputs: [vector] + inputs: [validEvents] condition: >- .pod == "spark-history-node-automatic-log-config-0" && .container == "spark-history" filteredSparkHistoryAutomaticLogConfigVector: type: filter - inputs: [vector] + inputs: [validEvents] condition: >- .pod == "spark-history-node-automatic-log-config-0" && .container == "vector" filteredSparkHistoryCustomLogConfigSparkHistory: type: filter - inputs: [vector] + inputs: [validEvents] condition: >- .pod == "spark-history-node-custom-log-config-0" && .container == "spark-history" filteredSparkHistoryCustomLogConfigVector: type: filter - inputs: [vector] + inputs: [validEvents] condition: >- .pod == "spark-history-node-custom-log-config-0" && .container == "vector" @@ -52,42 +56,42 @@ customConfig: filteredSparkAutomaticLogConfigDriverSpark: type: filter - inputs: [vector] + inputs: [validEvents] condition: >- .cluster == "spark-automatic-log-config" && ends_with(string!(.pod), "-driver") && .container == "spark" filteredSparkAutomaticLogConfigDriverJob: type: filter - inputs: [vector] + inputs: [validEvents] condition: >- .cluster == "spark-automatic-log-config" && ends_with(string!(.pod), "-driver") && .container == "job" filteredSparkAutomaticLogConfigDriverVector: type: filter - inputs: [vector] + inputs: [validEvents] condition: >- .cluster == "spark-automatic-log-config" && ends_with(string!(.pod), "-driver") && .container == "vector" filteredSparkAutomaticLogConfigExecutorSpark: type: filter - inputs: [vector] + inputs: [validEvents] condition: >- .cluster == "spark-automatic-log-config" && ends_with(string!(.pod), "-exec-1") && .container == "spark" filteredSparkAutomaticLogConfigExecutorJob: type: filter - inputs: [vector] + inputs: [validEvents] condition: >- .cluster == "spark-automatic-log-config" && ends_with(string!(.pod), "-exec-1") && .container == "job" filteredSparkAutomaticLogConfigExecutorVector: type: filter - inputs: [vector] + inputs: [validEvents] condition: >- .cluster == "spark-automatic-log-config" && ends_with(string!(.pod), "-exec-1") && @@ -97,42 +101,42 @@ customConfig: filteredSparkCustomLogConfigDriverSpark: type: filter - inputs: [vector] + inputs: [validEvents] condition: >- .cluster == "spark-custom-log-config" && ends_with(string!(.pod), "-driver") && .container == "spark" filteredSparkCustomLogConfigDriverJob: type: filter - inputs: [vector] + inputs: [validEvents] condition: >- .cluster == "spark-custom-log-config" && ends_with(string!(.pod), "-driver") && .container == "job" filteredSparkCustomLogConfigDriverVector: type: filter - inputs: [vector] + inputs: [validEvents] condition: >- .cluster == "spark-custom-log-config" && ends_with(string!(.pod), "-driver") && .container == "vector" filteredSparkCustomLogConfigExecutorSpark: type: filter - inputs: [vector] + inputs: [validEvents] condition: >- .cluster == "spark-custom-log-config" && ends_with(string!(.pod), "-exec-1") && .container == "spark" filteredSparkCustomLogConfigExecutorJob: type: filter - inputs: [vector] + inputs: [validEvents] condition: >- .cluster == "spark-custom-log-config" && ends_with(string!(.pod), "-exec-1") && .container == "job" filteredSparkCustomLogConfigExecutorVector: type: filter - inputs: [vector] + inputs: [validEvents] condition: >- .cluster == "spark-custom-log-config" && ends_with(string!(.pod), "-exec-1") && @@ -142,42 +146,42 @@ customConfig: filteredPysparkAutomaticLogConfigDriverSpark: type: filter - inputs: [vector] + inputs: [validEvents] condition: >- .cluster == "pyspark-automatic-log-config" && ends_with(string!(.pod), "-driver") && .container == "spark" filteredPysparkAutomaticLogConfigDriverRequirements: type: filter - inputs: [vector] + inputs: [validEvents] condition: >- .cluster == "pyspark-automatic-log-config" && ends_with(string!(.pod), "-driver") && .container == "requirements" filteredPysparkAutomaticLogConfigDriverVector: type: filter - inputs: [vector] + inputs: [validEvents] condition: >- .cluster == "pyspark-automatic-log-config" && ends_with(string!(.pod), "-driver") && .container == "vector" filteredPysparkAutomaticLogConfigExecutorSpark: type: filter - inputs: [vector] + inputs: [validEvents] condition: >- .cluster == "pyspark-automatic-log-config" && ends_with(string!(.pod), "-exec-1") && .container == "spark" filteredPysparkAutomaticLogConfigExecutorRequirements: type: filter - inputs: [vector] + inputs: [validEvents] condition: >- .cluster == "pyspark-automatic-log-config" && ends_with(string!(.pod), "-exec-1") && .container == "requirements" filteredPysparkAutomaticLogConfigExecutorVector: type: filter - inputs: [vector] + inputs: [validEvents] condition: >- .cluster == "pyspark-automatic-log-config" && ends_with(string!(.pod), "-exec-1") && @@ -187,42 +191,42 @@ customConfig: filteredPysparkCustomLogConfigDriverSpark: type: filter - inputs: [vector] + inputs: [validEvents] condition: >- .cluster == "pyspark-custom-log-config" && ends_with(string!(.pod), "-driver") && .container == "spark" filteredPysparkCustomLogConfigDriverRequirements: type: filter - inputs: [vector] + inputs: [validEvents] condition: >- .cluster == "pyspark-custom-log-config" && ends_with(string!(.pod), "-driver") && .container == "requirements" filteredPysparkCustomLogConfigDriverVector: type: filter - inputs: [vector] + inputs: [validEvents] condition: >- .cluster == "pyspark-custom-log-config" && ends_with(string!(.pod), "-driver") && .container == "vector" filteredPysparkCustomLogConfigExecutorSpark: type: filter - inputs: [vector] + inputs: [validEvents] condition: >- .cluster == "pyspark-custom-log-config" && ends_with(string!(.pod), "-exec-1") && .container == "spark" filteredPysparkCustomLogConfigExecutorRequirements: type: filter - inputs: [vector] + inputs: [validEvents] condition: >- .cluster == "pyspark-custom-log-config" && ends_with(string!(.pod), "-exec-1") && .container == "requirements" filteredPysparkCustomLogConfigExecutorVector: type: filter - inputs: [vector] + inputs: [validEvents] condition: >- .cluster == "pyspark-custom-log-config" && ends_with(string!(.pod), "-exec-1") && @@ -239,15 +243,16 @@ customConfig: is_null(.logger) || is_null(.message) sinks: - out: + test: inputs: [filtered*] + type: blackhole {% if lookup('env', 'VECTOR_AGGREGATOR') %} + aggregator: + inputs: [vector] type: vector address: {{ lookup('env', 'VECTOR_AGGREGATOR') }} buffer: # Avoid back pressure from VECTOR_AGGREGATOR. The test should # not fail if the aggregator is not available. when_full: drop_newest -{% else %} - type: blackhole {% endif %}