Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update dependencies #670

Merged
merged 8 commits into from Jan 10, 2023
Merged

Update dependencies #670

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ccf5554
Update dependencies
XAMPPRocky Jan 2, 2023
ada5e41
Use workspace dependencies
XAMPPRocky Jan 2, 2023
589a0e0
Merge branch 'main' into ep/update-deps
markmandel Jan 5, 2023
2adae7c
Update agones/Cargo.toml
XAMPPRocky Jan 5, 2023
e0714c9
Update Cargo.toml
XAMPPRocky Jan 5, 2023
4676e8c
Update Cargo.toml
XAMPPRocky Jan 10, 2023
dd7d3c3
Update agones/Cargo.toml
XAMPPRocky Jan 10, 2023
32a3946
Merge branch 'main' into ep/update-deps
XAMPPRocky Jan 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
56 changes: 31 additions & 25 deletions Cargo.toml
View file
Open in desktop
Expand Up @@ -17,6 +17,12 @@
[workspace]
members = [".", "./macros", "./agones"]

[workspace.dependencies]
kube = { version = "0.77.0", features = ["derive", "runtime", "rustls-tls", "client"], default-features = false }
k8s-openapi = { version = "0.16.0", features = ["v1_22", "schemars"] }
tokio = { version = "1.23.0", features = ["rt-multi-thread", "fs", "signal", "test-util", "parking_lot", "tracing"] }
XAMPPRocky marked this conversation as resolved.
Show resolved Hide resolved
base64 = "0.13.1"

[package]
name = "quilkin"
version = "0.5.0-dev"
Expand All @@ -41,71 +47,71 @@ test = true
quilkin-macros = { version = "0.5.0-dev", path = "./macros" }

# Crates.io
arc-swap = { version = "1.5.1", features = ["serde"] }
arc-swap = { version = "1.6.0", features = ["serde"] }
async-stream = "0.3.3"
base64 = "0.13.1"
base64.workspace = true
base64-serde = "0.6.1"
bytes = { version = "1.2.1", features = ["serde"] }
cached = "0.40.0"
bytes = { version = "1.3.0", features = ["serde"] }
cached = "0.41.0"
chrono = "0.4.23"
clap = { version = "4.0.29", features = ["cargo", "derive", "env"] }
clap = { version = "4.0.32", features = ["cargo", "derive", "env"] }
dashmap = "5.4.0"
dirs2 = "3.0.1"
either = "1.8.0"
enum-map = "2.4.1"
enum-map = "2.4.2"
eyre = "0.6.8"
futures = "0.3.25"
hyper = { version = "0.14.23", features = ["http2"] }
hyper-rustls = { version = "0.23.1", features = ["http2", "webpki-roots"] }
hyper-rustls = { version = "0.23.2", features = ["http2", "webpki-roots"] }
ipnetwork = "0.20.0"
k8s-openapi = { version = "0.16.0", features = ["v1_22", "schemars"] }
kube = { version = "0.76.0", features = ["derive", "runtime", "rustls-tls", "client"], default-features = false }
k8s-openapi.workspace = true
maxminddb = "0.23.0"
notify = "5.0.0"
num_cpus = "1.14.0"
once_cell = "1.16.0"
num_cpus = "1.15.0"
once_cell = "1.17.0"
parking_lot = "0.12.1"
prometheus = { version = "0.13.3", default-features = false }
prost = "0.11.2"
prost-types = "0.11.2"
prost = "0.11.5"
prost-types = "0.11.5"
rand = "0.8.5"
regex = "1.7.0"
schemars = { version = "0.8.11", features = ["chrono", "bytes", "url"] }
serde = { version = "1.0.147", features = ["derive", "rc"] }
serde_json = "1.0.88"
serde = { version = "1.0.152", features = ["derive", "rc"] }
serde_json = "1.0.91"
serde_regex = "1.1.0"
serde_stacker = "0.1.6"
serde_yaml = "0.9.14"
snap = "1.0.5"
serde_stacker = "0.1.7"
serde_yaml = "0.9.16"
snap = "1.1.0"
socket2 = "0.4.7"
stable-eyre = "0.2.2"
tempdir = "0.3.7"
thiserror = "1.0.37"
tokio = { version = "1.21.2", features = ["rt-multi-thread", "fs", "signal", "test-util", "parking_lot", "tracing"] }
thiserror = "1.0.38"
tokio.workspace = true
tokio-stream = { version = "0.1.11", features = ["sync"] }
tonic = "0.8.2"
tonic = "0.8.3"
tracing = "0.1.37"
tracing-futures = { version = "0.2.5", features = ["futures-03"] }
tracing-subscriber = { version = "0.3.16", features = ["json", "env-filter"] }
tryhard = "0.5.0"
url = { version = "2.3.1", features = ["serde"] }
uuid = { version = "1.2.2", default-features = false, features = ["v4"] }
lasso = { version = "0.6.0", features = ["multi-threaded"] }
kube.workspace = true

[target.'cfg(target_os = "linux")'.dependencies]
sys-info = "0.9.1"

[dev-dependencies]
regex = "1.7.0"
criterion = { version = "0.4.0", features = ["html_reports"] }
once_cell = "1.16.0"
once_cell = "1.17.0"
tracing-test = "0.2.3"
pretty_assertions = "1.3.0"

[build-dependencies]
tonic-build = { version = "0.8.2", default_features = false, features = ["transport", "prost"] }
prost-build = "0.11.2"
built = { version = "0.5.1", features = ["git2"] }
tonic-build = { version = "0.8.4", default_features = false, features = ["transport", "prost"] }
prost-build = "0.11.5"
built = { version = "0.5.2", features = ["git2"] }
protobuf-src = { version = "1.1.0", optional = true }

[features]
Expand Down
8 changes: 4 additions & 4 deletions agones/Cargo.toml
View file
Open in desktop
Expand Up @@ -24,8 +24,8 @@ description = "End to end integration tests to be run against a Kubernetes clust
readme = "README.md"

[dependencies]
base64 = "0.13.0"
k8s-openapi = { version = "0.16.0", features = ["v1_22"] }
kube = { version = "0.76.0", features = ["runtime", "derive"] }
base64.workspace = true
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh this is dope. This makes things far less brittle.

k8s-openapi.workspace = true
kube.workspace = true
XAMPPRocky marked this conversation as resolved.
Show resolved Hide resolved
quilkin = { path = "../" }
tokio = { version = "1.21.2", features = ["sync", "parking_lot"] }
tokio.workspace = true
2 changes: 1 addition & 1 deletion src/config.rs
View file
Open in desktop
Expand Up @@ -44,7 +44,7 @@ use metrics::Metrics;

pub use self::{builder::Builder, config_type::ConfigType, error::ValidationError, slot::Slot};

base64_serde_type!(Base64Standard, base64::STANDARD);
base64_serde_type!(pub Base64Standard, base64::STANDARD);

// For some log messages on the hot path (potentially per-packet), we log 1 out
// of every `LOG_SAMPLING_RATE` occurrences to avoid spamming the logs.
Expand Down
4 changes: 1 addition & 3 deletions src/filters/concatenate_bytes/config.rs
View file
Open in desktop
Expand Up @@ -14,13 +14,11 @@
* limitations under the License.
*/

use base64_serde::base64_serde_type;
use schemars::JsonSchema;
use serde::{Deserialize, Serialize};

use super::proto;

base64_serde_type!(Base64Standard, base64::STANDARD);
use crate::config::Base64Standard;

#[derive(Serialize, Deserialize, Debug, Eq, PartialEq, JsonSchema)]
pub enum Strategy {
Expand Down