Skip to content

Commit 05ffb72

Browse files
JingChen23n063h
JingChen23
and
n063h
authored
Code change for 1.9.1 release (#813)
* Change configs of fateboard for 1.9.1 (#805) Signed-off-by: Chen Jing <jingch@vmware.com> Signed-off-by: Chen Jing <jingch@vmware.com> * update docs from 1.9.0 to 1.9.1 (#810) * update docs from 1.9.0 to 1.9.1 Signed-off-by: hang lv <xlv20@fudan.edu.cn> * fix typo Signed-off-by: hang lv <xlv20@fudan.edu.cn> * set default mysql cred Signed-off-by: hang lv <xlv20@fudan.edu.cn> * enlarge HelmChart.Name field size Signed-off-by: hang lv <xlv20@fudan.edu.cn> Signed-off-by: hang lv <xlv20@fudan.edu.cn> * fix the issue which leads to fum fail Signed-off-by: Chen Jing <jingch@vmware.com> Signed-off-by: Chen Jing <jingch@vmware.com> Signed-off-by: hang lv <xlv20@fudan.edu.cn> Co-authored-by: hang lv <xlv20@fudan.edu.cn>
1 parent e3f92e7 commit 05ffb72

38 files changed

Lines changed: 99 additions & 80 deletions

‎docker-deploy/.env‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
RegistryURI=
2-
TAG=1.9.0-release
2+
TAG=1.9.1-release
33
SERVING_TAG=2.1.6-release
44
SSH_PORT=22
55

‎docker-deploy/README.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -166,12 +166,12 @@ CONTAINER ID IMAGE COMMAND
166166
3dca43f3c9d5 federatedai/serving-admin:2.1.5-release "/bin/sh -c 'java -c…" 5 minutes ago Up 5 minutes 0.0.0.0:8350->8350/tcp, :::8350->8350/tcp serving-9999_serving-admin_1
167167
fe924918509b federatedai/serving-proxy:2.1.5-release "/bin/sh -c 'java -D…" 5 minutes ago Up 5 minutes 0.0.0.0:8059->8059/tcp, :::8059->8059/tcp, 0.0.0.0:8869->8869/tcp, :::8869->8869/tcp, 8879/tcp serving-9999_serving-proxy_1
168168
b62ed8ba42b7 bitnami/zookeeper:3.7.0 "/opt/bitnami/script…" 5 minutes ago Up 5 minutes 0.0.0.0:2181->2181/tcp, :::2181->2181/tcp, 8080/tcp, 0.0.0.0:49226->2888/tcp, :::49226->2888/tcp, 0.0.0.0:49225->3888/tcp, :::49225->3888/tcp serving-9999_serving-zookeeper_1
169-
3c643324066f federatedai/client:1.9.0-release "/bin/sh -c 'flow in…" 5 minutes ago Up 5 minutes 0.0.0.0:20000->20000/tcp, :::20000->20000/tcp confs-9999_client_1
170-
3fe0af1ebd71 federatedai/fateboard:1.9.0-release "/bin/sh -c 'java -D…" 5 minutes ago Up 5 minutes 0.0.0.0:8080->8080/tcp, :::8080->8080/tcp confs-9999_fateboard_1
171-
635b7d99357e federatedai/fateflow:1.9.0-release "container-entrypoin…" 5 minutes ago Up 5 minutes (healthy) 0.0.0.0:9360->9360/tcp, :::9360->9360/tcp, 8080/tcp, 0.0.0.0:9380->9380/tcp, :::9380->9380/tcp confs-9999_fateflow_1
172-
8b515f08add3 federatedai/eggroll:1.9.0-release "/tini -- bash -c 'j…" 5 minutes ago Up 5 minutes 8080/tcp, 0.0.0.0:9370->9370/tcp, :::9370->9370/tcp confs-9999_rollsite_1
173-
108cc061c191 federatedai/eggroll:1.9.0-release "/tini -- bash -c 'j…" 5 minutes ago Up 5 minutes 4670/tcp, 8080/tcp confs-9999_clustermanager_1
174-
f10575e76899 federatedai/eggroll:1.9.0-release "/tini -- bash -c 'j…" 5 minutes ago Up 5 minutes 4671/tcp, 8080/tcp confs-9999_nodemanager_1
169+
3c643324066f federatedai/client:1.9.1-release "/bin/sh -c 'flow in…" 5 minutes ago Up 5 minutes 0.0.0.0:20000->20000/tcp, :::20000->20000/tcp confs-9999_client_1
170+
3fe0af1ebd71 federatedai/fateboard:1.9.1-release "/bin/sh -c 'java -D…" 5 minutes ago Up 5 minutes 0.0.0.0:8080->8080/tcp, :::8080->8080/tcp confs-9999_fateboard_1
171+
635b7d99357e federatedai/fateflow:1.9.1-release "container-entrypoin…" 5 minutes ago Up 5 minutes (healthy) 0.0.0.0:9360->9360/tcp, :::9360->9360/tcp, 8080/tcp, 0.0.0.0:9380->9380/tcp, :::9380->9380/tcp confs-9999_fateflow_1
172+
8b515f08add3 federatedai/eggroll:1.9.1-release "/tini -- bash -c 'j…" 5 minutes ago Up 5 minutes 8080/tcp, 0.0.0.0:9370->9370/tcp, :::9370->9370/tcp confs-9999_rollsite_1
173+
108cc061c191 federatedai/eggroll:1.9.1-release "/tini -- bash -c 'j…" 5 minutes ago Up 5 minutes 4670/tcp, 8080/tcp confs-9999_clustermanager_1
174+
f10575e76899 federatedai/eggroll:1.9.1-release "/tini -- bash -c 'j…" 5 minutes ago Up 5 minutes 4671/tcp, 8080/tcp confs-9999_nodemanager_1
175175
aa0a0002de93 mysql:8.0.28 "docker-entrypoint.s…" 5 minutes ago Up 5 minutes 3306/tcp, 33060/tcp confs-9999_mysql_1
176176
```
177177

@@ -360,7 +360,7 @@ cat > fateflow/examples/lr/test_hetero_lr_job_dsl.json <<EOF
360360
}
361361
},
362362
"dataio_0": {
363-
"module": "DataIO",
363+
"module": "DataTransform",
364364
"input": {
365365
"data": {
366366
"data": [

‎docker-deploy/README_zh.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -185,12 +185,12 @@ CONTAINER ID IMAGE COMMAND
185185
3dca43f3c9d5 federatedai/serving-admin:2.1.5-release "/bin/sh -c 'java -c…" 5 minutes ago Up 5 minutes 0.0.0.0:8350->8350/tcp, :::8350->8350/tcp serving-9999_serving-admin_1
186186
fe924918509b federatedai/serving-proxy:2.1.5-release "/bin/sh -c 'java -D…" 5 minutes ago Up 5 minutes 0.0.0.0:8059->8059/tcp, :::8059->8059/tcp, 0.0.0.0:8869->8869/tcp, :::8869->8869/tcp, 8879/tcp serving-9999_serving-proxy_1
187187
b62ed8ba42b7 bitnami/zookeeper:3.7.0 "/opt/bitnami/script…" 5 minutes ago Up 5 minutes 0.0.0.0:2181->2181/tcp, :::2181->2181/tcp, 8080/tcp, 0.0.0.0:49226->2888/tcp, :::49226->2888/tcp, 0.0.0.0:49225->3888/tcp, :::49225->3888/tcp serving-9999_serving-zookeeper_1
188-
3c643324066f federatedai/client:1.9.0-release "/bin/sh -c 'flow in…" 5 minutes ago Up 5 minutes 0.0.0.0:20000->20000/tcp, :::20000->20000/tcp confs-9999_client_1
189-
3fe0af1ebd71 federatedai/fateboard:1.9.0-release "/bin/sh -c 'java -D…" 5 minutes ago Up 5 minutes 0.0.0.0:8080->8080/tcp, :::8080->8080/tcp confs-9999_fateboard_1
190-
635b7d99357e federatedai/fateflow:1.9.0-release "container-entrypoin…" 5 minutes ago Up 5 minutes (healthy) 0.0.0.0:9360->9360/tcp, :::9360->9360/tcp, 8080/tcp, 0.0.0.0:9380->9380/tcp, :::9380->9380/tcp confs-9999_fateflow_1
191-
8b515f08add3 federatedai/eggroll:1.9.0-release "/tini -- bash -c 'j…" 5 minutes ago Up 5 minutes 8080/tcp, 0.0.0.0:9370->9370/tcp, :::9370->9370/tcp confs-9999_rollsite_1
192-
108cc061c191 federatedai/eggroll:1.9.0-release "/tini -- bash -c 'j…" 5 minutes ago Up 5 minutes 4670/tcp, 8080/tcp confs-9999_clustermanager_1
193-
f10575e76899 federatedai/eggroll:1.9.0-release "/tini -- bash -c 'j…" 5 minutes ago Up 5 minutes 4671/tcp, 8080/tcp confs-9999_nodemanager_1
188+
3c643324066f federatedai/client:1.9.1-release "/bin/sh -c 'flow in…" 5 minutes ago Up 5 minutes 0.0.0.0:20000->20000/tcp, :::20000->20000/tcp confs-9999_client_1
189+
3fe0af1ebd71 federatedai/fateboard:1.9.1-release "/bin/sh -c 'java -D…" 5 minutes ago Up 5 minutes 0.0.0.0:8080->8080/tcp, :::8080->8080/tcp confs-9999_fateboard_1
190+
635b7d99357e federatedai/fateflow:1.9.1-release "container-entrypoin…" 5 minutes ago Up 5 minutes (healthy) 0.0.0.0:9360->9360/tcp, :::9360->9360/tcp, 8080/tcp, 0.0.0.0:9380->9380/tcp, :::9380->9380/tcp confs-9999_fateflow_1
191+
8b515f08add3 federatedai/eggroll:1.9.1-release "/tini -- bash -c 'j…" 5 minutes ago Up 5 minutes 8080/tcp, 0.0.0.0:9370->9370/tcp, :::9370->9370/tcp confs-9999_rollsite_1
192+
108cc061c191 federatedai/eggroll:1.9.1-release "/tini -- bash -c 'j…" 5 minutes ago Up 5 minutes 4670/tcp, 8080/tcp confs-9999_clustermanager_1
193+
f10575e76899 federatedai/eggroll:1.9.1-release "/tini -- bash -c 'j…" 5 minutes ago Up 5 minutes 4671/tcp, 8080/tcp confs-9999_nodemanager_1
194194
aa0a0002de93 mysql:8.0.28 "docker-entrypoint.s…" 5 minutes ago Up 5 minutes 3306/tcp, 33060/tcp confs-9999_mysql_1
195195
```
196196

@@ -382,7 +382,7 @@ cat > fateflow/examples/lr/test_hetero_lr_job_dsl.json <<EOF
382382
}
383383
},
384384
"dataio_0": {
385-
"module": "DataIO",
385+
"module": "DataTransform",
386386
"input": {
387387
"data": {
388388
"data": [

‎docker-deploy/training_template/public/fateboard/conf/application.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ fateflow.url=http://localhost:9380
55
fateflow.url-list=
66
fateflow.http_app_key=
77
fateflow.http_secret_key=
8-
spring.http.encoding.charset=UTF-8
9-
spring.http.encoding.enabled=true
8+
server.servlet.encoding.charset=UTF-8
9+
server.servlet.encoding.enabled=true
1010
server.tomcat.uri-encoding=UTF-8
1111
fateboard.front_end.cors=false
1212
fateboard.front_end.url=http://localhost:8028

‎docs/Customize_KubeFATE_Chart.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Unzip one KubeFATE's Chart, you can find a `templates` folder and 4 files:
2828
## `templates` folder
2929
In `templates` folder, the template yaml file combined with values will generate valid Kubernetes manifest files for each `FATE` or `FATE-Serving` component.
3030

31-
e.g. For `FATE` v1.9.0, there are following templates locating in `template` folder:
31+
e.g. For `FATE` v1.9.1, there are following templates locating in `template` folder:
3232
1. eggroll: eggroll module, including 3 eggroll related components: clustermanager, nodemanager and rollsite/lb-rollsite.
3333
2. spark: spark module, including spark, hdfs, nginx, pulsar/rabbitmq. People just need to pick one module from spark and eggroll.
3434
3. client: the module for the jupyter notebook client.

‎docs/Eggroll_with_TLS.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ Then in the cluster.yaml file of FATE-Exchange, turn on the ```enableTLS``` swit
146146

147147
## Docker-Compose mode
148148

149-
In KubeFATE release v1.9.0, we will not provide a switch for enabling TLS for rollsite. This can be done in below manual steps:
149+
In KubeFATE release v1.9.1, we will not provide a switch for enabling TLS for rollsite. This can be done in below manual steps:
150150

151151
1. Generate the certs, as above documents shows, for every FATE cluster and for the FATE Exchange if needed.
152152
2. Run `docker ps` to get the container id of the rollsite.

‎docs/Manage_FATE_and_FATE-Serving_Version.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,18 @@ The chart can be downloaded in each KubeFATE release, with name `fate-{release_v
3030

3131
Download it and copy it to the folder to upload.
3232
```
33-
$ kubefate chart upload -f ./fate-v1.9.0.tgz
33+
$ kubefate chart upload -f ./fate-v1.9.1.tgz
3434
Upload file success
3535
3636
$ kubefate chart ls
3737
UUID NAME VERSION APPVERSION
38-
ca3f7843-749a-4f69-9f6b-4c544a7623ac fate v1.9.0 v1.9.0
38+
ca3f7843-749a-4f69-9f6b-4c544a7623ac fate v1.9.1 v1.9.1
3939
```
4040

41-
Then, we can deploy the fate cluster of v1.9.0 version. The detail of cluster.yaml please refer to: [FATE Cluster Configuration](./configurations/FATE_cluster_configuration.md)
41+
Then, we can deploy the fate cluster of v1.9.1 version. The detail of cluster.yaml please refer to: [FATE Cluster Configuration](./configurations/FATE_cluster_configuration.md)
4242
```
4343
chartName: fate
44-
chartVersion: v1.9.0
44+
chartVersion: v1.9.1
4545
```
4646

4747
We can delete the chart with:

‎docs/tutorials/Build_Two_Parties_FATE_Cluster_in_One_Linux_Machine_with_MiniKube.md‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ After the tutorial, the deployment architecture looks like the following diagram
2121
5. Network connectivity to dockerhub or 163 Docker Image Registry, and google gcr.
2222
6. Setup the global KubeFATE version using in the tutorial and create a folder for the whole tutorial.
2323
```
24-
export fate_version=v1.9.0 && export kubefate_version=v1.4.5 && cd ~ && mkdir demo && cd demo
24+
export fate_version=v1.9.1 && export kubefate_version=v1.4.5 && cd ~ && mkdir demo && cd demo
2525
```
2626

2727
Notes:
2828
* When talking about KubeFATE version, usually there are 3 notions:
2929
* The KubeFATE CLI version, in this tutorial, it is v1.4.5.
3030
* The KubeFATE service version, in this tutorial, it is v1.4.5.
31-
* The FATE version, in this tutorial, it is v1.9.0, it also means the version of the helm chart of FATE, currently we use this version to tag the KubeFATE GitHub master branch.
31+
* The FATE version, in this tutorial, it is v1.9.1, it also means the version of the helm chart of FATE, currently we use this version to tag the KubeFATE GitHub master branch.
3232
* **<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>**
3333

3434
# Start Tutorial
@@ -87,7 +87,7 @@ When all the pods are in the ready state, it means your Kubernetes cluster is re
8787
## Setup Kubefate
8888
### Install KubeFATE CLI
8989
Go to [KubeFATE Release](https://github.com/FederatedAI/KubeFATE/releases), and find the latest kubefate-k8s release
90-
pack, which is `v1.9.0` as set to ENVs before. (replace ${fate_version} with the newest version available)
90+
pack, which is `v1.9.1` as set to ENVs before. (replace ${fate_version} with the newest version available)
9191
```
9292
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
9393
```
@@ -256,7 +256,7 @@ For `/kubefate/examples/party-9999/cluster-spark-pulsar.yaml`, modify it as foll
256256
name: fate-9999
257257
namespace: fate-9999
258258
chartName: fate
259-
chartVersion: v1.9.0
259+
chartVersion: v1.9.1
260260
partyId: 9999
261261
registry: ""
262262
pullPolicy:
@@ -340,7 +340,7 @@ and for fate-10000:
340340
name: fate-10000
341341
namespace: fate-10000
342342
chartName: fate
343-
chartVersion: v1.9.0
343+
chartVersion: v1.9.1
344344
partyId: 10000
345345
registry: ""
346346
pullPolicy:
@@ -440,8 +440,8 @@ or watch the clusters till their STATUS changing to `Running`:
440440
```
441441
kubefate@machine:~/kubefate$ watch kubefate cluster ls
442442
UUID NAME NAMESPACE REVISION STATUS CHART ChartVERSION AGE
443-
29878fa9-aeee-4ae5-a5b7-fd4e9eb7c1c3 fate-9999 fate-9999 1 Running fate v1.9.0 88s
444-
dacc0549-b9fc-463f-837a-4e7316db2537 fate-10000 fate-10000 1 Running fate v1.9.0 69s
443+
29878fa9-aeee-4ae5-a5b7-fd4e9eb7c1c3 fate-9999 fate-9999 1 Running fate v1.9.1 88s
444+
dacc0549-b9fc-463f-837a-4e7316db2537 fate-10000 fate-10000 1 Running fate v1.9.1 69s
445445
```
446446
We have about 10G Docker images that need to be pulled, this step will take a while for the first time.
447447
An alternative way is offline loading the images to the local environment.
@@ -479,13 +479,13 @@ UUID 29878fa9-aeee-4ae5-a5b7-fd4e9eb7c1c3
479479
Name fate-9999
480480
NameSpace fate-9999
481481
ChartName fate
482-
ChartVersion v1.9.0
482+
ChartVersion v1.9.1
483483
Revision 1
484484
Age 54m
485485
Status Running
486486
Spec algorithm: Basic
487487
chartName: fate
488-
chartVersion: v1.9.0
488+
chartVersion: v1.9.1
489489
computing: Spark
490490
device: CPU
491491
federation: Pulsar

‎docs/tutorials/Build_Two_Parties_FATE_Cluster_in_One_Linux_Machine_with_MiniKube_zh.md‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
5. 要保证安装机器可以正常访问Docker Hub或者网易云镜像仓库，以及Google gcr；
1818
6. 预先创建一个目录，以便整个过程使用该目录作为工作目录，命令如下：
1919
```
20-
export fate_version=v1.9.0 && export kubefate_version=v1.4.5 && cd ~ && mkdir demo && cd demo
20+
export fate_version=v1.9.1 && export kubefate_version=v1.4.5 && cd ~ && mkdir demo && cd demo
2121
```
2222

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

3030
# 开始安装
@@ -77,7 +77,7 @@ sudo minikube addons enable ingress
7777

7878
## 安装Kubefate
7979
### 下载KubeFATE命令行工具
80-
我们从Github上 [KubeFATE Release](https://github.com/FederatedAI/KubeFATE/releases)页面找到Kuberetes部署的下载包，并下载对应版本，如前面环境变量设置`v1.9.0`，
80+
我们从Github上 [KubeFATE Release](https://github.com/FederatedAI/KubeFATE/releases)页面找到Kuberetes部署的下载包，并下载对应版本，如前面环境变量设置`v1.9.1`，
8181
```
8282
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
8383
```
@@ -237,7 +237,7 @@ kubectl -n fate-10000 create secret docker-registry myregistrykey \
237237
name: fate-9999
238238
namespace: fate-9999
239239
chartName: fate
240-
chartVersion: v1.9.0
240+
chartVersion: v1.9.1
241241
partyId: 9999
242242
registry: ""
243243
pullPolicy:
@@ -322,7 +322,7 @@ pulsar:
322322
name: fate-10000
323323
namespace: fate-10000
324324
chartName: fate
325-
chartVersion: v1.9.0
325+
chartVersion: v1.9.1
326326
partyId: 10000
327327
registry: ""
328328
pullPolicy:
@@ -418,8 +418,8 @@ create job success, job id=7752db70-e368-41fa-8827-d39411728d1b
418418
```
419419
kubefate@machine:~/kubefate$ watch kubefate cluster ls
420420
UUID NAME NAMESPACE REVISION STATUS CHART ChartVERSION AGE
421-
29878fa9-aeee-4ae5-a5b7-fd4e9eb7c1c3 fate-9999 fate-9999 1 Running fate v1.9.0 88s
422-
dacc0549-b9fc-463f-837a-4e7316db2537 fate-10000 fate-10000 1 Running fate v1.9.0 69s
421+
29878fa9-aeee-4ae5-a5b7-fd4e9eb7c1c3 fate-9999 fate-9999 1 Running fate v1.9.1 88s
422+
dacc0549-b9fc-463f-837a-4e7316db2537 fate-10000 fate-10000 1 Running fate v1.9.1 69s
423423
```
424424
因为这个步骤需要到网易云镜像仓库去下载约10G的镜像，所以第一次执行视乎你的网络情况需要一定时间。
425425
检查下载的进度可以用
@@ -446,13 +446,13 @@ UUID 29878fa9-aeee-4ae5-a5b7-fd4e9eb7c1c3
446446
Name fate-9999
447447
NameSpace fate-9999
448448
ChartName fate
449-
ChartVersion v1.9.0
449+
ChartVersion v1.9.1
450450
Revision 1
451451
Age 54m
452452
Status Running
453453
Spec algorithm: Basic
454454
chartName: fate
455-
chartVersion: v1.9.0
455+
chartVersion: v1.9.1
456456
computing: Spark
457457
device: CPU
458458
federation: Pulsar

‎helm-charts/FATE-Exchange/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
apiVersion: v1
2-
appVersion: v1.9.0
2+
appVersion: v1.9.1
33
description: A Helm chart for fate exchange
44
name: fate-exchange
5-
version: v1.9.0
5+
version: v1.9.1

0 commit comments

Comments
 (0)