diff --git a/.env b/.env index 33bb9c6..18a0c86 100644 --- a/.env +++ b/.env @@ -32,10 +32,6 @@ S3_GW_IMAGE=nspccdev/neofs-s3-gw #S3_AUTHMATE_URL=https://github.com/nspcc-dev/neofs-s3-gw/releases/download/v${S3_GW_VERSION}/neofs-s3-authmate-${S3_GW_PLATFORM} #S3_GW_URL=https://github.com/nspcc-dev/neofs-s3-gw/releases/download/v${S3_GW_VERSION}/neofs-s3-gw-${S3_GW_PLATFORM} -# Coredns -COREDNS_VERSION=v016 -COREDNS_IMAGE=nspccdev/coredns - # NeoFS CLI binary NEOFS_CLI_URL=https://github.com/nspcc-dev/neofs-node/releases/download/v0.43.0/neofs-cli-linux-amd64 #NEOFS_CLI_PATH=/path/to/neofs-cli-binary diff --git a/.services b/.services index 2e2496b..658d141 100644 --- a/.services +++ b/.services @@ -2,4 +2,3 @@ # Will start from top to bottom and stop in reverse s3_gate rest_gate -coredns diff --git a/bin/update_hosts.sh b/bin/update_hosts.sh index 7ace0c7..aa716e5 100755 --- a/bin/update_hosts.sh +++ b/bin/update_hosts.sh @@ -2,19 +2,15 @@ set -e : "${HOSTS_FILE:=/etc/hosts}" -: "${COREFILE:=services/coredns/Corefile}" : "${NEOFS_CHAIN_CONFIG:=services/ir/cfg/config.yml}" temp_file=$(mktemp) # Get default hosts make hosts > "$temp_file" -# Get the NeoFS chain IP address from the $COREFILE file +# Get the NeoFS chain IP address from the hosts file neofs_chain_ip=$(grep "ir01.neofs.devenv" "$temp_file" | awk '{print $1}') -# Replace the IP address in the $COREFILE file -sed -i -E "s/(nns[[:space:]]*http\:\/\/)([0-9]{1,3}[.]){3}[0-9]{1,3}(:30333)/\1$neofs_chain_ip\3/" "$COREFILE" - # Get the line numbers of "Addresses:" # FIXME(#302): grep by 'listen:' is unstable, jump to exact YAML fields addresses_lines=$(grep -n "listen:" "$NEOFS_CHAIN_CONFIG" | cut -d ':' -f 1) diff --git a/services/coredns/.env b/services/coredns/.env deleted file mode 120000 index c7360fb..0000000 --- a/services/coredns/.env +++ /dev/null @@ -1 +0,0 @@ -../../.env \ No newline at end of file diff --git a/services/coredns/.hosts b/services/coredns/.hosts deleted file mode 100644 index 5f77ce9..0000000 --- a/services/coredns/.hosts +++ /dev/null @@ -1 +0,0 @@ -IPV4_PREFIX.53 coredns.LOCAL_DOMAIN diff --git a/services/coredns/Corefile b/services/coredns/Corefile deleted file mode 100644 index 852c758..0000000 --- a/services/coredns/Corefile +++ /dev/null @@ -1,8 +0,0 @@ -. { - nns http://192.168.130.90:30333 - transfer { - to * - } - log - debug -} diff --git a/services/coredns/docker-compose.yml b/services/coredns/docker-compose.yml deleted file mode 100644 index 2f8f6bd..0000000 --- a/services/coredns/docker-compose.yml +++ /dev/null @@ -1,24 +0,0 @@ ---- - -version: "2.4" -services: - neofs_coredns: - image: ${COREDNS_IMAGE}:${COREDNS_VERSION} - container_name: coredns - domainname: ${LOCAL_DOMAIN} - hostname: coredns - restart: "no" - networks: - coredns: - internet: - ipv4_address: ${IPV4_PREFIX}.53 - stop_signal: SIGKILL - volumes: - - ./Corefile:/Corefile - - ./../../vendor/hosts:/etc/hosts - -networks: - coredns: - internet: - external: true - name: basenet_internet