diff --git a/docker-build/.env b/docker-build/.env index 8fe30b1e3..340cbe75e 100644 --- a/docker-build/.env +++ b/docker-build/.env @@ -1,2 +1,2 @@ #PREFIX=federatedai -#IMG_TAG=1.8.0-release +#IMG_TAG=1.8.1-release diff --git a/docker-deploy/.env b/docker-deploy/.env index fe6e37fc2..b36d35ab0 100644 --- a/docker-deploy/.env +++ b/docker-deploy/.env @@ -1,5 +1,5 @@ RegistryURI= -TAG=1.8.0-release +TAG=1.8.1-release SERVING_TAG=2.1.5-release # PREFIX: namespace on the registry's server. diff --git a/docker-deploy/README.md b/docker-deploy/README.md index 246d0f76d..f60cc26e0 100644 --- a/docker-deploy/README.md +++ b/docker-deploy/README.md @@ -170,12 +170,12 @@ CONTAINER ID IMAGE COMMAND 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 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 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 -3c643324066f federatedai/client:1.8.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 -3fe0af1ebd71 federatedai/fateboard:1.8.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 -635b7d99357e federatedai/python:1.8.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_python_1 -8b515f08add3 federatedai/eggroll:1.8.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 -108cc061c191 federatedai/eggroll:1.8.0-release "/tini -- bash -c 'j…" 5 minutes ago Up 5 minutes 4670/tcp, 8080/tcp confs-9999_clustermanager_1 -f10575e76899 federatedai/eggroll:1.8.0-release "/tini -- bash -c 'j…" 5 minutes ago Up 5 minutes 4671/tcp, 8080/tcp confs-9999_nodemanager_1 +3c643324066f federatedai/client:1.8.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 +3fe0af1ebd71 federatedai/fateboard:1.8.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 +635b7d99357e federatedai/python:1.8.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_python_1 +8b515f08add3 federatedai/eggroll:1.8.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 +108cc061c191 federatedai/eggroll:1.8.1-release "/tini -- bash -c 'j…" 5 minutes ago Up 5 minutes 4670/tcp, 8080/tcp confs-9999_clustermanager_1 +f10575e76899 federatedai/eggroll:1.8.1-release "/tini -- bash -c 'j…" 5 minutes ago Up 5 minutes 4671/tcp, 8080/tcp confs-9999_nodemanager_1 aa0a0002de93 mysql:8.0.28 "docker-entrypoint.s…" 5 minutes ago Up 5 minutes 3306/tcp, 33060/tcp confs-9999_mysql_1 ``` diff --git a/docker-deploy/README_zh.md b/docker-deploy/README_zh.md index 5acc0085d..d9a2cf98b 100644 --- a/docker-deploy/README_zh.md +++ b/docker-deploy/README_zh.md @@ -189,12 +189,12 @@ CONTAINER ID IMAGE COMMAND 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 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 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 -3c643324066f federatedai/client:1.8.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 -3fe0af1ebd71 federatedai/fateboard:1.8.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 -635b7d99357e federatedai/python:1.8.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_python_1 -8b515f08add3 federatedai/eggroll:1.8.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 -108cc061c191 federatedai/eggroll:1.8.0-release "/tini -- bash -c 'j…" 5 minutes ago Up 5 minutes 4670/tcp, 8080/tcp confs-9999_clustermanager_1 -f10575e76899 federatedai/eggroll:1.8.0-release "/tini -- bash -c 'j…" 5 minutes ago Up 5 minutes 4671/tcp, 8080/tcp confs-9999_nodemanager_1 +3c643324066f federatedai/client:1.8.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 +3fe0af1ebd71 federatedai/fateboard:1.8.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 +635b7d99357e federatedai/python:1.8.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_python_1 +8b515f08add3 federatedai/eggroll:1.8.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 +108cc061c191 federatedai/eggroll:1.8.1-release "/tini -- bash -c 'j…" 5 minutes ago Up 5 minutes 4670/tcp, 8080/tcp confs-9999_clustermanager_1 +f10575e76899 federatedai/eggroll:1.8.1-release "/tini -- bash -c 'j…" 5 minutes ago Up 5 minutes 4671/tcp, 8080/tcp confs-9999_nodemanager_1 aa0a0002de93 mysql:8.0.28 "docker-entrypoint.s…" 5 minutes ago Up 5 minutes 3306/tcp, 33060/tcp confs-9999_mysql_1 ``` diff --git a/docker-deploy/training_template/backends/eggroll/conf/whitelist.json b/docker-deploy/training_template/backends/eggroll/conf/whitelist.json new file mode 100644 index 000000000..f0d25cd0b --- /dev/null +++ b/docker-deploy/training_template/backends/eggroll/conf/whitelist.json @@ -0,0 +1,127 @@ +{ + "builtins": [ + "int", + "list", + "set" + ], + "collections": [ + "OrderedDict", + "defaultdict" + ], + "eggroll.core.transfer_model": [ + "ErRollSiteHeader" + ], + "eggroll.roll_pair.task.storage": [ + "BSS" + ], + "federatedml.cipher_compressor.compressor": [ + "PackingCipherTensor", + "NormalCipherPackage", + "PackingCipherTensorPackage" + ], + "federatedml.ensemble.basic_algorithms.decision_tree.tree_core.feature_histogram": [ + "FeatureHistogramWeights", + "HistogramBag" + ], + "federatedml.ensemble.basic_algorithms.decision_tree.tree_core.feature_importance": [ + "FeatureImportance" + ], + "federatedml.ensemble.basic_algorithms.decision_tree.tree_core.g_h_optim": [ + "SplitInfoPackage" + ], + "federatedml.ensemble.basic_algorithms.decision_tree.tree_core.node": [ + "Node" + ], + "federatedml.ensemble.basic_algorithms.decision_tree.tree_core.splitter": [ + "SplitInfo" + ], + "federatedml.evaluation.performance_recorder": [ + "PerformanceRecorder" + ], + "federatedml.feature.binning.bin_result": [ + "BinColResults" + ], + "federatedml.feature.binning.optimal_binning.bucket_info": [ + "Bucket" + ], + "federatedml.feature.binning.quantile_summaries": [ + "QuantileSummaries", + "Stats", + "SparseQuantileSummaries" + ], + "federatedml.feature.fate_element_type": [ + "NoneType" + ], + "federatedml.feature.homo_feature_binning.homo_binning_base": [ + "SplitPointNode" + ], + "federatedml.feature.instance": [ + "Instance" + ], + "federatedml.feature.one_hot_encoder": [ + "TransferPair" + ], + "federatedml.feature.sparse_vector": [ + "SparseVector" + ], + "federatedml.framework.weights": [ + "TransferableWeights", + "DictWeights", + "NumpyWeights", + "ListWeights", + "OrderDictWeights", + "NumericWeights" + ], + "federatedml.linear_model.linear_model_weight": [ + "LinearModelWeights" + ], + "federatedml.secureprotol.fate_paillier": [ + "PaillierPublicKey", + "PaillierEncryptedNumber" + ], + "federatedml.secureprotol.fixedpoint": [ + "FixedPointNumber" + ], + "federatedml.secureprotol.number_theory.field.integers_modulo_prime_field": [ + "IntegersModuloPrimeElement" + ], + "federatedml.secureprotol.number_theory.group.twisted_edwards_curve_group": [ + "TwistedEdwardsCurveElement" + ], + "federatedml.secureprotol.symmetric_encryption.cryptor_executor": [ + "CryptoExecutor" + ], + "federatedml.secureprotol.symmetric_encryption.pohlig_hellman_encryption": [ + "PohligHellmanCipherKey", + "PohligHellmanCiphertext" + ], + "federatedml.statistic.intersect.intersect_preprocess": [ + "BitArray" + ], + "federatedml.statistic.statics": [ + "SummaryStatistics" + ], + "gmpy2": [ + "from_binary" + ], + "numpy": [ + "dtype", + "ndarray" + ], + "numpy.core.multiarray": [ + "_reconstruct", + "scalar" + ], + "numpy.core.numeric": [ + "_frombuffer" + ], + "tensorflow.python.framework.ops": [ + "convert_to_tensor" + ], + "torch._utils": [ + "_rebuild_tensor_v2" + ], + "torch.storage": [ + "_load_from_bytes" + ] +} diff --git a/docs/Manage_FATE_and_FATE-Serving_Version.md b/docs/Manage_FATE_and_FATE-Serving_Version.md index fdff26324..85955da17 100644 --- a/docs/Manage_FATE_and_FATE-Serving_Version.md +++ b/docs/Manage_FATE_and_FATE-Serving_Version.md @@ -30,18 +30,18 @@ The chart can be downloaded in each KubeFATE release, with name `fate-{release_v Download it and copy it to the folder to upload. ``` -$ kubefate chart upload -f ./fate-v1.8.0.tgz +$ kubefate chart upload -f ./fate-v1.8.1.tgz Upload file success $ kubefate chart ls UUID NAME VERSION APPVERSION -ca3f7843-749a-4f69-9f6b-4c544a7623ac fate v1.8.0 v1.8.0 +ca3f7843-749a-4f69-9f6b-4c544a7623ac fate v1.8.1 v1.8.1 ``` -Then, we can deploy the fate cluster of v1.8.0 version. The detail of cluster.yaml please refer to: [FATE Cluster Configuration](./configurations/FATE_cluster_configuration.md) +Then, we can deploy the fate cluster of v1.8.1 version. The detail of cluster.yaml please refer to: [FATE Cluster Configuration](./configurations/FATE_cluster_configuration.md) ``` chartName: fate -chartVersion: v1.8.0 +chartVersion: v1.8.1 ``` We can delete the chart with: diff --git a/docs/tutorials/Build_Two_Parties_FATE_Cluster_in_One_Linux_Machine_with_MiniKube.md b/docs/tutorials/Build_Two_Parties_FATE_Cluster_in_One_Linux_Machine_with_MiniKube.md index bd97b7984..1aa7dff84 100644 --- a/docs/tutorials/Build_Two_Parties_FATE_Cluster_in_One_Linux_Machine_with_MiniKube.md +++ b/docs/tutorials/Build_Two_Parties_FATE_Cluster_in_One_Linux_Machine_with_MiniKube.md @@ -20,9 +20,9 @@ After the tutorial, the deployment architecture looks like the following diagram [use image pull secrets](https://github.com/federatedai/KubeFATE/blob/master/docs/Use_image_pull_secrets.md). 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. We use - KubeFATE v1.8.0 in this tutorial, other versions should be similar. + KubeFATE v1.8.1 in this tutorial, other versions should be similar. ``` -export release_version=v1.8.0 && export kubefate_version=v1.4.4 && cd ~ && mkdir demo && cd demo +export release_version=v1.8.1 && export kubefate_version=v1.4.4 && cd ~ && mkdir demo && cd demo ``` **!!!Note: 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.** @@ -81,7 +81,7 @@ Till now, Kubernetes have been ready. ## 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 `v1.8.0` as set to ENVs before. (replace ${release_version} with the newest version available) +pack, which is `v1.8.1` as set to ENVs before. (replace ${release_version} with the newest version available) ``` curl -LO https://github.com/FederatedAI/KubeFATE/releases/download/${release_version}/kubefate-k8s-${release_version}.tar.gz && tar -xzf ./kubefate-k8s-${release_version}.tar.gz ``` @@ -230,10 +230,10 @@ For `/kubefate/examples/party-9999/cluster.yaml`, modify it as following: name: fate-9999 namespace: fate-9999 chartName: fate -chartVersion: v1.8.0 +chartVersion: v1.8.1 partyId: 9999 registry: "hub.c.163.com/federatedai" -imageTag: "1.8.0-release" +imageTag: "1.8.1-release" pullPolicy: imagePullSecrets: - name: myregistrykey @@ -284,10 +284,10 @@ and for fate-10000: name: fate-10000 namespace: fate-10000 chartName: fate -chartVersion: v1.8.0 +chartVersion: v1.8.1 partyId: 10000 registry: "hub.c.163.com/federatedai" -imageTag: "1.8.0-release" +imageTag: "1.8.1-release" pullPolicy: imagePullSecrets: - name: myregistrykey @@ -354,8 +354,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 -51476469-b473-4d41-b2d5-ea7241d5eac7 fate-9999 fate-9999 1 Running fate v1.8.0 88s -dacc0549-b9fc-463f-837a-4e7316db2537 fate-10000 fate-10000 1 Running fate v1.8.0 69s +51476469-b473-4d41-b2d5-ea7241d5eac7 fate-9999 fate-9999 1 Running fate v1.8.1 88s +dacc0549-b9fc-463f-837a-4e7316db2537 fate-10000 fate-10000 1 Running fate v1.8.1 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. @@ -387,16 +387,16 @@ UUID 51476469-b473-4d41-b2d5-ea7241d5eac7 Name fate-9999 NameSpace fate-9999 ChartName fate -ChartVersion v1.8.0 +ChartVersion v1.8.1 Revision 1 Age 15h Status Running Spec backend: eggroll chartName: fate - chartVersion: v1.8.0 + chartVersion: v1.8.1 imagePullSecrets: - name: myregistrykey - imageTag: 1.8.0-release + imageTag: 1.8.1-release ingress: client: annotations: diff --git a/docs/tutorials/Build_Two_Parties_FATE_Cluster_in_One_Linux_Machine_with_MiniKube_zh.md b/docs/tutorials/Build_Two_Parties_FATE_Cluster_in_One_Linux_Machine_with_MiniKube_zh.md index f47b5af3a..eba3d95f2 100644 --- a/docs/tutorials/Build_Two_Parties_FATE_Cluster_in_One_Linux_Machine_with_MiniKube_zh.md +++ b/docs/tutorials/Build_Two_Parties_FATE_Cluster_in_One_Linux_Machine_with_MiniKube_zh.md @@ -17,7 +17,7 @@ 5. 要保证安装机器可以正常访问Docker Hub或者网易云镜像仓库，以及Google gcr； 6. 预先创建一个目录，以便整个过程使用该目录作为工作目录，命令如下： ``` -export release_version=v1.8.0 && export kubefate_version=v1.4.4 && cd ~ && mkdir demo && cd demo +export release_version=v1.8.1 && export kubefate_version=v1.4.4 && cd ~ && mkdir demo && cd demo ``` **注意：下文介绍的MiniKube机器IP地址是192.168.100.123。请修改为你准备的实验机器IP地址！！！** @@ -70,7 +70,7 @@ sudo minikube addons enable ingress ## 安装Kubefate ### 下载KubeFATE命令行工具 -我们从Github上 [KubeFATE Release](https://github.com/FederatedAI/KubeFATE/releases)页面找到Kuberetes部署的下载包，并下载对应版本，如前面环境变量设置`v1.8.0`， +我们从Github上 [KubeFATE Release](https://github.com/FederatedAI/KubeFATE/releases)页面找到Kuberetes部署的下载包，并下载对应版本，如前面环境变量设置`v1.8.1`， ``` curl -LO https://github.com/FederatedAI/KubeFATE/releases/download/${release_version}/kubefate-k8s-${release_version}.tar.gz && tar -xzf ./kubefate-k8s-${release_version}.tar.gz ``` @@ -209,10 +209,10 @@ kubectl create namespace fate-10000 name: fate-9999 namespace: fate-9999 chartName: fate -chartVersion: v1.8.0 +chartVersion: v1.8.1 partyId: 9999 registry: "hub.c.163.com/federatedai" -imageTag: "1.8.0-release" +imageTag: "1.8.1-release" pullPolicy: imagePullSecrets: - name: myregistrykey @@ -264,10 +264,10 @@ servingPort: 30095 name: fate-10000 namespace: fate-10000 chartName: fate -chartVersion: v1.8.0 +chartVersion: v1.8.1 partyId: 10000 registry: "hub.c.163.com/federatedai" -imageTag: "1.8.0-release" +imageTag: "1.8.1-release" pullPolicy: imagePullSecrets: - name: myregistrykey @@ -330,8 +330,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 -51476469-b473-4d41-b2d5-ea7241d5eac7 fate-9999 fate-9999 1 Running fate v1.8.0 88s -dacc0549-b9fc-463f-837a-4e7316db2537 fate-10000 fate-10000 1 Running fate v1.8.0 69s +51476469-b473-4d41-b2d5-ea7241d5eac7 fate-9999 fate-9999 1 Running fate v1.8.1 88s +dacc0549-b9fc-463f-837a-4e7316db2537 fate-10000 fate-10000 1 Running fate v1.8.1 69s ``` 因为这个步骤需要到网易云镜像仓库去下载约10G的镜像，所以第一次执行视乎你的网络情况需要一定时间。 检查下载的进度可以用 @@ -358,16 +358,16 @@ UUID 51476469-b473-4d41-b2d5-ea7241d5eac7 Name fate-9999 NameSpace fate-9999 ChartName fate -ChartVersion v1.8.0 +ChartVersion v1.8.1 Revision 1 Age 15h Status Running Spec backend: eggroll chartName: fate - chartVersion: v1.8.0 + chartVersion: v1.8.1 imagePullSecrets: - name: myregistrykey - imageTag: 1.8.0-release + imageTag: 1.8.1-release ingress: client: annotations: diff --git a/helm-charts/FATE-Exchange/Chart.yaml b/helm-charts/FATE-Exchange/Chart.yaml index 26ce21b4e..227bf8010 100644 --- a/helm-charts/FATE-Exchange/Chart.yaml +++ b/helm-charts/FATE-Exchange/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: v1.8.0 +appVersion: v1.8.1 description: A Helm chart for fate exchange name: fate-exchange -version: v1.8.0 +version: v1.8.1 diff --git a/helm-charts/FATE-Exchange/values-template-example.yaml b/helm-charts/FATE-Exchange/values-template-example.yaml index 7e4d068c3..0535995da 100644 --- a/helm-charts/FATE-Exchange/values-template-example.yaml +++ b/helm-charts/FATE-Exchange/values-template-example.yaml @@ -1,10 +1,10 @@ name: fate-exchange namespace: fate-exchange chartName: fate-exchange -chartVersion: v1.8.0 +chartVersion: v1.8.1 partyId: 1 registry: "" -imageTag: "1.8.0-release" +imageTag: "1.8.1-release" pullPolicy: imagePullSecrets: - name: myregistrykey diff --git a/helm-charts/FATE-Exchange/values-template.yaml b/helm-charts/FATE-Exchange/values-template.yaml index e89ae3c3d..4358a1611 100644 --- a/helm-charts/FATE-Exchange/values-template.yaml +++ b/helm-charts/FATE-Exchange/values-template.yaml @@ -4,7 +4,7 @@ partyName: {{ .name }} image: registry: {{ .registry | default "federatedai" }} isThridParty: {{ empty .registry | ternary "false" "true" }} - tag: {{ .imageTag | default "1.8.0-release" }} + tag: {{ .imageTag | default "1.8.1-release" }} pullPolicy: {{ .pullPolicy | default "IfNotPresent" }} {{- with .imagePullSecrets }} imagePullSecrets: diff --git a/helm-charts/FATE-Exchange/values.yaml b/helm-charts/FATE-Exchange/values.yaml index 0ba13c2d4..dbe8f39e6 100644 --- a/helm-charts/FATE-Exchange/values.yaml +++ b/helm-charts/FATE-Exchange/values.yaml @@ -4,7 +4,7 @@ partyName: fate-exchange image: registry: federatedai isThridParty: - tag: 1.8.0-release + tag: 1.8.1-release pullPolicy: IfNotPresent imagePullSecrets: # - name: diff --git a/helm-charts/FATE/Chart.yaml b/helm-charts/FATE/Chart.yaml index 6f323acda..a11307bb6 100644 --- a/helm-charts/FATE/Chart.yaml +++ b/helm-charts/FATE/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 -appVersion: v1.8.0 +appVersion: v1.8.1 description: A Helm chart for fate-training name: fate -version: v1.8.0 +version: v1.8.1 home: https://fate.fedai.org icon: https://aisp-1251170195.cos.ap-hongkong.myqcloud.com/wp-content/uploads/sites/12/2019/09/logo.png sources: diff --git a/helm-charts/FATE/values-template-example.yaml b/helm-charts/FATE/values-template-example.yaml index 4362a48d9..db3943858 100644 --- a/helm-charts/FATE/values-template-example.yaml +++ b/helm-charts/FATE/values-template-example.yaml @@ -1,10 +1,10 @@ name: fate-9999 namespace: fate-9999 chartName: fate -chartVersion: v1.8.0 +chartVersion: v1.8.1 partyId: 9999 registry: "" -imageTag: "1.8.0-release" +imageTag: "1.8.1-release" pullPolicy: imagePullSecrets: - name: myregistrykey diff --git a/helm-charts/FATE/values-template.yaml b/helm-charts/FATE/values-template.yaml index aba25def6..af033745d 100644 --- a/helm-charts/FATE/values-template.yaml +++ b/helm-charts/FATE/values-template.yaml @@ -2,7 +2,7 @@ image: registry: {{ .registry | default "federatedai" }} isThridParty: {{ empty .registry | ternary "false" "true" }} - tag: {{ .imageTag | default "1.8.0-release" }} + tag: {{ .imageTag | default "1.8.1-release" }} pullPolicy: {{ .pullPolicy | default "IfNotPresent" }} {{- with .imagePullSecrets }} imagePullSecrets: diff --git a/helm-charts/FATE/values.yaml b/helm-charts/FATE/values.yaml index 519711c70..b26b498c7 100644 --- a/helm-charts/FATE/values.yaml +++ b/helm-charts/FATE/values.yaml @@ -2,7 +2,7 @@ image: registry: federatedai isThridParty: - tag: 1.8.0-release + tag: 1.8.1-release pullPolicy: IfNotPresent imagePullSecrets: # - name: diff --git a/k8s-deploy/README.md b/k8s-deploy/README.md index 5e95b694c..0fca31e78 100644 --- a/k8s-deploy/README.md +++ b/k8s-deploy/README.md @@ -149,16 +149,16 @@ UUID 24bb75ff-f636-4c64-8c04-1b9073f89a2f Name fate-9999 NameSpace fate-9999 ChartName fate -ChartVersion v1.8.0 +ChartVersion v1.8.1 Revision 1 Age 44h Status Running Spec backend: eggroll chartName: fate - chartVersion: v1.8.0 + chartVersion: v1.8.1 imagePullSecrets: - name: myregistrykey - imageTag: 1.8.0-release + imageTag: 1.8.1-release ingress: client: hosts: diff --git a/k8s-deploy/README_zh.md b/k8s-deploy/README_zh.md index 9ae44c30f..28e0f4d45 100644 --- a/k8s-deploy/README_zh.md +++ b/k8s-deploy/README_zh.md @@ -153,16 +153,16 @@ UUID 24bb75ff-f636-4c64-8c04-1b9073f89a2f Name fate-9999 NameSpace fate-9999 ChartName fate -ChartVersion v1.8.0 +ChartVersion v1.8.1 Revision 1 Age 44h Status Running Spec backend: eggroll chartName: fate - chartVersion: v1.8.0 + chartVersion: v1.8.1 imagePullSecrets: - name: myregistrykey - imageTag: 1.8.0-release + imageTag: 1.8.1-release ingress: client: hosts: diff --git a/k8s-deploy/cluster-spark-pulsar.yaml b/k8s-deploy/cluster-spark-pulsar.yaml index 2df64d707..b516e16f5 100644 --- a/k8s-deploy/cluster-spark-pulsar.yaml +++ b/k8s-deploy/cluster-spark-pulsar.yaml @@ -1,10 +1,10 @@ name: fate-9999 namespace: fate-9999 chartName: fate -chartVersion: v1.8.0 +chartVersion: v1.8.1 partyId: 9999 registry: "" -imageTag: "1.8.0-release" +imageTag: "1.8.1-release" pullPolicy: imagePullSecrets: - name: myregistrykey @@ -116,7 +116,7 @@ backend: spark_pulsar # spark: # master: # Image: "federatedai/spark-master" - # ImageTag: "1.6.0-release" + # ImageTag: "1.8.1-release" # replicas: 1 # resources: # requests: @@ -129,7 +129,7 @@ backend: spark_pulsar # type: ClusterIP # worker: # Image: "federatedai/spark-worker" - # ImageTag: "1.6.0-release" + # ImageTag: "1.8.1-release" # replicas: 2 # resources: # requests: diff --git a/k8s-deploy/cluster-spark-rabbitmq.yaml b/k8s-deploy/cluster-spark-rabbitmq.yaml index 9b42eac54..a1cd7eeb6 100644 --- a/k8s-deploy/cluster-spark-rabbitmq.yaml +++ b/k8s-deploy/cluster-spark-rabbitmq.yaml @@ -1,10 +1,10 @@ name: fate-9999 namespace: fate-9999 chartName: fate -chartVersion: v1.8.0 +chartVersion: v1.8.1 partyId: 9999 registry: "" -imageTag: "1.8.0-release" +imageTag: "1.8.1-release" pullPolicy: imagePullSecrets: - name: myregistrykey @@ -116,7 +116,7 @@ backend: spark_rabbitmq # spark: # master: # Image: "federatedai/spark-master" - # ImageTag: "1.6.0-release" + # ImageTag: "1.8.1-release" # replicas: 1 # resources: # requests: @@ -129,7 +129,7 @@ backend: spark_rabbitmq # type: ClusterIP # worker: # Image: "federatedai/spark-worker" - # ImageTag: "1.6.0-release" + # ImageTag: "1.8.1-release" # replicas: 2 # resources: # requests: diff --git a/k8s-deploy/cluster-spark-slim.yaml b/k8s-deploy/cluster-spark-slim.yaml index 57cd4a953..798a2f02a 100644 --- a/k8s-deploy/cluster-spark-slim.yaml +++ b/k8s-deploy/cluster-spark-slim.yaml @@ -1,10 +1,10 @@ name: fate-9999 namespace: fate-9999 chartName: fate -chartVersion: v1.8.0 +chartVersion: v1.8.1 partyId: 9999 registry: "" -imageTag: "1.8.0-release" +imageTag: "1.8.1-release" pullPolicy: imagePullSecrets: - name: myregistrykey @@ -114,7 +114,7 @@ backend: spark_local_pulsar # spark: # master: # Image: "federatedai/spark-master" - # ImageTag: "1.6.0-release" + # ImageTag: "1.8.1-release" # replicas: 1 # resources: # requests: @@ -127,7 +127,7 @@ backend: spark_local_pulsar # type: ClusterIP # worker: # Image: "federatedai/spark-worker" - # ImageTag: "1.6.0-release" + # ImageTag: "1.8.1-release" # replicas: 2 # resources: # requests: diff --git a/k8s-deploy/cluster.yaml b/k8s-deploy/cluster.yaml index f19220a52..2a872d5b3 100644 --- a/k8s-deploy/cluster.yaml +++ b/k8s-deploy/cluster.yaml @@ -1,10 +1,10 @@ name: fate-9999 namespace: fate-9999 chartName: fate -chartVersion: v1.8.0 +chartVersion: v1.8.1 partyId: 9999 registry: "" -imageTag: "1.8.0-release" +imageTag: "1.8.1-release" pullPolicy: imagePullSecrets: - name: myregistrykey diff --git a/k8s-deploy/examples/config.sh b/k8s-deploy/examples/config.sh index 6598d50c3..b140df33d 100644 --- a/k8s-deploy/examples/config.sh +++ b/k8s-deploy/examples/config.sh @@ -85,8 +85,8 @@ $SED -i "s/192.168.0.1/${party_exchange_IP}/g" ./party-10000/cluster-spark-local # exchange config -$SED -i "s/chartVersion: .*/chartVersion: ${chartVersion}/g" ./party-exchange/rollsite.yaml -$SED -i "s/chartVersion: .*/chartVersion: ${chartVersion}/g" ./party-exchange/trafficServer.yaml +$SED -i "s/chartVersion: .*/chartVersion: ${fate_chartVersion}/g" ./party-exchange/rollsite.yaml +$SED -i "s/chartVersion: .*/chartVersion: ${fate_chartVersion}/g" ./party-exchange/trafficServer.yaml $SED -i "s/imageTag: .*/imageTag: ${fate_imageTAG}/g" ./party-exchange/rollsite.yaml $SED -i "s/imageTag: .*/imageTag: ${fate_imageTAG}/g" ./party-exchange/trafficServer.yaml diff --git a/k8s-deploy/examples/party-10000/cluster-spark-local-pulsar.yaml b/k8s-deploy/examples/party-10000/cluster-spark-local-pulsar.yaml index af6aac46a..863e22fad 100644 --- a/k8s-deploy/examples/party-10000/cluster-spark-local-pulsar.yaml +++ b/k8s-deploy/examples/party-10000/cluster-spark-local-pulsar.yaml @@ -1,10 +1,10 @@ name: fate-10000 namespace: fate-10000 chartName: fate -chartVersion: v1.8.0 +chartVersion: v1.8.1 partyId: 10000 registry: "" -imageTag: 1.8.0-release +imageTag: 1.8.1-release pullPolicy: imagePullSecrets: - name: myregistrykey diff --git a/k8s-deploy/examples/party-10000/cluster-spark-pulsar.yaml b/k8s-deploy/examples/party-10000/cluster-spark-pulsar.yaml index 2c5104327..a75fd1237 100644 --- a/k8s-deploy/examples/party-10000/cluster-spark-pulsar.yaml +++ b/k8s-deploy/examples/party-10000/cluster-spark-pulsar.yaml @@ -1,10 +1,10 @@ name: fate-10000 namespace: fate-10000 chartName: fate -chartVersion: v1.8.0 +chartVersion: v1.8.1 partyId: 10000 registry: "" -imageTag: 1.8.0-release +imageTag: 1.8.1-release pullPolicy: imagePullSecrets: - name: myregistrykey diff --git a/k8s-deploy/examples/party-10000/cluster-spark-rabbitmq.yaml b/k8s-deploy/examples/party-10000/cluster-spark-rabbitmq.yaml index 59db94247..6746cad5d 100644 --- a/k8s-deploy/examples/party-10000/cluster-spark-rabbitmq.yaml +++ b/k8s-deploy/examples/party-10000/cluster-spark-rabbitmq.yaml @@ -1,10 +1,10 @@ name: fate-10000 namespace: fate-10000 chartName: fate -chartVersion: v1.8.0 +chartVersion: v1.8.1 partyId: 10000 registry: "" -imageTag: 1.8.0-release +imageTag: 1.8.1-release pullPolicy: imagePullSecrets: - name: myregistrykey diff --git a/k8s-deploy/examples/party-10000/cluster.yaml b/k8s-deploy/examples/party-10000/cluster.yaml index 29d14a795..bf6a1c9a6 100644 --- a/k8s-deploy/examples/party-10000/cluster.yaml +++ b/k8s-deploy/examples/party-10000/cluster.yaml @@ -1,10 +1,10 @@ name: fate-10000 namespace: fate-10000 chartName: fate -chartVersion: v1.8.0 +chartVersion: v1.8.1 partyId: 10000 registry: "" -imageTag: 1.8.0-release +imageTag: 1.8.1-release pullPolicy: imagePullSecrets: - name: myregistrykey diff --git a/k8s-deploy/examples/party-9999/cluster-spark-local-pulsar.yaml b/k8s-deploy/examples/party-9999/cluster-spark-local-pulsar.yaml index 3f03d6584..936bc9a67 100644 --- a/k8s-deploy/examples/party-9999/cluster-spark-local-pulsar.yaml +++ b/k8s-deploy/examples/party-9999/cluster-spark-local-pulsar.yaml @@ -1,10 +1,10 @@ name: fate-9999 namespace: fate-9999 chartName: fate -chartVersion: v1.8.0 +chartVersion: v1.8.1 partyId: 9999 registry: "" -imageTag: 1.8.0-release +imageTag: 1.8.1-release pullPolicy: imagePullSecrets: - name: myregistrykey diff --git a/k8s-deploy/examples/party-9999/cluster-spark-pulsar.yaml b/k8s-deploy/examples/party-9999/cluster-spark-pulsar.yaml index 71c3c7cb5..b614e5ca1 100644 --- a/k8s-deploy/examples/party-9999/cluster-spark-pulsar.yaml +++ b/k8s-deploy/examples/party-9999/cluster-spark-pulsar.yaml @@ -1,10 +1,10 @@ name: fate-9999 namespace: fate-9999 chartName: fate -chartVersion: v1.8.0 +chartVersion: v1.8.1 partyId: 9999 registry: "" -imageTag: 1.8.0-release +imageTag: 1.8.1-release pullPolicy: imagePullSecrets: - name: myregistrykey diff --git a/k8s-deploy/examples/party-9999/cluster-spark-rabbitmq.yaml b/k8s-deploy/examples/party-9999/cluster-spark-rabbitmq.yaml index a08f4f1a9..bd6ee98e5 100644 --- a/k8s-deploy/examples/party-9999/cluster-spark-rabbitmq.yaml +++ b/k8s-deploy/examples/party-9999/cluster-spark-rabbitmq.yaml @@ -1,10 +1,10 @@ name: fate-9999 namespace: fate-9999 chartName: fate -chartVersion: v1.8.0 +chartVersion: v1.8.1 partyId: 9999 registry: "" -imageTag: 1.8.0-release +imageTag: 1.8.1-release pullPolicy: imagePullSecrets: - name: myregistrykey diff --git a/k8s-deploy/examples/party-9999/cluster.yaml b/k8s-deploy/examples/party-9999/cluster.yaml index 3ba8312f1..cfb1d14cd 100644 --- a/k8s-deploy/examples/party-9999/cluster.yaml +++ b/k8s-deploy/examples/party-9999/cluster.yaml @@ -1,10 +1,10 @@ name: fate-9999 namespace: fate-9999 chartName: fate -chartVersion: v1.8.0 +chartVersion: v1.8.1 partyId: 9999 registry: "" -imageTag: 1.8.0-release +imageTag: 1.8.1-release pullPolicy: imagePullSecrets: - name: myregistrykey diff --git a/k8s-deploy/examples/party-exchange/rollsite.yaml b/k8s-deploy/examples/party-exchange/rollsite.yaml index 0c045ac32..cf8817e11 100644 --- a/k8s-deploy/examples/party-exchange/rollsite.yaml +++ b/k8s-deploy/examples/party-exchange/rollsite.yaml @@ -1,10 +1,10 @@ name: fate-exchange namespace: fate-exchange chartName: fate-exchange -chartVersion: +chartVersion: v1.8.1 partyId: 1 registry: "" -imageTag: 1.8.0-release +imageTag: 1.8.1-release pullPolicy: imagePullSecrets: - name: myregistrykey diff --git a/k8s-deploy/examples/party-exchange/trafficServer.yaml b/k8s-deploy/examples/party-exchange/trafficServer.yaml index 136f5ec66..3c336abae 100644 --- a/k8s-deploy/examples/party-exchange/trafficServer.yaml +++ b/k8s-deploy/examples/party-exchange/trafficServer.yaml @@ -1,10 +1,10 @@ name: fate-exchange namespace: fate-exchange chartName: fate-exchange -chartVersion: +chartVersion: v1.8.1 partyId: 1 registry: "" -imageTag: 1.8.0-release +imageTag: 1.8.1-release pullPolicy: imagePullSecrets: - name: myregistrykey diff --git a/k8s-deploy/examples/party.config b/k8s-deploy/examples/party.config index 6de091521..e6b18d345 100644 --- a/k8s-deploy/examples/party.config +++ b/k8s-deploy/examples/party.config @@ -1,5 +1,5 @@ -fate_chartVersion=v1.8.0 -fate_imageTAG=1.8.0-release +fate_chartVersion=v1.8.1 +fate_imageTAG=1.8.1-release fate_serving_chartVersion=v2.1.5 fate_serving_imageTAG=2.1.5-release party_9999_IP=192.168.9.1