From d38d62f4d798f0b18a952c937d3ae7ae51042557 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Thu, 17 Apr 2025 12:36:41 +0200 Subject: [PATCH] bump version to v2.0.0 --- Cargo.lock | 26 +++++++++++++------------- Cargo.toml | 24 ++++++++++++------------ doc/book/cookbook/real-world.md | 10 +++++----- doc/book/quick-start/_index.md | 2 +- script/helm/garage/Chart.yaml | 4 ++-- src/api/admin/Cargo.toml | 2 +- src/api/common/Cargo.toml | 2 +- src/api/k2v/Cargo.toml | 2 +- src/api/s3/Cargo.toml | 2 +- src/block/Cargo.toml | 2 +- src/db/Cargo.toml | 2 +- src/garage/Cargo.toml | 2 +- src/model/Cargo.toml | 2 +- src/net/Cargo.toml | 2 +- src/rpc/Cargo.toml | 2 +- src/rpc/system.rs | 2 +- src/table/Cargo.toml | 2 +- src/util/Cargo.toml | 2 +- src/web/Cargo.toml | 2 +- 19 files changed, 47 insertions(+), 47 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1c66d7f8..2b9adcc0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1200,7 +1200,7 @@ dependencies = [ [[package]] name = "garage" -version = "1.1.0" +version = "2.0.0" dependencies = [ "assert-json-diff", "async-trait", @@ -1255,7 +1255,7 @@ dependencies = [ [[package]] name = "garage_api_admin" -version = "1.1.0" +version = "2.0.0" dependencies = [ "argon2", "async-trait", @@ -1287,7 +1287,7 @@ dependencies = [ [[package]] name = "garage_api_common" -version = "1.1.0" +version = "2.0.0" dependencies = [ "base64 0.21.7", "bytes", @@ -1323,7 +1323,7 @@ dependencies = [ [[package]] name = "garage_api_k2v" -version = "1.1.0" +version = "2.0.0" dependencies = [ "base64 0.21.7", "err-derive", @@ -1346,7 +1346,7 @@ dependencies = [ [[package]] name = "garage_api_s3" -version = "1.1.0" +version = "2.0.0" dependencies = [ "aes-gcm", "async-compression", @@ -1393,7 +1393,7 @@ dependencies = [ [[package]] name = "garage_block" -version = "1.1.0" +version = "2.0.0" dependencies = [ "arc-swap", "async-compression", @@ -1417,7 +1417,7 @@ dependencies = [ [[package]] name = "garage_db" -version = "1.1.0" +version = "2.0.0" dependencies = [ "err-derive", "heed", @@ -1430,7 +1430,7 @@ dependencies = [ [[package]] name = "garage_model" -version = "1.1.0" +version = "2.0.0" dependencies = [ "argon2", "async-trait", @@ -1458,7 +1458,7 @@ dependencies = [ [[package]] name = "garage_net" -version = "1.1.0" +version = "2.0.0" dependencies = [ "arc-swap", "bytes", @@ -1483,7 +1483,7 @@ dependencies = [ [[package]] name = "garage_rpc" -version = "1.1.0" +version = "2.0.0" dependencies = [ "arc-swap", "async-trait", @@ -1515,7 +1515,7 @@ dependencies = [ [[package]] name = "garage_table" -version = "1.1.0" +version = "2.0.0" dependencies = [ "arc-swap", "async-trait", @@ -1536,7 +1536,7 @@ dependencies = [ [[package]] name = "garage_util" -version = "1.1.0" +version = "2.0.0" dependencies = [ "arc-swap", "async-trait", @@ -1568,7 +1568,7 @@ dependencies = [ [[package]] name = "garage_web" -version = "1.1.0" +version = "2.0.0" dependencies = [ "err-derive", "garage_api_common", diff --git a/Cargo.toml b/Cargo.toml index 063e55ea..a7e3e225 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,18 +24,18 @@ default-members = ["src/garage"] # Internal Garage crates format_table = { version = "0.1.1", path = "src/format-table" } -garage_api_common = { version = "1.1.0", path = "src/api/common" } -garage_api_admin = { version = "1.1.0", path = "src/api/admin" } -garage_api_s3 = { version = "1.1.0", path = "src/api/s3" } -garage_api_k2v = { version = "1.1.0", path = "src/api/k2v" } -garage_block = { version = "1.1.0", path = "src/block" } -garage_db = { version = "1.1.0", path = "src/db", default-features = false } -garage_model = { version = "1.1.0", path = "src/model", default-features = false } -garage_net = { version = "1.1.0", path = "src/net" } -garage_rpc = { version = "1.1.0", path = "src/rpc" } -garage_table = { version = "1.1.0", path = "src/table" } -garage_util = { version = "1.1.0", path = "src/util" } -garage_web = { version = "1.1.0", path = "src/web" } +garage_api_common = { version = "2.0.0", path = "src/api/common" } +garage_api_admin = { version = "2.0.0", path = "src/api/admin" } +garage_api_s3 = { version = "2.0.0", path = "src/api/s3" } +garage_api_k2v = { version = "2.0.0", path = "src/api/k2v" } +garage_block = { version = "2.0.0", path = "src/block" } +garage_db = { version = "2.0.0", path = "src/db", default-features = false } +garage_model = { version = "2.0.0", path = "src/model", default-features = false } +garage_net = { version = "2.0.0", path = "src/net" } +garage_rpc = { version = "2.0.0", path = "src/rpc" } +garage_table = { version = "2.0.0", path = "src/table" } +garage_util = { version = "2.0.0", path = "src/util" } +garage_web = { version = "2.0.0", path = "src/web" } k2v-client = { version = "0.0.4", path = "src/k2v-client" } # External crates from crates.io diff --git a/doc/book/cookbook/real-world.md b/doc/book/cookbook/real-world.md index 594f1905..910c227b 100644 --- a/doc/book/cookbook/real-world.md +++ b/doc/book/cookbook/real-world.md @@ -96,14 +96,14 @@ to store 2 TB of data in total. ## Get a Docker image Our docker image is currently named `dxflrs/garage` and is stored on the [Docker Hub](https://hub.docker.com/r/dxflrs/garage/tags?page=1&ordering=last_updated). -We encourage you to use a fixed tag (eg. `v1.1.0`) and not the `latest` tag. -For this example, we will use the latest published version at the time of the writing which is `v1.1.0` but it's up to you +We encourage you to use a fixed tag (eg. `v2.0.0`) and not the `latest` tag. +For this example, we will use the latest published version at the time of the writing which is `v2.0.0` but it's up to you to check [the most recent versions on the Docker Hub](https://hub.docker.com/r/dxflrs/garage/tags?page=1&ordering=last_updated). For example: ``` -sudo docker pull dxflrs/garage:v1.1.0 +sudo docker pull dxflrs/garage:v2.0.0 ``` ## Deploying and configuring Garage @@ -171,7 +171,7 @@ docker run \ -v /etc/garage.toml:/etc/garage.toml \ -v /var/lib/garage/meta:/var/lib/garage/meta \ -v /var/lib/garage/data:/var/lib/garage/data \ - dxflrs/garage:v1.1.0 + dxflrs/garage:v2.0.0 ``` With this command line, Garage should be started automatically at each boot. @@ -185,7 +185,7 @@ If you want to use `docker-compose`, you may use the following `docker-compose.y version: "3" services: garage: - image: dxflrs/garage:v1.1.0 + image: dxflrs/garage:v2.0.0 network_mode: "host" restart: unless-stopped volumes: diff --git a/doc/book/quick-start/_index.md b/doc/book/quick-start/_index.md index 41867b19..b94257d5 100644 --- a/doc/book/quick-start/_index.md +++ b/doc/book/quick-start/_index.md @@ -132,7 +132,7 @@ docker run \ -v /etc/garage.toml:/path/to/garage.toml \ -v /var/lib/garage/meta:/path/to/garage/meta \ -v /var/lib/garage/data:/path/to/garage/data \ - dxflrs/garage:v1.1.0 + dxflrs/garage:v2.0.0 ``` Under Linux, you can substitute `--network host` for `-p 3900:3900 -p 3901:3901 -p 3902:3902 -p 3903:3903` diff --git a/script/helm/garage/Chart.yaml b/script/helm/garage/Chart.yaml index 1a3e27e0..5fe180a0 100644 --- a/script/helm/garage/Chart.yaml +++ b/script/helm/garage/Chart.yaml @@ -15,10 +15,10 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.7.0 +version: 0.8.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v1.1.0" +appVersion: "v2.0.0" diff --git a/src/api/admin/Cargo.toml b/src/api/admin/Cargo.toml index 92d041cc..1b1fab13 100644 --- a/src/api/admin/Cargo.toml +++ b/src/api/admin/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garage_api_admin" -version = "1.1.0" +version = "2.0.0" authors = ["Alex Auvolat "] edition = "2018" license = "AGPL-3.0" diff --git a/src/api/common/Cargo.toml b/src/api/common/Cargo.toml index 5608a5e3..672df030 100644 --- a/src/api/common/Cargo.toml +++ b/src/api/common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garage_api_common" -version = "1.1.0" +version = "2.0.0" authors = ["Alex Auvolat "] edition = "2018" license = "AGPL-3.0" diff --git a/src/api/k2v/Cargo.toml b/src/api/k2v/Cargo.toml index 385aef3b..6e023b33 100644 --- a/src/api/k2v/Cargo.toml +++ b/src/api/k2v/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garage_api_k2v" -version = "1.1.0" +version = "2.0.0" authors = ["Alex Auvolat "] edition = "2018" license = "AGPL-3.0" diff --git a/src/api/s3/Cargo.toml b/src/api/s3/Cargo.toml index e236729f..02866c35 100644 --- a/src/api/s3/Cargo.toml +++ b/src/api/s3/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garage_api_s3" -version = "1.1.0" +version = "2.0.0" authors = ["Alex Auvolat "] edition = "2018" license = "AGPL-3.0" diff --git a/src/block/Cargo.toml b/src/block/Cargo.toml index dc13130b..58e9a5f2 100644 --- a/src/block/Cargo.toml +++ b/src/block/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garage_block" -version = "1.1.0" +version = "2.0.0" authors = ["Alex Auvolat "] edition = "2018" license = "AGPL-3.0" diff --git a/src/db/Cargo.toml b/src/db/Cargo.toml index bfc9029c..1d839ccb 100644 --- a/src/db/Cargo.toml +++ b/src/db/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garage_db" -version = "1.1.0" +version = "2.0.0" authors = ["Alex Auvolat "] edition = "2018" license = "AGPL-3.0" diff --git a/src/garage/Cargo.toml b/src/garage/Cargo.toml index c8cd4a78..3d0734b4 100644 --- a/src/garage/Cargo.toml +++ b/src/garage/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garage" -version = "1.1.0" +version = "2.0.0" authors = ["Alex Auvolat "] edition = "2018" license = "AGPL-3.0" diff --git a/src/model/Cargo.toml b/src/model/Cargo.toml index a990a191..7c289c2a 100644 --- a/src/model/Cargo.toml +++ b/src/model/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garage_model" -version = "1.1.0" +version = "2.0.0" authors = ["Alex Auvolat "] edition = "2018" license = "AGPL-3.0" diff --git a/src/net/Cargo.toml b/src/net/Cargo.toml index b48eb153..ccf24f44 100644 --- a/src/net/Cargo.toml +++ b/src/net/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garage_net" -version = "1.1.0" +version = "2.0.0" authors = ["Alex Auvolat "] edition = "2018" license = "AGPL-3.0" diff --git a/src/rpc/Cargo.toml b/src/rpc/Cargo.toml index e6466001..686abb7e 100644 --- a/src/rpc/Cargo.toml +++ b/src/rpc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garage_rpc" -version = "1.1.0" +version = "2.0.0" authors = ["Alex Auvolat "] edition = "2018" license = "AGPL-3.0" diff --git a/src/rpc/system.rs b/src/rpc/system.rs index 800b37f3..97901130 100644 --- a/src/rpc/system.rs +++ b/src/rpc/system.rs @@ -45,7 +45,7 @@ const STATUS_EXCHANGE_INTERVAL: Duration = Duration::from_secs(10); /// Version tag used for version check upon Netapp connection. /// Cluster nodes with different version tags are deemed /// incompatible and will refuse to connect. -pub const GARAGE_VERSION_TAG: u64 = 0x6761726167650010; // garage 0x0010 (1.0) +pub const GARAGE_VERSION_TAG: u64 = 0x6761726167650020; // garage 0x0020 (2.0) /// RPC endpoint used for calls related to membership pub const SYSTEM_RPC_PATH: &str = "garage_rpc/system.rs/SystemRpc"; diff --git a/src/table/Cargo.toml b/src/table/Cargo.toml index ef7b44e4..9cb78369 100644 --- a/src/table/Cargo.toml +++ b/src/table/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garage_table" -version = "1.1.0" +version = "2.0.0" authors = ["Alex Auvolat "] edition = "2018" license = "AGPL-3.0" diff --git a/src/util/Cargo.toml b/src/util/Cargo.toml index 123406db..974bef78 100644 --- a/src/util/Cargo.toml +++ b/src/util/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garage_util" -version = "1.1.0" +version = "2.0.0" authors = ["Alex Auvolat "] edition = "2018" license = "AGPL-3.0" diff --git a/src/web/Cargo.toml b/src/web/Cargo.toml index c4fdbc0e..01a38039 100644 --- a/src/web/Cargo.toml +++ b/src/web/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garage_web" -version = "1.1.0" +version = "2.0.0" authors = ["Alex Auvolat ", "Quentin Dufour "] edition = "2018" license = "AGPL-3.0"