services: Drop NATS

NeoFS storage nodes do not support them since nspcc-dev/neofs-node#2750. Signed-off-by: Leonard Lyubich <[email protected]>
nspcc-dev · Feb 26, 2024 · e638efd · e638efd
1 parent 95acc4b
commit e638efd
Show file tree

Hide file tree

Showing 14 changed files with 1 addition and 138 deletions.
diff --git a/.basic_services b/.basic_services
@@ -1,4 +1,3 @@
 # Services start/stop order
 # Will start from top to bottom and stop in reverse
-nats
 storage
diff --git a/.env b/.env
@@ -21,10 +21,6 @@ IR_IMAGE=nspccdev/neofs-ir
 NODE_VERSION=0.39.1
 NODE_IMAGE=nspccdev/neofs-storage
 
-# NATS Server
-NATS_VERSION=2.7.2
-NATS_IMAGE=nats
-
 # HTTP Gate
 HTTP_GW_VERSION=0.27.5
 HTTP_GW_IMAGE=nspccdev/neofs-http-gw

diff --git a/.gitignore b/.gitignore
@@ -16,7 +16,6 @@ sites/*
 # Runtime generation keys
 services/storage/*tls.crt
 services/storage/*tls.key
-services/nats/*.pem
 services/k6_node/id_ed25519*
 
 # IR NeoFS contract configuration

diff --git a/Makefile b/Makefile
@@ -214,7 +214,7 @@ hosts: vendor/hosts
 .PHONY: clean
 .ONESHELL:
 clean:
-	@rm -rf vendor/* services/storage/s04tls.* services/nats/*.pem services/k6_node/id_ed25519*
+	@rm -rf vendor/* services/storage/s04tls.* services/k6_node/id_ed25519*
 	@> .int_test.env
 	@for svc in $(PULL_SVCS)
 	do

diff --git a/bin/tests/update_hosts_test.sh b/bin/tests/update_hosts_test.sh
@@ -101,7 +101,6 @@ update_entries_in_hosts_test() {
 192.168.100.53 coredns.neofs.devenv
 192.168.100.81 http.neofs.devenv
 192.168.100.102 k6_node.neofs.devenv
-192.168.100.101 nats.neofs.devenv
 192.168.100.83 rest.neofs.devenv
 192.168.100.82 s3.neofs.devenv
 192.168.100.82 *.s3.neofs.devenv
@@ -119,7 +118,6 @@ echo "127.0.0.1       localhost
 192.168.130.53 coredns.neofs.devenv
 192.168.130.81 http.neofs.devenv
 192.168.130.61 ir01.neofs.devenv
-192.168.130.101 nats.neofs.devenv
 192.168.130.83 rest.neofs.devenv
 192.168.130.82 s3.neofs.devenv
 192.168.130.82 *.s3.neofs.devenv
@@ -134,7 +132,6 @@ echo "127.0.0.1       localhost
 192.168.100.53 coredns.neofs.devenv
 192.168.100.81 http.neofs.devenv
 192.168.100.61 ir01.neofs.devenv
-192.168.100.101 nats.neofs.devenv
 192.168.100.83 rest.neofs.devenv
 192.168.100.82 s3.neofs.devenv
 192.168.100.82 *.s3.neofs.devenv

diff --git a/services/nats/.env b/services/nats/.env
diff --git a/services/nats/.hosts b/services/nats/.hosts
diff --git a/services/nats/.int_test.env b/services/nats/.int_test.env
diff --git a/services/nats/artifacts.mk b/services/nats/artifacts.mk
diff --git a/services/nats/docker-compose.yml b/services/nats/docker-compose.yml
diff --git a/services/nats/generate_cert.sh b/services/nats/generate_cert.sh
diff --git a/services/nats/nats.conf b/services/nats/nats.conf
diff --git a/services/storage/cfg/config.yml b/services/storage/cfg/config.yml
@@ -20,17 +20,6 @@ morph:
   endpoints:  # Side chain NEO RPC endpoints
     - ws://ir01.neofs.devenv:30333/ws
 
-# Common storage node settings
-node:
-  notification:
-    enabled: true  # Turn on object notification service
-    endpoint: "tls://nats.neofs.devenv:4222"  # Notification server endpoint
-    timeout: "6s"  # Timeout for object notification client connection
-    default_topic: "test"  # Default topic for object notifications if not found in object's meta
-    certificate: "/etc/neofs-node/nats.tls.cert"  # Path to TLS certificate
-    key: "/etc/neofs-node/nats.tls.key"  # Path to TLS key
-    ca: "/etc/neofs-node/nats.ca.crt"  # Path to optional CA certificate
-
 # Tree section
 tree:
   enabled: true

diff --git a/services/storage/docker-compose.yml b/services/storage/docker-compose.yml
@@ -19,9 +19,6 @@ services:
       - ./../../vendor/neofs-cli:/neofs-cli
       - ./cli-cfg.yml:/cli-cfg.yml
       - ./s04tls.crt:/etc/ssl/certs/s04tls.crt
-      - ../nats/client-cert.pem:/etc/neofs-node/nats.tls.cert
-      - ../nats/client-key.pem:/etc/neofs-node/nats.tls.key
-      - ../nats/ca-cert.pem:/etc/neofs-node/nats.ca.crt
       - ./cfg:/etc/neofs/storage
     stop_signal: SIGKILL
     env_file: [ ".env", ".storage.env", ".int_test.env" ]
@@ -58,9 +55,6 @@ services:
       - ./../../vendor/neofs-cli:/neofs-cli
       - ./cli-cfg.yml:/cli-cfg.yml
       - ./s04tls.crt:/etc/ssl/certs/s04tls.crt
-      - ../nats/client-cert.pem:/etc/neofs-node/nats.tls.cert
-      - ../nats/client-key.pem:/etc/neofs-node/nats.tls.key
-      - ../nats/ca-cert.pem:/etc/neofs-node/nats.ca.crt
       - ./cfg:/etc/neofs/storage
     stop_signal: SIGKILL
     env_file: [ ".env", ".storage.env", ".int_test.env" ]
@@ -97,9 +91,6 @@ services:
       - ./../../vendor/neofs-cli:/neofs-cli
       - ./cli-cfg.yml:/cli-cfg.yml
       - ./s04tls.crt:/etc/ssl/certs/s04tls.crt
-      - ../nats/client-cert.pem:/etc/neofs-node/nats.tls.cert
-      - ../nats/client-key.pem:/etc/neofs-node/nats.tls.key
-      - ../nats/ca-cert.pem:/etc/neofs-node/nats.ca.crt
       - ./cfg:/etc/neofs/storage
     stop_signal: SIGKILL
     env_file: [ ".env", ".storage.env", ".int_test.env" ]
@@ -137,9 +128,6 @@ services:
       - ./cli-cfg.yml:/cli-cfg.yml
       - ./s04tls.crt:/tls.crt
       - ./s04tls.key:/tls.key
-      - ../nats/client-cert.pem:/etc/neofs-node/nats.tls.cert
-      - ../nats/client-key.pem:/etc/neofs-node/nats.tls.key
-      - ../nats/ca-cert.pem:/etc/neofs-node/nats.ca.crt
       - ./cfg:/etc/neofs/storage
     stop_signal: SIGKILL
     env_file: [ ".env", ".storage.env", ".int_test.env" ]