Feat: KubeFATE support FATE_Serving v2.1.6 (#722)

* Feat: KubeFATE support FATE-Serving v2.1.6 Signed-off-by: Chenlong Ma <chenlongm@vmware.com> * Fix: Serving api return "serviceId is not bind model" after pod restarted Signed-off-by: Chenlong Ma <chenlongm@vmware.com> * fix volumes path Signed-off-by: Chenlong Ma <chenlongm@vmware.com> * fix: zookeeper cannot create directory '/bitnami/zookeeper/data': Permission denied Signed-off-by: Chenlong Ma <chenlongm@vmware.com> Signed-off-by: Chenlong Ma <chenlongm@vmware.com>
FederatedAI · Aug 18, 2022 · b6600e6 · b6600e6
1 parent e55bac0
commit b6600e6
Show file tree

Hide file tree

Showing 11 changed files with 41 additions and 15 deletions.
diff --git a/docker-deploy/.env b/docker-deploy/.env
@@ -1,6 +1,6 @@
 RegistryURI=
 TAG=1.8.0-release
-SERVING_TAG=2.1.5-release
+SERVING_TAG=2.1.6-release
 SSH_PORT=22
 
 # PREFIX: namespace on the registry's server.

diff --git a/docker-deploy/generate_config.sh b/docker-deploy/generate_config.sh
@@ -554,6 +554,12 @@ EOF
 		cp -r serving_template/docker-serving/* serving-$party_id/confs/
 
 		cp serving_template/docker-compose-serving.yml serving-$party_id/docker-compose.yml
+
+
+		mkdir -p serving-$party_id/data
+		sed -i "s|<path-to-host-dir>|serving-$party_id|g" ./serving-$party_id/docker-compose.yml
+
+
 		if [ "$RegistryURI" != "" ]; then
 			sed -i 's#federatedai#${RegistryURI}/federatedai#g' ./serving-$party_id/docker-compose.yml
 		fi

diff --git a/docker-deploy/serving_template/docker-compose-serving.yml b/docker-deploy/serving_template/docker-compose-serving.yml
@@ -17,14 +17,29 @@ networks:
   fate-serving-network:
     external:
       name: <fate-network>
+
+volumes:
+  data_dir_server:
+    driver: local
+    driver_opts:
+      type: none
+      o: bind
+      device: <path-to-host-dir>/data/server
+  data_dir_zookeeper:
+    driver: local
+    driver_opts:
+      type: none
+      o: bind
+      device: <path-to-host-dir>/data/zookeeper
+
 services:
   serving-server:
     image: "federatedai/serving-server:${SERVING_TAG}"
     ports:
       - "8000:8000"
     volumes:
       - ./confs/serving-server/conf/serving-server.properties:/data/projects/fate-serving/serving-server/conf/serving-server.properties
-      - ./confs/serving-server/cache:/root/.fate
+      - ./data/server:/data/projects/fate-serving/serving-server/.fate
       - /etc/localtime:/etc/localtime:ro
     networks:
       - fate-serving-network
@@ -45,11 +60,13 @@ services:
 
   serving-zookeeper:
     image: "bitnami/zookeeper:3.7.0"
+    user: root
     ports:
       - "2181:2181"
       - "2888"
       - "3888"
     volumes:
+      - ./data/zookeeper:/bitnami/zookeeper
       - /etc/localtime:/etc/localtime:ro
     environment:
       ALLOW_ANONYMOUS_LOGIN: "yes"

diff --git a/helm-charts/FATE-Serving/Chart.yaml b/helm-charts/FATE-Serving/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
-appVersion: v2.1.5
+appVersion: v2.1.6
 description: A Helm chart for FATE-Serving
 name: fate-serving
-version: v2.1.5
+version: v2.1.6
 sources:
   - https://github.com/FederatedAI/KubeFATE
   - https://github.com/FederatedAI/FATE-Serving
diff --git a/helm-charts/FATE-Serving/templates/serving-server-module.yaml b/helm-charts/FATE-Serving/templates/serving-server-module.yaml
@@ -108,7 +108,10 @@ spec:
               subPath: serving-server.properties
             - name: data
               mountPath: /root/.fate
-              subPath: {{ .Values.servingServer.subPath }}
+              subPath: cache
+            - name: data
+              mountPath: /data/projects/fate-serving/serving-server/.fate
+              subPath: model_cache
       {{- with .Values.servingServer.nodeSelector }}
       nodeSelector:
 {{ toYaml . | indent 8 }}

diff --git a/helm-charts/FATE-Serving/values-template-example.yaml b/helm-charts/FATE-Serving/values-template-example.yaml
@@ -1,10 +1,10 @@
 name: fate-serving-10000
 namespace: fate-serving-10000
 chartName: fate-serving
-chartVersion: v2.1.5
+chartVersion: v2.1.6
 partyId: 10000
 registry: ""
-imageTag: "2.1.5-release"
+imageTag: "2.1.6-release"
 pullPolicy: 
 imagePullSecrets: 
 - name: myregistrykey

diff --git a/helm-charts/FATE-Serving/values-template.yaml b/helm-charts/FATE-Serving/values-template.yaml
@@ -6,7 +6,7 @@ partyName: {{ .name }}
 image:
   registry: {{ .registry | default "federatedai" }}
   isThridParty: {{ empty .registry | ternary  "false" "true" }}
-  tag: {{ .imageTag | default "2.1.5-release" }}
+  tag: {{ .imageTag | default "2.1.6-release" }}
   pullPolicy: {{ .pullPolicy | default "IfNotPresent" }}
   {{- with .imagePullSecrets }}
   imagePullSecrets:

diff --git a/helm-charts/FATE-Serving/values.yaml b/helm-charts/FATE-Serving/values.yaml
@@ -5,7 +5,7 @@ partyName: fate-serving-9999
 image:
   registry: federatedai
   isThridParty:
-  tag: 2.1.5-release
+  tag: 2.1.6-release
   pullPolicy: IfNotPresent
   imagePullSecrets: 
 #  - name: 

diff --git a/k8s-deploy/cluster-serving.yaml b/k8s-deploy/cluster-serving.yaml
@@ -1,10 +1,10 @@
 name: fate-serving-9999
 namespace: fate-serving-9999
 chartName: fate-serving
-chartVersion: v2.1.5
+chartVersion: v2.1.6
 partyId: 9999
 registry: ""
-imageTag: "2.1.5-release"
+imageTag: "2.1.6-release"
 pullPolicy: 
 imagePullSecrets: 
 - name: myregistrykey

diff --git a/k8s-deploy/examples/party-10000/cluster-serving.yaml b/k8s-deploy/examples/party-10000/cluster-serving.yaml
@@ -1,10 +1,10 @@
 name: fate-serving-10000
 namespace: fate-serving-10000
 chartName: fate-serving
-chartVersion: v2.1.5
+chartVersion: v2.1.6
 partyId: 10000
 registry: ""
-imageTag: 2.1.5-release
+imageTag: 2.1.6-release
 pullPolicy: 
 imagePullSecrets: 
 - name: myregistrykey

diff --git a/k8s-deploy/examples/party-9999/cluster-serving.yaml b/k8s-deploy/examples/party-9999/cluster-serving.yaml
@@ -1,10 +1,10 @@
 name: fate-serving-9999
 namespace: fate-serving-9999
 chartName: fate-serving
-chartVersion: v2.1.5
+chartVersion: v2.1.6
 partyId: 9999
 registry: ""
-imageTag: 2.1.5-release
+imageTag: 2.1.6-release
 pullPolicy: 
 imagePullSecrets: 
 - name: myregistrykey