From a723b3da4c790aa1e6e72828c9892d17c0aba9b1 Mon Sep 17 00:00:00 2001 From: "dmitry.travyan" Date: Thu, 17 Nov 2022 01:56:56 +0300 Subject: [PATCH] feat: remove selectel mentions --- Cargo.lock | 2 +- Cargo.toml | 2 +- README.md | 26 +++++++------- README.ru.md | 34 +++++++++---------- deploy/ansible/cluster.genin.yml | 2 +- test/resources/test-big-cluster.genin.yaml | 2 +- .../test-cluster-uncomplete.genin.yaml | 2 +- test/resources/test-cluster.genin.yaml | 2 +- test/resources/test-giant-cluster.genin.yaml | 2 +- test/resources/test-selectel.genin.yaml | 2 +- 10 files changed, 38 insertions(+), 38 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 251a075..6fe6964 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -190,7 +190,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "genin" -version = "0.4.1" +version = "0.4.4" dependencies = [ "clap", "env_logger", diff --git a/Cargo.toml b/Cargo.toml index f68e7e5..d572e52 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "genin" -version = "0.4.1" +version = "0.4.4" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/README.md b/README.md index e0f4dee..ab20004 100644 --- a/README.md +++ b/README.md @@ -65,16 +65,16 @@ sudo yum install -y genin 2. If you want to install `rpm` packages directly without adding our repository. ```shell # RHEL 8.x, CentOS 8.x, Rockylinux 8.x, recent Fedora version -sudo rpm -i https://binary.picodata.io/repository/yum/el/8/x86_64/os/genin-0.4.0-1.el8.x86_64.rpm +sudo rpm -i https://binary.picodata.io/repository/yum/el/8/x86_64/os/genin-0.4.4-1.el8.x86_64.rpm # RHEL 7.x, CentOS 7.x -sudo rpm -i https://binary.picodata.io/repository/yum/el/7/x86_64/os/genin-0.4.0-1.el7.x86_64.rpm +sudo rpm -i https://binary.picodata.io/repository/yum/el/7/x86_64/os/genin-0.4.4-1.el7.x86_64.rpm ``` > **Note:** please don't forget to pick the right package for your OS version. #### Debian, Ubuntu We provide the `deb` Genin package for `debian`-based Linux distributions including the Ubuntu family. Use the following command to download and install the package: ```shell -curl -sLO https://binary.picodata.io/repository/raw/genin/deb/genin-0.4.0.amd64.deb && sudo dpkg -i genin-0.4.0.amd64.deb +curl -sLO https://binary.picodata.io/repository/raw/genin/deb/genin-0.4.4.amd64.deb && sudo dpkg -i genin-0.4.4.amd64.deb ``` #### MacOSX @@ -92,8 +92,8 @@ brew install genin Use the following command to grab and install Genin in macOS (10.10+) wihtout homebrew: ```shell -curl -L https://binary.picodata.io/repository/raw/genin/apple/genin-0.4.0-darwin-amd64.zip -o genin-0.4.0-darwin-amd64.zip -unzip genin-0.4.0-darwin-amd64.zip -d ~/bin/ +curl -L https://binary.picodata.io/repository/raw/genin/apple/genin-0.4.4-darwin-amd64.zip -o genin-0.4.4-darwin-amd64.zip +unzip genin-0.4.4-darwin-amd64.zip -d ~/bin/ ``` > **Note:** The application can then be found under the `~/bin` directory. > Make sure the directory is in your `$PATH`. @@ -102,8 +102,8 @@ unzip genin-0.4.0-darwin-amd64.zip -d ~/bin/ #### Windows Use the following command to grab and install Genin in Windows 7 64 bit or newer: ```shell -curl.exe -L https://binary.picodata.io/repository/raw/genin/windows/genin-0.4.0-darwin-amd64.zip -o genin-0.4.0-windows-amd64.zip -unzip.exe genin-0.4.0-windows-amd64.zip -d %HOME%/.cargo/bin/ +curl.exe -L https://binary.picodata.io/repository/raw/genin/windows/genin-0.4.4-darwin-amd64.zip -o genin-0.4.4-windows-amd64.zip +unzip.exe genin-0.4.4-windows-amd64.zip -d %HOME%/.cargo/bin/ ``` > **Note:** The application can then be found under the `.cargo/bin` folder inside > your user profile folder. Make sure it is in your `%PATH%`. @@ -166,8 +166,8 @@ topology: # map of regions, datacenters, and hosts hosts: - - name: selectel # (mandatory) hostname or domain name - # in this example, both hosts are in the same selectel data center + - name: cloud # (mandatory) hostname or domain name + # in this example, both hosts are in the same cloud data center config: # (optional) begin binary and http port, by default 8081, 3031 # ports can be defined on all levels http: 8081 # (optional) http port to start counting from @@ -178,7 +178,7 @@ hosts: address: 192.168.16.11 # address can be IP, url, subnet (subnet allowed only for higher levels) - name: host-2 config: - address: host-1.selectel.com + address: host-1.cloud.com # failover parameters failover: @@ -229,7 +229,7 @@ topology: replication_factor: 2 hosts: - - name: selectel + - name: cloud config: address: 192.168.16.12/32 hosts: @@ -254,13 +254,13 @@ topology: # the default will be 10 replicasets with 1 replica in each hosts: - - name: selectel + - name: cloud hosts: - name: host-1 config: address: 192.168.16.11 # in this example, the address for each host is set separately, # but for convenience, the address could be set by subnet, - # specifying it one level higher for selectel + # specifying it one level higher for cloud - name: host-2 config: address: 192.168.16.12 diff --git a/README.ru.md b/README.ru.md index 537e1f5..1ca4afd 100644 --- a/README.ru.md +++ b/README.ru.md @@ -49,8 +49,8 @@ Genin уже заранее скомпилирован под разные ар Универсальный исполняемый файл: ```shell -curl -sLO https://binary.picodata.io/repository/raw/genin/bin/genin-0.4.1-x86_64-musl.tar.gz -tar -xvf genin-0.4.1-x86_64-musl.tar.gz ; sudo install genin /usr/local/bin/ +curl -sLO https://binary.picodata.io/repository/raw/genin/bin/genin-0.4.4-x86_64-musl.tar.gz +tar -xvf genin-0.4.4-x86_64-musl.tar.gz ; sudo install genin /usr/local/bin/ ``` --- #### RHEL, CentOS, Rockylinux, Fedora @@ -82,11 +82,11 @@ sudo yum install -y genin 2. Так же вы можете установить пакет `rpm` напрямую без добавления нашего репозитория. RHEL 8.x, CentOS 8.x, Rockylinux 8.x, recent Fedora version ```shell -sudo rpm -i https://binary.picodata.io/repository/yum/el/8/x86_64/os/genin-0.4.1-1.el8.x86_64.rpm +sudo rpm -i https://binary.picodata.io/repository/yum/el/8/x86_64/os/genin-0.4.4-1.el8.x86_64.rpm ``` RHEL 7.x, CentOS 7.x ```shell -sudo rpm -i https://binary.picodata.io/repository/yum/el/7/x86_64/os/genin-0.4.1-1.el7.x86_64.rpm +sudo rpm -i https://binary.picodata.io/repository/yum/el/7/x86_64/os/genin-0.4.4-1.el7.x86_64.rpm ``` > **Note:** будьте внимательны, так как при выборе не правильной версии ос могут быть ошибки > при установке `rpm` @@ -113,7 +113,7 @@ sudo apt install -y genin 2. Загрузкой и установкой пакета напрямую: ```shell -curl -sLO https://binary.picodata.io/repository/raw/genin/deb/genin-0.4.1.amd64.deb && sudo dpkg -i genin-0.4.1.amd64.deb +curl -sLO https://binary.picodata.io/repository/raw/genin/deb/genin-0.4.4.amd64.deb && sudo dpkg -i genin-0.4.4.amd64.deb ``` --- @@ -138,7 +138,7 @@ sudo apt install -y genin 2. Загрузкой и установкой пакета напрямую: ```shell -curl -sLO https://binary.picodata.io/repository/raw/genin/deb/genin-0.4.1.amd64.deb && sudo dpkg -i genin-0.4.1.amd64.deb +curl -sLO https://binary.picodata.io/repository/raw/genin/deb/genin-0.4.4.amd64.deb && sudo dpkg -i genin-0.4.4.amd64.deb ``` --- @@ -158,8 +158,8 @@ brew install genin Для установки без помощи homebrew используйте следующие команды для загрузки и установки Genin на macOS (10.10+): ```shell -curl -sLO https://binary.picodata.io/repository/raw/genin/osx/genin-0.4.1-x86_64-macosx.tar.gz -unzip genin-0.4.1-darwin-amd64.zip -d ~/bin/ +curl -sLO https://binary.picodata.io/repository/raw/genin/osx/genin-0.4.4-x86_64-macosx.tar.gz +unzip genin-0.4.4-darwin-amd64.zip -d ~/bin/ ``` --- @@ -173,8 +173,8 @@ unzip genin-0.4.1-darwin-amd64.zip -d ~/bin/ Используйте следующие команды для скачивания и установки Genin на операционных системах Windows 7 64 и новее. ```shell -curl.exe -sLO https://binary.picodata.io/repository/raw/genin/win/genin-0.4.1-win64.zip -unzip.exe genin-0.4.1-win64.zip -d %HOME%/.cargo/bin/ +curl.exe -sLO https://binary.picodata.io/repository/raw/genin/win/genin-0.4.4-win64.zip +unzip.exe genin-0.4.4-win64.zip -d %HOME%/.cargo/bin/ ``` > **Note:** Genin будет распакован в директорию `.cargo/bin` которая находится в домашнем > каталоге важего пользователя. Перед использованием приложения пожалуйста удостоверьтесь @@ -184,7 +184,7 @@ unzip.exe genin-0.4.1-win64.zip -d %HOME%/.cargo/bin/ ``` genin --version ``` -Если вы видите сообщение `genin 0.4.1` значит установка прошла успешно. +Если вы видите сообщение `genin 0.4.4` значит установка прошла успешно. --- ## Руководство по использованию @@ -253,8 +253,8 @@ topolgy: # список хостов на который будет устанавливаться кластер hosts: - - name: selectel # (обязательно) имя хоста или домена - # в данном примере оба хоста находятся в одном датацентре selectel + - name: cloud # (обязательно) имя хоста или домена + # в данном примере оба хоста находятся в одном датацентре cloud config: # (опционально) порты с которых начнется распределение, по умолчанию 8081, 3031 # для удобства, что бы не задавать порты для каждого сервера на нижний уровнях # порты можно завать на уровень выше @@ -267,7 +267,7 @@ hosts: # на уровень выше) - name: host-2 config: - address: host-1.selectel.co + address: host-1.cloud.co # параметры фейловера failover: @@ -326,7 +326,7 @@ topology: replication_factor: 2 hosts: - - name: selectel + - name: cloud config: address: 192.168.12/32 hosts: @@ -363,13 +363,13 @@ topology: roles: [cache, logger] # и сгенерит 5 репликасетов с 2 репликами в каждом репликасете hosts: - - name: selectel + - name: cloud hosts: - name: host-1 config: address: 192.168.16.11 # в этом примере адрес для каждого хоста задан по отдельности # но для удобства адресс можно было задать подсетью указав - # ее на уровень выше для selectel + # ее на уровень выше для cloud - name: host-2 config: address: 192.168.16.12 diff --git a/deploy/ansible/cluster.genin.yml b/deploy/ansible/cluster.genin.yml index 761721d..c7912da 100644 --- a/deploy/ansible/cluster.genin.yml +++ b/deploy/ansible/cluster.genin.yml @@ -21,7 +21,7 @@ instances: roles: - app.roles.engine hosts: - - name: selectel + - name: dc-1 type: datacenter ports: http: 8081 diff --git a/test/resources/test-big-cluster.genin.yaml b/test/resources/test-big-cluster.genin.yaml index 536912b..57cfc49 100644 --- a/test/resources/test-big-cluster.genin.yaml +++ b/test/resources/test-big-cluster.genin.yaml @@ -44,7 +44,7 @@ instances: roles: - metrics hosts: - - name: selectel + - name: cloud type: region ports: http: 8100 diff --git a/test/resources/test-cluster-uncomplete.genin.yaml b/test/resources/test-cluster-uncomplete.genin.yaml index 8461ce5..ccc0a03 100644 --- a/test/resources/test-cluster-uncomplete.genin.yaml +++ b/test/resources/test-cluster-uncomplete.genin.yaml @@ -17,7 +17,7 @@ instances: - api - failover-coordinator hosts: - - name: selectel + - name: cloud type: datacenter ports: http: 8081 diff --git a/test/resources/test-cluster.genin.yaml b/test/resources/test-cluster.genin.yaml index 35a8a38..cf4acbd 100644 --- a/test/resources/test-cluster.genin.yaml +++ b/test/resources/test-cluster.genin.yaml @@ -15,7 +15,7 @@ instances: - api - failover-coordinator hosts: - - name: selectel + - name: cloud type: datacenter ports: http: 8081 diff --git a/test/resources/test-giant-cluster.genin.yaml b/test/resources/test-giant-cluster.genin.yaml index 536912b..57cfc49 100644 --- a/test/resources/test-giant-cluster.genin.yaml +++ b/test/resources/test-giant-cluster.genin.yaml @@ -44,7 +44,7 @@ instances: roles: - metrics hosts: - - name: selectel + - name: cloud type: region ports: http: 8100 diff --git a/test/resources/test-selectel.genin.yaml b/test/resources/test-selectel.genin.yaml index ee6de09..c859373 100644 --- a/test/resources/test-selectel.genin.yaml +++ b/test/resources/test-selectel.genin.yaml @@ -23,7 +23,7 @@ instances: roles: - app.roles.engine hosts: - - name: selectel + - name: cloud type: datacenter ports: http: 8081