From c384a2699109693a6adc02d47505c857a2b108a2 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Thu, 20 Feb 2025 19:09:35 +0100 Subject: [PATCH 1/2] bump version to v1.1.0 --- Cargo.lock | 26 +++++++++++++------------- Cargo.toml | 24 ++++++++++++------------ doc/book/cookbook/real-world.md | 10 +++++----- doc/drafts/admin-api.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/table/Cargo.toml | 2 +- src/util/Cargo.toml | 2 +- src/web/Cargo.toml | 2 +- 18 files changed, 46 insertions(+), 46 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 558dde1c..b56b72bb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1239,7 +1239,7 @@ dependencies = [ [[package]] name = "garage" -version = "1.0.1" +version = "1.1.0" dependencies = [ "assert-json-diff", "async-trait", @@ -1293,7 +1293,7 @@ dependencies = [ [[package]] name = "garage_api_admin" -version = "1.0.1" +version = "1.1.0" dependencies = [ "argon2", "async-trait", @@ -1319,7 +1319,7 @@ dependencies = [ [[package]] name = "garage_api_common" -version = "1.0.1" +version = "1.1.0" dependencies = [ "base64 0.21.7", "bytes", @@ -1354,7 +1354,7 @@ dependencies = [ [[package]] name = "garage_api_k2v" -version = "1.0.1" +version = "1.1.0" dependencies = [ "base64 0.21.7", "err-derive", @@ -1377,7 +1377,7 @@ dependencies = [ [[package]] name = "garage_api_s3" -version = "1.0.1" +version = "1.1.0" dependencies = [ "aes-gcm", "async-compression", @@ -1422,7 +1422,7 @@ dependencies = [ [[package]] name = "garage_block" -version = "1.0.1" +version = "1.1.0" dependencies = [ "arc-swap", "async-compression", @@ -1447,7 +1447,7 @@ dependencies = [ [[package]] name = "garage_db" -version = "1.0.1" +version = "1.1.0" dependencies = [ "err-derive", "heed", @@ -1460,7 +1460,7 @@ dependencies = [ [[package]] name = "garage_model" -version = "1.0.1" +version = "1.1.0" dependencies = [ "async-trait", "base64 0.21.7", @@ -1487,7 +1487,7 @@ dependencies = [ [[package]] name = "garage_net" -version = "1.0.1" +version = "1.1.0" dependencies = [ "arc-swap", "bytes", @@ -1512,7 +1512,7 @@ dependencies = [ [[package]] name = "garage_rpc" -version = "1.0.1" +version = "1.1.0" dependencies = [ "arc-swap", "async-trait", @@ -1544,7 +1544,7 @@ dependencies = [ [[package]] name = "garage_table" -version = "1.0.1" +version = "1.1.0" dependencies = [ "arc-swap", "async-trait", @@ -1565,7 +1565,7 @@ dependencies = [ [[package]] name = "garage_util" -version = "1.0.1" +version = "1.1.0" dependencies = [ "arc-swap", "async-trait", @@ -1597,7 +1597,7 @@ dependencies = [ [[package]] name = "garage_web" -version = "1.0.1" +version = "1.1.0" dependencies = [ "err-derive", "garage_api_common", diff --git a/Cargo.toml b/Cargo.toml index 0e156358..41f91228 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.0.1", path = "src/api/common" } -garage_api_admin = { version = "1.0.1", path = "src/api/admin" } -garage_api_s3 = { version = "1.0.1", path = "src/api/s3" } -garage_api_k2v = { version = "1.0.1", path = "src/api/k2v" } -garage_block = { version = "1.0.1", path = "src/block" } -garage_db = { version = "1.0.1", path = "src/db", default-features = false } -garage_model = { version = "1.0.1", path = "src/model", default-features = false } -garage_net = { version = "1.0.1", path = "src/net" } -garage_rpc = { version = "1.0.1", path = "src/rpc" } -garage_table = { version = "1.0.1", path = "src/table" } -garage_util = { version = "1.0.1", path = "src/util" } -garage_web = { version = "1.0.1", path = "src/web" } +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" } 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 751609db..594f1905 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.0.1`) and not the `latest` tag. -For this example, we will use the latest published version at the time of the writing which is `v1.0.1` but it's up to you +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 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.0.1 +sudo docker pull dxflrs/garage:v1.1.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.0.1 + dxflrs/garage:v1.1.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.0.1 + image: dxflrs/garage:v1.1.0 network_mode: "host" restart: unless-stopped volumes: diff --git a/doc/drafts/admin-api.md b/doc/drafts/admin-api.md index a614af58..acceefab 100644 --- a/doc/drafts/admin-api.md +++ b/doc/drafts/admin-api.md @@ -70,7 +70,7 @@ Example response body: ```json { "node": "b10c110e4e854e5aa3f4637681befac755154b20059ec163254ddbfae86b09df", - "garageVersion": "v1.0.1", + "garageVersion": "v1.1.0", "garageFeatures": [ "k2v", "lmdb", diff --git a/script/helm/garage/Chart.yaml b/script/helm/garage/Chart.yaml index fca569cc..1a3e27e0 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.6.0 +version: 0.7.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.0.1" +appVersion: "v1.1.0" diff --git a/src/api/admin/Cargo.toml b/src/api/admin/Cargo.toml index adddf306..a61d13e5 100644 --- a/src/api/admin/Cargo.toml +++ b/src/api/admin/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garage_api_admin" -version = "1.0.1" +version = "1.1.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 c33d585d..8fab93ee 100644 --- a/src/api/common/Cargo.toml +++ b/src/api/common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garage_api_common" -version = "1.0.1" +version = "1.1.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 e3ebedca..c8c7c8ef 100644 --- a/src/api/k2v/Cargo.toml +++ b/src/api/k2v/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garage_api_k2v" -version = "1.0.1" +version = "1.1.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 387e45db..2507ee07 100644 --- a/src/api/s3/Cargo.toml +++ b/src/api/s3/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garage_api_s3" -version = "1.0.1" +version = "1.1.0" authors = ["Alex Auvolat "] edition = "2018" license = "AGPL-3.0" diff --git a/src/block/Cargo.toml b/src/block/Cargo.toml index 3358a3e7..1f5558c5 100644 --- a/src/block/Cargo.toml +++ b/src/block/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garage_block" -version = "1.0.1" +version = "1.1.0" authors = ["Alex Auvolat "] edition = "2018" license = "AGPL-3.0" diff --git a/src/db/Cargo.toml b/src/db/Cargo.toml index 3ef51fae..bfc9029c 100644 --- a/src/db/Cargo.toml +++ b/src/db/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garage_db" -version = "1.0.1" +version = "1.1.0" authors = ["Alex Auvolat "] edition = "2018" license = "AGPL-3.0" diff --git a/src/garage/Cargo.toml b/src/garage/Cargo.toml index 966c8ac5..53a5a447 100644 --- a/src/garage/Cargo.toml +++ b/src/garage/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garage" -version = "1.0.1" +version = "1.1.0" authors = ["Alex Auvolat "] edition = "2018" license = "AGPL-3.0" diff --git a/src/model/Cargo.toml b/src/model/Cargo.toml index b58ad43b..42ec8537 100644 --- a/src/model/Cargo.toml +++ b/src/model/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garage_model" -version = "1.0.1" +version = "1.1.0" authors = ["Alex Auvolat "] edition = "2018" license = "AGPL-3.0" diff --git a/src/net/Cargo.toml b/src/net/Cargo.toml index c0b47a6e..b48eb153 100644 --- a/src/net/Cargo.toml +++ b/src/net/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garage_net" -version = "1.0.1" +version = "1.1.0" authors = ["Alex Auvolat "] edition = "2018" license = "AGPL-3.0" diff --git a/src/rpc/Cargo.toml b/src/rpc/Cargo.toml index fcc1c304..e6466001 100644 --- a/src/rpc/Cargo.toml +++ b/src/rpc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garage_rpc" -version = "1.0.1" +version = "1.1.0" authors = ["Alex Auvolat "] edition = "2018" license = "AGPL-3.0" diff --git a/src/table/Cargo.toml b/src/table/Cargo.toml index fad6ea08..ef7b44e4 100644 --- a/src/table/Cargo.toml +++ b/src/table/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garage_table" -version = "1.0.1" +version = "1.1.0" authors = ["Alex Auvolat "] edition = "2018" license = "AGPL-3.0" diff --git a/src/util/Cargo.toml b/src/util/Cargo.toml index fec5b1ed..123406db 100644 --- a/src/util/Cargo.toml +++ b/src/util/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garage_util" -version = "1.0.1" +version = "1.1.0" authors = ["Alex Auvolat "] edition = "2018" license = "AGPL-3.0" diff --git a/src/web/Cargo.toml b/src/web/Cargo.toml index a0a3e566..c4fdbc0e 100644 --- a/src/web/Cargo.toml +++ b/src/web/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garage_web" -version = "1.0.1" +version = "1.1.0" authors = ["Alex Auvolat ", "Quentin Dufour "] edition = "2018" license = "AGPL-3.0" -- 2.45.3 From 3fac7ddaa3b7c6e4e47a3bb7312dfb42edad60f3 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Thu, 20 Feb 2025 19:39:53 +0100 Subject: [PATCH 2/2] doc: fix "since vX.X.X" in multiple places --- doc/book/reference-manual/configuration.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/book/reference-manual/configuration.md b/doc/book/reference-manual/configuration.md index f545de29..e0fc17bc 100644 --- a/doc/book/reference-manual/configuration.md +++ b/doc/book/reference-manual/configuration.md @@ -154,7 +154,7 @@ The `[admin]` section: The following configuration parameter must be specified as an environment variable, it does not exist in the configuration file: -- `GARAGE_LOG_TO_SYSLOG` (since v0.9.4): set this to `1` or `true` to make the +- `GARAGE_LOG_TO_SYSLOG` (since `v0.9.4`): set this to `1` or `true` to make the Garage daemon send its logs to `syslog` (using the libc `syslog` function) instead of printing to stderr. @@ -300,7 +300,7 @@ data_dir = [ See [the dedicated documentation page](@/documentation/operations/multi-hdd.md) on how to operate Garage in such a setup. -#### `metadata_snapshots_dir` (since Garage `v1.0.2`) {#metadata_snapshots_dir} +#### `metadata_snapshots_dir` (since `v1.1.0`) {#metadata_snapshots_dir} The directory in which Garage will store metadata snapshots when it performs a snapshot of the metadata database, either when instructed to do @@ -416,7 +416,7 @@ at the cost of a moderate drop in write performance. Similarly to `metatada_fsync`, this is likely not necessary if geographical replication is used. -#### `metadata_auto_snapshot_interval` (since Garage v0.9.4) {#metadata_auto_snapshot_interval} +#### `metadata_auto_snapshot_interval` (since `v0.9.4`) {#metadata_auto_snapshot_interval} If this value is set, Garage will automatically take a snapshot of the metadata DB file at a regular interval and save it in the metadata directory. @@ -453,7 +453,7 @@ you should delete it from the data directory and then call `garage repair blocks` on the node to ensure that it re-obtains a copy from another node on the network. -#### `use_local_tz` {#use_local_tz} +#### `use_local_tz` (since `v1.1.0`) {#use_local_tz} By default, Garage runs the lifecycle worker every day at midnight in UTC. Set the `use_local_tz` configuration value to `true` if you want Garage to run the @@ -475,7 +475,7 @@ files will remain available. This however means that chunks from existing files will not be deduplicated with chunks from newly uploaded files, meaning you might use more storage space that is optimally possible. -#### `block_ram_buffer_max` (since v0.9.4) {#block_ram_buffer_max} +#### `block_ram_buffer_max` (since `v0.9.4`) {#block_ram_buffer_max} A limit on the total size of data blocks kept in RAM by S3 API nodes awaiting to be sent to storage nodes asynchronously. @@ -562,7 +562,7 @@ the node, even in the case of a NAT: the NAT should be configured to forward the port number to the same internal port nubmer. This means that if you have several nodes running behind a NAT, they should each use a different RPC port number. -#### `rpc_bind_outgoing`(since v0.9.2) {#rpc_bind_outgoing} +#### `rpc_bind_outgoing` (since `v0.9.2`) {#rpc_bind_outgoing} If enabled, pre-bind all sockets for outgoing connections to the same IP address used for listening (the IP address specified in `rpc_bind_addr`) before -- 2.45.3