From f3375c25e4112782f6240711c707f1db1848e4f8 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Mon, 7 Aug 2023 08:28:56 +0200 Subject: [PATCH 1/5] bump: kube, k8s-openapi and opentelemetry --- Cargo.toml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 82b7ffdb..654d0e8c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,8 +14,8 @@ const_format = "0.2.31" either = "1.8.1" futures = "0.3.28" json-patch = "1.0.0" -k8s-openapi = { version = "0.18.0", default-features = false, features = ["schemars", "v1_26"] } -kube = { version = "0.83.0", features = ["jsonpatch", "runtime", "derive"] } +k8s-openapi = { version = "0.19.0", default-features = false, features = ["schemars", "v1_27"] } +kube = { version = "0.85.0", features = ["jsonpatch", "runtime", "derive"] } lazy_static = "1.4.0" product-config = { git = "https://github.com/stackabletech/product-config.git", tag = "0.4.0" } rand = "0.8.5" @@ -24,20 +24,20 @@ schemars = "0.8.12" serde = { version = "1.0.164", features = ["derive"] } serde_json = "1.0.96" serde_yaml = "0.9.21" -strum = { version = "0.24.1", features = ["derive"] } +strum = { version = "0.25.0", features = ["derive"] } thiserror = "1.0.40" tokio = { version = "1.28.2", features = ["macros", "rt-multi-thread"] } tracing = "0.1.37" tracing-subscriber = { version = "0.3.17", features = ["env-filter"] } derivative = "2.2.0" -tracing-opentelemetry = "0.19.0" -opentelemetry = { version = "0.19.0", features = ["rt-tokio"] } -opentelemetry-jaeger = { version = "0.18.0", features = ["rt-tokio"] } +tracing-opentelemetry = "0.20.0" +opentelemetry = { version = "0.20.0", features = ["rt-tokio"] } +opentelemetry-jaeger = { version = "0.19.0", features = ["rt-tokio"] } stackable-operator-derive = { path = "stackable-operator-derive" } snafu = "0.7.4" [dev-dependencies] -rstest = "0.17.0" +rstest = "0.18.1" tempfile = "3.6.0" [workspace] From 5834a4c223d8c25ab7b06deba41af116178008a4 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Mon, 7 Aug 2023 09:19:18 +0200 Subject: [PATCH 2/5] Upgrade all crates to latest version --- Cargo.toml | 20 ++++++++++---------- stackable-operator-derive/Cargo.toml | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 654d0e8c..e8d0f83a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,9 +9,9 @@ repository = "https://github.com/stackabletech/operator-rs" [dependencies] chrono = { version = "0.4.26", default-features = false } -clap = { version = "4.3.4", features = ["derive", "cargo", "env"] } +clap = { version = "4.3.19", features = ["derive", "cargo", "env"] } const_format = "0.2.31" -either = "1.8.1" +either = "1.9.0" futures = "0.3.28" json-patch = "1.0.0" k8s-openapi = { version = "0.19.0", default-features = false, features = ["schemars", "v1_27"] } @@ -19,14 +19,14 @@ kube = { version = "0.85.0", features = ["jsonpatch", "runtime", "derive"] } lazy_static = "1.4.0" product-config = { git = "https://github.com/stackabletech/product-config.git", tag = "0.4.0" } rand = "0.8.5" -regex = "1.8.4" +regex = "1.9.3" schemars = "0.8.12" -serde = { version = "1.0.164", features = ["derive"] } -serde_json = "1.0.96" -serde_yaml = "0.9.21" +serde = { version = "1.0.183", features = ["derive"] } +serde_json = "1.0.104" +serde_yaml = "0.9.25" strum = { version = "0.25.0", features = ["derive"] } -thiserror = "1.0.40" -tokio = { version = "1.28.2", features = ["macros", "rt-multi-thread"] } +thiserror = "1.0.44" +tokio = { version = "1.29.1", features = ["macros", "rt-multi-thread"] } tracing = "0.1.37" tracing-subscriber = { version = "0.3.17", features = ["env-filter"] } derivative = "2.2.0" @@ -34,11 +34,11 @@ tracing-opentelemetry = "0.20.0" opentelemetry = { version = "0.20.0", features = ["rt-tokio"] } opentelemetry-jaeger = { version = "0.19.0", features = ["rt-tokio"] } stackable-operator-derive = { path = "stackable-operator-derive" } -snafu = "0.7.4" +snafu = "0.7.5" [dev-dependencies] rstest = "0.18.1" -tempfile = "3.6.0" +tempfile = "3.7.1" [workspace] members = ["stackable-operator-derive"] diff --git a/stackable-operator-derive/Cargo.toml b/stackable-operator-derive/Cargo.toml index 5cee946a..a6a2136d 100644 --- a/stackable-operator-derive/Cargo.toml +++ b/stackable-operator-derive/Cargo.toml @@ -11,10 +11,10 @@ repository = "https://github.com/stackabletech/operator-rs" proc-macro = true [dependencies] -darling = "0.20.1" -proc-macro2 = "1.0.60" -quote = "1.0.28" -syn = "2.0.18" +darling = "0.20.3" +proc-macro2 = "1.0.66" +quote = "1.0.32" +syn = "2.0.28" [dev-dependencies] stackable-operator = { path = ".." } From f7d65a49d2e58f4b07c0c4248066bfa1661ab20a Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Mon, 7 Aug 2023 12:08:43 +0200 Subject: [PATCH 3/5] changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d5e6bd6..2eec898a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +### Changed + +- Bump all dependencies (including kube and k8s-openapi) ([#632]). + +[#632]: https://github.com/stackabletech/operator-rs/pull/632 + ## [0.45.1] - 2023-08-01 ### Fixed From b847817f664f03795c8064ce6a6fa40b4cf5b343 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Mon, 7 Aug 2023 12:23:30 +0200 Subject: [PATCH 4/5] Pin serde version --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index e8d0f83a..fb8636d9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,7 @@ product-config = { git = "https://github.com/stackabletech/product-config.git", rand = "0.8.5" regex = "1.9.3" schemars = "0.8.12" -serde = { version = "1.0.183", features = ["derive"] } +serde = { version = "=1.0.171", features = ["derive"] } # We need pin 1.0.171 as of now as otherwise Nix builds break because of https://github.com/serde-rs/serde/issues/2538 serde_json = "1.0.104" serde_yaml = "0.9.25" strum = { version = "0.25.0", features = ["derive"] } From f0dbc04c49989b15005d0ed3a3bb7fe88e92450d Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Mon, 7 Aug 2023 13:54:32 +0200 Subject: [PATCH 5/5] typo --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index fb8636d9..1c28f8a6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,7 @@ product-config = { git = "https://github.com/stackabletech/product-config.git", rand = "0.8.5" regex = "1.9.3" schemars = "0.8.12" -serde = { version = "=1.0.171", features = ["derive"] } # We need pin 1.0.171 as of now as otherwise Nix builds break because of https://github.com/serde-rs/serde/issues/2538 +serde = { version = "=1.0.171", features = ["derive"] } # We need to pin 1.0.171 as of now, as otherwise Nix builds break because of https://github.com/serde-rs/serde/issues/2538 serde_json = "1.0.104" serde_yaml = "0.9.25" strum = { version = "0.25.0", features = ["derive"] }