From bb29d8500c8fbcbc873935d44d9038e7042e4090 Mon Sep 17 00:00:00 2001 From: Roman Khimov Date: Wed, 13 Sep 2023 11:25:01 +0300 Subject: [PATCH 1/3] env: upgrade gateways to the latest and greatest Signed-off-by: Roman Khimov --- .env | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.env b/.env index 9052285..7b60c33 100644 --- a/.env +++ b/.env @@ -33,7 +33,7 @@ NATS_VERSION=2.7.2 NATS_IMAGE=nats # HTTP Gate -HTTP_GW_VERSION=0.27.4 +HTTP_GW_VERSION=0.27.5 HTTP_GW_IMAGE=nspccdev/neofs-http-gw # REST Gate @@ -41,7 +41,7 @@ REST_GW_VERSION=0.5.0 REST_GW_IMAGE=nspccdev/neofs-rest-gw # S3 Gate -S3_GW_VERSION=0.28.1 +S3_GW_VERSION=0.28.2 S3_GW_IMAGE=nspccdev/neofs-s3-gw #S3_GW_PLATFORM=linux-amd64 #S3_AUTHMATE_URL=https://github.com/nspcc-dev/neofs-s3-gw/releases/download/v${S3_GW_VERSION}/neofs-s3-authmate-${S3_GW_PLATFORM} From 236878ebe80e54efe94350d8d98c0c8f6f81a3e3 Mon Sep 17 00:00:00 2001 From: Roman Khimov Date: Wed, 13 Sep 2023 21:48:22 +0300 Subject: [PATCH 2/3] storage: fix s02 volumes Error response from daemon: invalid mount config for type "volume": invalid mount path: 'NEOFS_STORAGE_SHARD_0_RESYNC_METABASE=false' mount path must be absolute Signed-off-by: Roman Khimov --- services/storage/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/storage/docker-compose.yml b/services/storage/docker-compose.yml index 9f20829..8480019 100644 --- a/services/storage/docker-compose.yml +++ b/services/storage/docker-compose.yml @@ -64,8 +64,6 @@ services: - ../nats/client-key.pem:/etc/neofs-node/nats.tls.key - ../nats/ca-cert.pem:/etc/neofs-node/nats.ca.crt - ./cfg:/etc/neofs/storage - - NEOFS_STORAGE_SHARD_0_RESYNC_METABASE=${RESYNC_METABASE} - - NEOFS_STORAGE_SHARD_1_RESYNC_METABASE=${RESYNC_METABASE} stop_signal: SIGKILL env_file: [ ".env", ".storage.env", ".int_test.env" ] command: [ "neofs-node", "--config", "/etc/neofs/storage/config.yml" ] @@ -77,6 +75,8 @@ services: - NEOFS_CONTROL_GRPC_ENDPOINT=${NEOFS_STORAGE_CONTROL_GRPC_ENDPOINT_2} - NEOFS_NODE_ATTRIBUTE_0=UN-LOCODE:RU LED - NEOFS_NODE_ATTRIBUTE_1=Price:33 + - NEOFS_STORAGE_SHARD_0_RESYNC_METABASE=${RESYNC_METABASE} + - NEOFS_STORAGE_SHARD_1_RESYNC_METABASE=${RESYNC_METABASE} healthcheck: test: ["CMD", "/neofs-cli", "control", "healthcheck", "-c", "/cli-cfg.yml", "--endpoint", "${NEOFS_STORAGE_CONTROL_GRPC_ENDPOINT_2}"] interval: 5s From dd9ccc14811c79d7ae39b0545c373493c3ea2a58 Mon Sep 17 00:00:00 2001 From: Roman Khimov Date: Wed, 13 Sep 2023 22:26:46 +0300 Subject: [PATCH 3/3] env: upgrade node to 0.38.0 Can't convert storage configuration to peapod now, https://github.com/nspcc-dev/neofs-node/pull/2576 Signed-off-by: Roman Khimov --- .env | 8 ++++---- services/k6_node/Dockerfile | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.env b/.env index 7b60c33..26c832c 100644 --- a/.env +++ b/.env @@ -21,11 +21,11 @@ NEOGO_IMAGE=nspccdev/neo-go #NEO_GO_URL=https://github.com/nspcc-dev/neo-go/releases/download/v${NEOGO_VERSION}/neo-go-${NEO_GO_PLATFORM} # NeoFS InnerRing nodes -IR_VERSION=0.37.0 +IR_VERSION=0.38.0 IR_IMAGE=nspccdev/neofs-ir # NeoFS Storage nodes -NODE_VERSION=0.37.0 +NODE_VERSION=0.38.0 NODE_IMAGE=nspccdev/neofs-storage # NATS Server @@ -56,11 +56,11 @@ LOCODE_DB_URL=https://github.com/nspcc-dev/neofs-locode-db/releases/download/v0. #LOCODE_DB_PATH=/path/to/locode_db # NeoFS CLI binary -NEOFS_CLI_URL=https://github.com/nspcc-dev/neofs-node/releases/download/v0.37.0/neofs-cli-amd64.tar.gz +NEOFS_CLI_URL=https://github.com/nspcc-dev/neofs-node/releases/download/v0.38.0/neofs-cli-amd64.tar.gz #NEOFS_CLI_PATH=/path/to/neofs-cli-binary # NeoFS ADM tool binary -NEOFS_ADM_VERSION=v0.37.0 +NEOFS_ADM_VERSION=v0.38.0 NEOFS_ADM_URL=https://github.com/nspcc-dev/neofs-node/releases/download/${NEOFS_ADM_VERSION}/neofs-adm-amd64.tar.gz #NEOFS_ADM_PATH=/path/to/neofs-adm-binary diff --git a/services/k6_node/Dockerfile b/services/k6_node/Dockerfile index f54e47f..876caa3 100644 --- a/services/k6_node/Dockerfile +++ b/services/k6_node/Dockerfile @@ -15,5 +15,5 @@ RUN git clone https://github.com/nspcc-dev/xk6-neofs.git RUN cd xk6-neofs && xk6 build --with github.com/nspcc-dev/xk6-neofs=. # Download neofs-cli -RUN wget https://github.com/nspcc-dev/neofs-node/releases/download/v0.37.0/neofs-cli-amd64 -O /usr/local/bin/neofs-cli +RUN wget https://github.com/nspcc-dev/neofs-node/releases/download/v0.38.0/neofs-cli-amd64 -O /usr/local/bin/neofs-cli RUN chmod +x /usr/local/bin/neofs-cli