From 19c89b38e6d834943d533565eb094d78e8c4a3f3 Mon Sep 17 00:00:00 2001 From: Denis Kirillov Date: Fri, 9 Jun 2023 09:34:49 +0300 Subject: [PATCH] [#133] Update docs Signed-off-by: Denis Kirillov --- CHANGELOG.md | 3 +++ config/config.env | 3 --- config/config.yaml | 6 ------ docs/configuration.md | 21 --------------------- 4 files changed, 3 insertions(+), 30 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ee7fc37b..2062c25d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -43,6 +43,9 @@ This document outlines major changes between releases. - Changed values for `frostfs_s3_gw_state_health` metric (#91) - Support multiple tree service endpoints (#74) +### Removed +- Drop `tree.service` param (now endpoints from `peers` section are used) (#133) + ## Older versions This project is a fork of [NeoFS S3 Gateway](https://github.com/nspcc-dev/neofs-s3-gw) from version v0.26.0. diff --git a/config/config.env b/config/config.env index 8a07d936..20725403 100644 --- a/config/config.env +++ b/config/config.env @@ -42,9 +42,6 @@ S3_GW_CONFIG=/path/to/config/yaml # Logger S3_GW_LOGGER_LEVEL=debug -# Endpoints of the tree service. At least one endpoint must be provided. Node addresses (from the `peers` section) can be used. -S3_GW_TREE_SERVICE=grpc://s01.frostfs.devenv:8080 grpc://s02.frostfs.devenv:8080 - # RPC endpoint and order of resolving of bucket names S3_GW_RPC_ENDPOINT=http://morph-chain.frostfs.devenv:30333/ S3_GW_RESOLVE_ORDER="nns dns" diff --git a/config/config.yaml b/config/config.yaml index 2644bfc3..8c104777 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -44,12 +44,6 @@ listen_domains: logger: level: debug -# Endpoints of the tree service. At least one endpoint must be provided. Node addresses (from the `peers` section) can be used. -tree: - service: - - node1.frostfs:8080 - - node2.frostfs:8080 - # RPC endpoint and order of resolving of bucket names rpc_endpoint: http://morph-chain.frostfs.devenv:30333 resolve_order: diff --git a/docs/configuration.md b/docs/configuration.md index 88747eb6..a7ba10a7 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -176,7 +176,6 @@ There are some custom types used for brevity: | `placement_policy` | [Placement policy configuration](#placement_policy-section) | | `server` | [Server configuration](#server-section) | | `logger` | [Logger configuration](#logger-section) | -| `tree` | [Tree configuration](#tree-section) | | `cache` | [Cache configuration](#cache-section) | | `nats` | [NATS configuration](#nats-section) | | `cors` | [CORS configuration](#cors-section) | @@ -359,26 +358,6 @@ logger: |-----------|----------|---------------|---------------|----------------------------------------------------------------------------------------------------| | `level` | `string` | yes | `debug` | Logging level.
Possible values: `debug`, `info`, `warn`, `error`, `dpanic`, `panic`, `fatal`. | -### `tree` section - -```yaml -tree: - service: - - s01.frostfs.devenv:8080 - - s02.frostfs.devenv:8080 -``` - -If you use only one endpoint, it can be provided as: - -```yaml -tree: - service: s01.frostfs.devenv:8080 -``` - -| Parameter | Type | Default value | Description | -|-----------|------------|---------------|-------------------------------------------------------------------------------------------------------------------------------| -| `service` | `[]string` | | Endpoints of the tree service. At least one endpoint must be provided. Node addresses (from the `peers` section) can be used. | - ### `cache` section ```yaml