From e62ff3f0fcc69139e49b1ef2789d3e969e8b23a4 Mon Sep 17 00:00:00 2001
From: Alex Vanin <a.vanin@yadro.com>
Date: Thu, 6 Jul 2023 18:48:50 +0300
Subject: [PATCH] Update to the component master branch

Signed-off-by: Alex Vanin <a.vanin@yadro.com>
---
 .env                        |  2 +-
 Dockerfile                  |  8 ++++----
 Makefile                    | 16 ++--------------
 http-gw/http-gw-config.yaml |  2 +-
 s3-gw/s3-gw-config.yaml     |  3 ---
 sn/config.yaml              |  2 ++
 6 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/.env b/.env
index 134c41b..b2ecf86 100644
--- a/.env
+++ b/.env
@@ -1,3 +1,3 @@
 FROSTFS_HUB_IMAGE=truecloudlab/frostfs
 AIO_IMAGE=truecloudlab/frostfs-aio
-AIO_VERSION=1.2.8
+AIO_VERSION=1.3.0-preview.1
diff --git a/Dockerfile b/Dockerfile
index f260699..ccde31d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
 ARG FROSTFS_HUB_IMAGE=truecloudlab/frostfs
 ARG NEOGO_HUB_IMAGE=nspccdev/neo-go
 
-ARG FROSTFS_CORE_TAG=0.36.0
-ARG FROSTFS_GATES_TAG=0.27.0
+ARG FROSTFS_CORE_TAG=6eefe974
+ARG FROSTFS_GATES_TAG=0.27.0-rc.2
 ARG NEOGO_TAG=0.101.1
 
 FROM ${NEOGO_HUB_IMAGE}:${NEOGO_TAG} as neo-go
@@ -10,8 +10,8 @@ FROM ${FROSTFS_HUB_IMAGE}-adm:${FROSTFS_CORE_TAG} as frostfs-adm
 FROM ${FROSTFS_HUB_IMAGE}-cli:${FROSTFS_CORE_TAG} as frostfs-cli
 FROM ${FROSTFS_HUB_IMAGE}-ir:${FROSTFS_CORE_TAG} as frostfs-ir
 FROM ${FROSTFS_HUB_IMAGE}-storage:${FROSTFS_CORE_TAG} as frostfs-storage
-FROM ${FROSTFS_HUB_IMAGE}-s3-gw:${FROSTFS_GATES_TAG} as frostfs-s3-gw
-FROM ${FROSTFS_HUB_IMAGE}-http-gw:${FROSTFS_GATES_TAG} as frostfs-http-gw
+FROM ${FROSTFS_HUB_IMAGE}-s3-gw:0.27.0-rc.1-74-g7f708b3a as frostfs-s3-gw
+FROM ${FROSTFS_HUB_IMAGE}-http-gw:0.27.0-rc.1-32-g6f64557a as frostfs-http-gw
 
 # Executable image
 FROM alpine AS frostfs-aio
diff --git a/Makefile b/Makefile
index 53ef6de..f9f1980 100644
--- a/Makefile
+++ b/Makefile
@@ -8,11 +8,6 @@ REPO=$(notdir $(shell pwd))
 VERSION ?= "$(shell git describe --tags --match "v*" 2>/dev/null || git rev-parse --short HEAD | sed 's/^v//')"
 
 # Variables for docker
-NEOGO_HUB_IMAGE ?= "nspccdev/neo-go"
-NEOGO_HUB_TAG ?= "0.101.1"
-FROSTFS_HUB_IMAGE ?= "truecloudlab/frostfs"
-FROSTFS_CORE_TAG ?= "0.36.0"
-FROSTFS_GATES_TAG ?= "0.27.0"
 AIO_IMAGE ?= "truecloudlab/frostfs-aio"
 
 # Variables for compose
@@ -34,11 +29,6 @@ image-aio:
 	@echo "⇒ Build aio docker image"
 	@docker build \
 		--rm \
-		--build-arg FROSTFS_HUB_IMAGE=$(FROSTFS_HUB_IMAGE) \
-		--build-arg FROSTFS_CORE_TAG=$(FROSTFS_CORE_TAG) \
-		--build-arg FROSTFS_GATES_TAG=$(FROSTFS_GATES_TAG) \
-		--build-arg NEOGO_HUB_IMAGE=$(NEOGO_HUB_IMAGE) \
-		--build-arg NEOGO_TAG=$(NEOGO_HUB_TAG) \
 		-f Dockerfile \
 		-t $(AIO_IMAGE):$(AIO_VERSION) .
 
@@ -68,8 +58,7 @@ s3cred:
 		--wallet /config/user-wallet.json \
 		--peer localhost:8080 \
 		--gate-public-key $(S3_GATE_PUBLIC_KEY) \
-		--container-placement-policy "REP 1" \
-		--bearer-rules $(S3_BEARER_RULES)
+		--container-placement-policy "REP 1"
 
 # Generate S3 credentials based on imported wallets
 s3cred-custom:
@@ -77,8 +66,7 @@ s3cred-custom:
 		--wallet /wallets/$(wallet) \
 		--peer localhost:8080 \
 		--gate-public-key $(S3_GATE_PUBLIC_KEY) \
-		--container-placement-policy "REP 1" \
-		--bearer-rules $(S3_BEARER_RULES)
+		--container-placement-policy "REP 1"
 
 # Tick new epoch in side chain
 tick.epoch:
diff --git a/http-gw/http-gw-config.yaml b/http-gw/http-gw-config.yaml
index 105236b..c11a43a 100644
--- a/http-gw/http-gw-config.yaml
+++ b/http-gw/http-gw-config.yaml
@@ -29,7 +29,7 @@ wallet:
 
 peers:
   0:
-    address: grpc://localhost:8080
+    address: localhost:8080
     priority: 1
     weight: 1
 
diff --git a/s3-gw/s3-gw-config.yaml b/s3-gw/s3-gw-config.yaml
index 522e1b4..73721f5 100644
--- a/s3-gw/s3-gw-config.yaml
+++ b/s3-gw/s3-gw-config.yaml
@@ -15,9 +15,6 @@ server:
 logger:
   level: debug
 
-tree:
-  service: localhost:8080
-
 rpc_endpoint: http://localhost:30333
 resolve_order:
   - nns
diff --git a/sn/config.yaml b/sn/config.yaml
index 1e082f3..cfb45c0 100644
--- a/sn/config.yaml
+++ b/sn/config.yaml
@@ -62,6 +62,8 @@ storage:
 
 tree:
   enabled: true
+  allowed_keys:
+    - 0324e76288fcb900100d01802a14ef977cca45ad073561230446df14b344c858b6
 
 object:
   put: