Skip to content

Commit

Permalink
update version tag
Browse files Browse the repository at this point in the history 
Signed-off-by: Chenlong Ma <[email protected]>
  • Loading branch information
@owlet42
owlet42 committed Jan 23, 2024
1 parent c224c82 commit 205bb76
Show file tree
Hide file tree
Showing 20 changed files with 72 additions and 72 deletions.
12 changes: 6 additions & 6 deletions docker-deploy/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,13 +192,13 @@ The output is shown as follows. If the status of each component is `Up`, and the

```bash
NAME IMAGE COMMAND SERVICE CREATED STATUS PORTS
confs-10000-client-1 federatedai/client:v2.0.0-beta "bash -c 'pipeline i…" client About a minute ago Up About a minute 0.0.0.0:20000->20000/tcp, :::20000->20000/tcp
confs-10000-clustermanager-1 federatedai/eggroll:v2.0.0-beta "/tini -- bash -c 'j…" clustermanager About a minute ago Up About a minute 4670/tcp
confs-10000-fateboard-1 federatedai/fateboard:v2.0.0-beta "/bin/sh -c 'java -D…" fateboard About a minute ago Up About a minute 0.0.0.0:8080->8080/tcp, :::8080->8080/tcp
confs-10000-fateflow-1 federatedai/fateflow:v2.0.0-beta "/bin/bash -c 'set -…" fateflow About a minute ago Up About a minute (healthy) 0.0.0.0:9360->9360/tcp, :::9360->9360/tcp, 0.0.0.0:9380->9380/tcp, :::9380->9380/tcp
confs-10000-client-1 federatedai/client:2.0.0-release "bash -c 'pipeline i…" client About a minute ago Up About a minute 0.0.0.0:20000->20000/tcp, :::20000->20000/tcp
confs-10000-clustermanager-1 federatedai/eggroll:2.0.0-release "/tini -- bash -c 'j…" clustermanager About a minute ago Up About a minute 4670/tcp
confs-10000-fateboard-1 federatedai/fateboard:2.0.0-release "/bin/sh -c 'java -D…" fateboard About a minute ago Up About a minute 0.0.0.0:8080->8080/tcp, :::8080->8080/tcp
confs-10000-fateflow-1 federatedai/fateflow:2.0.0-release "/bin/bash -c 'set -…" fateflow About a minute ago Up About a minute (healthy) 0.0.0.0:9360->9360/tcp, :::9360->9360/tcp, 0.0.0.0:9380->9380/tcp, :::9380->9380/tcp
confs-10000-mysql-1 mysql:8.0.28 "docker-entrypoint.s…" mysql About a minute ago Up About a minute 3306/tcp, 33060/tcp
confs-10000-nodemanager-1 federatedai/eggroll:v2.0.0-beta "/tini -- bash -c 'j…" nodemanager About a minute ago Up About a minute 4671/tcp
confs-10000-rollsite-1 federatedai/eggroll:v2.0.0-beta "/tini -- bash -c 'j…" rollsite About a minute ago Up About a minute 0.0.0.0:9370->9370/tcp, :::9370->9370/tcp
confs-10000-nodemanager-1 federatedai/eggroll:2.0.0-release "/tini -- bash -c 'j…" nodemanager About a minute ago Up About a minute 4671/tcp
confs-10000-osx-1 federatedai/osx:2.0.0-release "/tini -- bash -c 'j…" osx About a minute ago Up About a minute 0.0.0.0:9370->9370/tcp, :::9370->9370/tcp
```

### Verifying the deployment
Expand Down
12 changes: 6 additions & 6 deletions docker-deploy/README_zh.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,13 +231,13 @@ docker compose ps

```bash
NAME IMAGE COMMAND SERVICE CREATED STATUS PORTS
confs-10000-client-1 federatedai/client:v2.0.0-beta "bash -c 'pipeline i…" client About a minute ago Up About a minute 0.0.0.0:20000->20000/tcp, :::20000->20000/tcp
confs-10000-clustermanager-1 federatedai/eggroll:v2.0.0-beta "/tini -- bash -c 'j…" clustermanager About a minute ago Up About a minute 4670/tcp
confs-10000-fateboard-1 federatedai/fateboard:v2.0.0-beta "/bin/sh -c 'java -D…" fateboard About a minute ago Up About a minute 0.0.0.0:8080->8080/tcp, :::8080->8080/tcp
confs-10000-fateflow-1 federatedai/fateflow:v2.0.0-beta "/bin/bash -c 'set -…" fateflow About a minute ago Up About a minute (healthy) 0.0.0.0:9360->9360/tcp, :::9360->9360/tcp, 0.0.0.0:9380->9380/tcp, :::9380->9380/tcp
confs-10000-client-1 federatedai/client:2.0.0-release "bash -c 'pipeline i…" client About a minute ago Up About a minute 0.0.0.0:20000->20000/tcp, :::20000->20000/tcp
confs-10000-clustermanager-1 federatedai/eggroll:2.0.0-release "/tini -- bash -c 'j…" clustermanager About a minute ago Up About a minute 4670/tcp
confs-10000-fateboard-1 federatedai/fateboard:2.0.0-release "/bin/sh -c 'java -D…" fateboard About a minute ago Up About a minute 0.0.0.0:8080->8080/tcp, :::8080->8080/tcp
confs-10000-fateflow-1 federatedai/fateflow:2.0.0-release "/bin/bash -c 'set -…" fateflow About a minute ago Up About a minute (healthy) 0.0.0.0:9360->9360/tcp, :::9360->9360/tcp, 0.0.0.0:9380->9380/tcp, :::9380->9380/tcp
confs-10000-mysql-1 mysql:8.0.28 "docker-entrypoint.s…" mysql About a minute ago Up About a minute 3306/tcp, 33060/tcp
confs-10000-nodemanager-1 federatedai/eggroll:v2.0.0-beta "/tini -- bash -c 'j…" nodemanager About a minute ago Up About a minute 4671/tcp
confs-10000-rollsite-1 federatedai/eggroll:v2.0.0-beta "/tini -- bash -c 'j…" rollsite About a minute ago Up About a minute 0.0.0.0:9370->9370/tcp, :::9370->9370/tcp
confs-10000-nodemanager-1 federatedai/eggroll:2.0.0-release "/tini -- bash -c 'j…" nodemanager About a minute ago Up About a minute 4671/tcp
confs-10000-osx-1 federatedai/osx:2.0.0-release "/tini -- bash -c 'j…" osx About a minute ago Up About a minute 0.0.0.0:9370->9370/tcp, :::9370->9370/tcp
```

### 验证部署
Expand Down
18 changes: 9 additions & 9 deletions .../tutorials/Build_Two_Parties_FATE_Cluster_in_One_Linux_Machine_with_MiniKube.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ After the tutorial, the deployment architecture looks like the following diagram
5. Network connectivity to dockerhub or 163 Docker Image Registry, and google gcr.
6. Setup the global KubeFATE version using in the tutorial and create a folder for the whole tutorial.
```
export fate_version=v2.0.0-beta && export kubefate_version=v1.4.5 && cd ~ && mkdir demo && cd demo
export fate_version=v2.0.0 && export kubefate_version=v1.4.5 && cd ~ && mkdir demo && cd demo
```

Notes:
* When talking about KubeFATE version, usually there are 3 notions:
* The KubeFATE CLI version, in this tutorial, it is v1.4.5.
* The KubeFATE service version, in this tutorial, it is v1.4.5.
* The FATE version, in this tutorial, it is v2.0.0-beta, it also means the version of the helm chart of FATE, currently we use this version to tag the KubeFATE GitHub master branch.
* The FATE version, in this tutorial, it is v2.0.0, it also means the version of the helm chart of FATE, currently we use this version to tag the KubeFATE GitHub master branch.
* **<font color="red">In this tutorial, the IP of the machine we used is 192.168.100.123. Please change it to your machine's IP in all the following commands and config files.</font></div>**

# Start Tutorial
Expand Down Expand Up @@ -87,7 +87,7 @@ When all the pods are in the ready state, it means your Kubernetes cluster is re
## Setup Kubefate
### Install KubeFATE CLI
Go to [KubeFATE Release](https://github.com/FederatedAI/KubeFATE/releases), and find the latest kubefate-k8s release
pack, which is `v2.0.0-beta` as set to ENVs before. (replace ${fate_version} with the newest version available)
pack, which is `v2.0.0` as set to ENVs before. (replace ${fate_version} with the newest version available)
```
curl -LO https://github.com/FederatedAI/KubeFATE/releases/download/${fate_version}/kubefate-k8s-${fate_version}.tar.gz && tar -xzf ./kubefate-k8s-${fate_version}.tar.gz
```
Expand Down Expand Up @@ -256,7 +256,7 @@ For `/kubefate/examples/party-9999/cluster-spark-pulsar.yaml`, modify it as foll
name: fate-9999
namespace: fate-9999
chartName: fate
chartVersion: v2.0.0-beta
chartVersion: v2.0.0
partyId: 9999
registry: ""
pullPolicy:
Expand Down Expand Up @@ -340,7 +340,7 @@ and for fate-10000:
name: fate-10000
namespace: fate-10000
chartName: fate
chartVersion: v2.0.0-beta
chartVersion: v2.0.0
partyId: 10000
registry: ""
pullPolicy:
Expand Down Expand Up @@ -440,8 +440,8 @@ or watch the clusters till their STATUS changing to `Running`:
```
kubefate@machine:~/kubefate$ watch kubefate cluster ls
UUID NAME NAMESPACE REVISION STATUS CHART ChartVERSION AGE
29878fa9-aeee-4ae5-a5b7-fd4e9eb7c1c3 fate-9999 fate-9999 1 Running fate v2.0.0-beta 88s
dacc0549-b9fc-463f-837a-4e7316db2537 fate-10000 fate-10000 1 Running fate v2.0.0-beta 69s
29878fa9-aeee-4ae5-a5b7-fd4e9eb7c1c3 fate-9999 fate-9999 1 Running fate v2.0.0 88s
dacc0549-b9fc-463f-837a-4e7316db2537 fate-10000 fate-10000 1 Running fate v2.0.0 69s
```
We have about 10G Docker images that need to be pulled, this step will take a while for the first time.
An alternative way is offline loading the images to the local environment.
Expand Down Expand Up @@ -479,13 +479,13 @@ UUID 29878fa9-aeee-4ae5-a5b7-fd4e9eb7c1c3
Name fate-9999
NameSpace fate-9999
ChartName fate
ChartVersion v2.0.0-beta
ChartVersion v2.0.0
Revision 1
Age 54m
Status Running
Spec algorithm: Basic
chartName: fate
chartVersion: v2.0.0-beta
chartVersion: v2.0.0
computing: Spark
device: CPU
federation: Pulsar
Expand Down
20 changes: 10 additions & 10 deletions ...torials/Build_Two_Parties_FATE_Cluster_in_One_Linux_Machine_with_MiniKube_zh.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
5. 要保证安装机器可以正常访问Docker Hub或者网易云镜像仓库，以及Google gcr；
6. 预先创建一个目录，以便整个过程使用该目录作为工作目录，命令如下：
```
export fate_version=v2.0.0-beta && export kubefate_version=v1.4.5 && cd ~ && mkdir demo && cd demo
export fate_version=v2.0.0 && export kubefate_version=v1.4.5 && cd ~ && mkdir demo && cd demo
```

Notes:
* 当我们提到"KubeFATE的版本"，通常来讲会有三个概念：
* KubeFATE命令行工具的版本，在本教程中为v1.4.5。
* KubeFATE服务版本，在本教程中为v1.4.5。
* FATE版本，在本教程中v2.0.0-beta，它也意味着FATE的Helm Chart的版本, 值得注意的是我们用这个版本来给GitHub上的KubeFATE的发布打tag。
* FATE版本，在本教程中v2.0.0，它也意味着FATE的Helm Chart的版本, 值得注意的是我们用这个版本来给GitHub上的KubeFATE的发布打tag。
* **<font color="red">下文介绍的MiniKube机器IP地址是192.168.100.123。请修改为你准备的实验机器IP地址</font></div>**

# 开始安装
Expand Down Expand Up @@ -77,7 +77,7 @@ sudo minikube addons enable ingress

## 安装Kubefate
### 下载KubeFATE命令行工具
我们从Github上 [KubeFATE Release](https://github.com/FederatedAI/KubeFATE/releases)页面找到Kuberetes部署的下载包，并下载对应版本，如前面环境变量设置`v2.0.0-beta`，
我们从Github上 [KubeFATE Release](https://github.com/FederatedAI/KubeFATE/releases)页面找到Kuberetes部署的下载包，并下载对应版本，如前面环境变量设置`v2.0.0`，
```
curl -LO https://github.com/FederatedAI/KubeFATE/releases/download/${fate_version}/kubefate-k8s-${fate_version}.tar.gz && tar -xzf ./kubefate-k8s-${fate_version}.tar.gz
```
Expand Down Expand Up @@ -237,7 +237,7 @@ kubectl -n fate-10000 create secret docker-registry myregistrykey \
name: fate-9999
namespace: fate-9999
chartName: fate
chartVersion: v2.0.0-beta
chartVersion: v2.0.0
partyId: 9999
registry: ""
pullPolicy:
Expand Down Expand Up @@ -322,7 +322,7 @@ pulsar:
name: fate-10000
namespace: fate-10000
chartName: fate
chartVersion: v2.0.0-beta
chartVersion: v2.0.0
partyId: 10000
registry: ""
pullPolicy:
Expand Down Expand Up @@ -418,8 +418,8 @@ create job success, job id=7752db70-e368-41fa-8827-d39411728d1b
```
kubefate@machine:~/kubefate$ watch kubefate cluster ls
UUID NAME NAMESPACE REVISION STATUS CHART ChartVERSION AGE
29878fa9-aeee-4ae5-a5b7-fd4e9eb7c1c3 fate-9999 fate-9999 1 Running fate v2.0.0-beta 88s
dacc0549-b9fc-463f-837a-4e7316db2537 fate-10000 fate-10000 1 Running fate v2.0.0-beta 69s
29878fa9-aeee-4ae5-a5b7-fd4e9eb7c1c3 fate-9999 fate-9999 1 Running fate v2.0.0 88s
dacc0549-b9fc-463f-837a-4e7316db2537 fate-10000 fate-10000 1 Running fate v2.0.0 69s
```
因为这个步骤需要到网易云镜像仓库去下载约10G的镜像，所以第一次执行视乎你的网络情况需要一定时间。
检查下载的进度可以用
Expand All @@ -435,7 +435,7 @@ mysql-c77b7b94b-zblt5 1/1 Running 0 12m
nodemanager-0-5599db57f4-2khcg 2/2 Running 0 12m
nodemanager-1-7c986f9454-qcscd 2/2 Running 0 12m
python-57b66d96bd-vj8kq 3/3 Running 0 12m
rollsite-7846898d6d-j2gb9 1/1 Running 0 12m
osx-7846898d6d-j2gb9 1/1 Running 0 12m
```

### 验证FATE的部署
Expand All @@ -446,13 +446,13 @@ UUID 29878fa9-aeee-4ae5-a5b7-fd4e9eb7c1c3
Name fate-9999
NameSpace fate-9999
ChartName fate
ChartVersion v2.0.0-beta
ChartVersion v2.0.0
Revision 1
Age 54m
Status Running
Spec algorithm: Basic
chartName: fate
chartVersion: v2.0.0-beta
chartVersion: v2.0.0
computing: Spark
device: CPU
federation: Pulsar
Expand Down
14 changes: 7 additions & 7 deletions k8s-deploy/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ Deploying FATE with KubeFATE can support many different engine combinations. For

We support such definition for:

1. Eggroll components: cluster manager, node manager and rollsite.
1. Eggroll components: cluster manager, node manager and osx.
2. Spark components: master and worker.
3. Rabbitmq.
4. Pulsar.
Expand Down Expand Up @@ -172,7 +172,7 @@ SubJobs nodemanager-0 ModuleStatus: Available, SubJobStatus: Success, D
2022-04-12 07:34:09, EndTime: 2022-04-12 07:47:18
python ModuleStatus: Available, SubJobStatus: Success, Duration: 14m, StartTime:
2022-04-12 07:34:09, EndTime: 2022-04-12 07:48:14
rollsite ModuleStatus: Available, SubJobStatus: Success, Duration: 13m, StartTime:
osx ModuleStatus: Available, SubJobStatus: Success, Duration: 13m, StartTime:
2022-04-12 07:34:09, EndTime: 2022-04-12 07:47:24
client ModuleStatus: Available, SubJobStatus: Success, Duration: 11m, StartTime:
2022-04-12 07:34:09, EndTime: 2022-04-12 07:45:22
Expand All @@ -192,13 +192,13 @@ UUID 24bb75ff-f636-4c64-8c04-1b9073f89a2f
Name fate-9999
NameSpace fate-9999
ChartName fate
ChartVersion v2.0.0-beta
ChartVersion v2.0.0
Revision 1
Age 15m
Status Running
Spec algorithm: Basic
chartName: fate
chartVersion: v2.0.0-beta
chartVersion: v2.0.0
computing: Eggroll
device: CPU
federation: Eggroll
Expand All @@ -208,7 +208,7 @@ Spec algorithm: Basic
istio:
enabled: false
modules:
- rollsite
- osx
- clustermanager
- nodemanager
- mysql
Expand Down Expand Up @@ -238,10 +238,10 @@ Info dashboard:
mysql: Running
nodemanager: Running
nodemanager-eggrollpair: Running
rollsite: Running
osx: Running
deployments:
clustermanager: Available
rollsite: Available
osx: Available
```

### Access the UI of FATEBoard and Notebook
Expand Down
14 changes: 7 additions & 7 deletions k8s-deploy/README_zh.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ create job success, job id=d92d7a56-7002-46a4-9363-da9c7346e05a

我们支持定义如下部件的资源需求:

1. Eggroll部件：包括cluster manager，node manager和rollsite。
1. Eggroll部件：包括cluster manager，node manager和osx。
2. Spark components：包括master和worker。
3. Rabbitmq。
4. Pulsar。
Expand Down Expand Up @@ -171,7 +171,7 @@ SubJobs nodemanager-0 ModuleStatus: Available, SubJobStatus: Success, D
2022-04-12 07:34:09, EndTime: 2022-04-12 07:47:18
python ModuleStatus: Available, SubJobStatus: Success, Duration: 14m, StartTime:
2022-04-12 07:34:09, EndTime: 2022-04-12 07:48:14
rollsite ModuleStatus: Available, SubJobStatus: Success, Duration: 13m, StartTime:
osx ModuleStatus: Available, SubJobStatus: Success, Duration: 13m, StartTime:
2022-04-12 07:34:09, EndTime: 2022-04-12 07:47:24
client ModuleStatus: Available, SubJobStatus: Success, Duration: 11m, StartTime:
2022-04-12 07:34:09, EndTime: 2022-04-12 07:45:22
Expand All @@ -191,13 +191,13 @@ UUID 24bb75ff-f636-4c64-8c04-1b9073f89a2f
Name fate-9999
NameSpace fate-9999
ChartName fate
ChartVersion v2.0.0-beta
ChartVersion v2.0.0
Revision 1
Age 15m
Status Running
Spec algorithm: Basic
chartName: fate
chartVersion: v2.0.0-beta
chartVersion: v2.0.0
computing: Eggroll
device: CPU
federation: Eggroll
Expand All @@ -207,7 +207,7 @@ Spec algorithm: Basic
istio:
enabled: false
modules:
- rollsite
- osx
- clustermanager
- nodemanager
- mysql
Expand Down Expand Up @@ -237,10 +237,10 @@ Info dashboard:
mysql: Running
nodemanager: Running
nodemanager-eggrollpair: Running
rollsite: Running
osx: Running
deployments:
clustermanager: Available
rollsite: Available
osx: Available
```

### 访问 FATEBoard 和 Notebook UI
Expand Down
Loading

0 comments on commit 205bb76

Please sign in to comment.