Updated to support FATE v1.7.1.1 (#515)

Signed-off-by: ChenLong Ma <[email protected]>
FederatedAI · Jan 27, 2022 · f0f87de · f0f87de
1 parent c32a07a
commit f0f87de
Show file tree

Hide file tree

Showing 28 changed files with 47 additions and 47 deletions.
diff --git a/docker-build/.env b/docker-build/.env
@@ -1,2 +1,2 @@
 #PREFIX=federatedai
-#IMG_TAG=1.7.1-release
+#IMG_TAG=1.7.1.1-release
diff --git a/docker-deploy/.env b/docker-deploy/.env
@@ -1,5 +1,5 @@
 RegistryURI=
-TAG=1.7.1-release
+TAG=1.7.1.1-release
 SERVING_TAG=2.0.4-release
 
 # PREFIX: namespace on the registry's server.

diff --git a/docker-deploy/training_template/docker-compose-eggroll.yml b/docker-deploy/training_template/docker-compose-eggroll.yml
@@ -142,7 +142,7 @@ services:
       - fate-network
 
   mysql:
-    image: "mysql:8"
+    image: "mysql:8.0.28"
     expose:
       - 3306
     volumes:

diff --git a/docker-deploy/training_template/docker-compose-spark-slim.yml b/docker-deploy/training_template/docker-compose-spark-slim.yml
@@ -84,7 +84,7 @@ services:
       FATE_FLOW_UPLOAD_MAX_BYTES: "104868093952"
 
   mysql:
-    image: "mysql:8"
+    image: "mysql:8.0.28"
     expose:
       - 3306
     volumes:

diff --git a/docker-deploy/training_template/docker-compose-spark.yml b/docker-deploy/training_template/docker-compose-spark.yml
@@ -173,7 +173,7 @@ services:
       - fate-network
 
   mysql:
-    image: "mysql:8"
+    image: "mysql:8.0.28"
     expose:
       - 3306
     volumes:

diff --git a/helm-charts/FATE-Exchange/Chart.yaml b/helm-charts/FATE-Exchange/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: v1.7.1
+appVersion: v1.7.1.1
 description: A Helm chart for fate exchange
 name: fate-exchange
-version: v1.7.1
+version: v1.7.1-a
diff --git 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.7.1
+chartVersion: v1.7.1-a
 partyId: 1
 registry: ""
-imageTag: ""
+imageTag: "1.7.1.1-release"
 pullPolicy: 
 imagePullSecrets: 
 - name: myregistrykey

diff --git 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.7.1-release" }}
+  tag: {{ .imageTag | default "1.7.1.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
@@ -4,7 +4,7 @@ partyName: fate-exchange
 image:
   registry: federatedai
   isThridParty:
-  tag: 1.7.1-release
+  tag: 1.7.1.1-release
   pullPolicy: IfNotPresent
   imagePullSecrets: 
 #  - name: 

diff --git a/helm-charts/FATE/Chart.yaml b/helm-charts/FATE/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
-appVersion: v1.7.1
+appVersion: v1.7.1.1
 description: A Helm chart for fate-training
 name: fate
-version: v1.7.1
+version: v1.7.1-a
 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/templates/mysql-module.yaml b/helm-charts/FATE/templates/mysql-module.yaml
@@ -178,9 +178,9 @@ spec:
     spec:
       containers:
         {{- if .Values.image.isThridParty }}
-        - image: {{ .Values.image.registry }}/mysql:8
+        - image: {{ .Values.image.registry }}/mysql:8.0.28
         {{- else }}
-        - image: mysql:8
+        - image: mysql:8.0.28
         {{- end }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           name: mysql

diff --git 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.7.1
+chartVersion: v1.7.1-a
 partyId: 9999
 registry: ""
-imageTag: ""
+imageTag: "1.7.1.1-release"
 pullPolicy: 
 imagePullSecrets: 
 - name: myregistrykey

diff --git 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.7.1-release" }}
+  tag: {{ .imageTag | default "1.7.1.1-release" }}
   pullPolicy: {{ .pullPolicy | default "IfNotPresent" }}
   {{- with .imagePullSecrets }}
   imagePullSecrets:

diff --git a/helm-charts/FATE/values.yaml b/helm-charts/FATE/values.yaml
@@ -2,7 +2,7 @@
 image:
   registry: federatedai
   isThridParty:
-  tag: 1.7.1-release
+  tag: 1.7.1.1-release
   pullPolicy: IfNotPresent
   imagePullSecrets: 
 #  - name: 

diff --git 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.7.1
+chartVersion: v1.7.1-a
 partyId: 9999
 registry: ""
-imageTag: ""
+imageTag: "1.7.1.1-release"
 pullPolicy: 
 imagePullSecrets: 
 - name: myregistrykey

diff --git 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.7.1
+chartVersion: v1.7.1-a
 partyId: 9999
 registry: ""
-imageTag: ""
+imageTag: "1.7.1.1-release"
 pullPolicy: 
 imagePullSecrets: 
 - name: myregistrykey

diff --git 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.7.1
+chartVersion: v1.7.1-a
 partyId: 9999
 registry: ""
-imageTag: ""
+imageTag: "1.7.1.1-release"
 pullPolicy: 
 imagePullSecrets: 
 - name: myregistrykey

diff --git a/k8s-deploy/cluster.yaml b/k8s-deploy/cluster.yaml
@@ -1,10 +1,10 @@
 name: fate-9999
 namespace: fate-9999
 chartName: fate
-chartVersion: v1.7.1
+chartVersion: v1.7.1-a
 partyId: 9999
 registry: ""
-imageTag: ""
+imageTag: "1.7.1.1-release"
 pullPolicy: 
 imagePullSecrets: 
 - name: myregistrykey

diff --git 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.7.1
+chartVersion: v1.7.1-a
 partyId: 10000
 registry: ""
-imageTag: "1.7.1-release"
+imageTag: "1.7.1.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
@@ -1,10 +1,10 @@
 name: fate-10000
 namespace: fate-10000
 chartName: fate
-chartVersion: v1.7.1
+chartVersion: v1.7.1-a
 partyId: 10000
 registry: ""
-imageTag: "1.7.1-release"
+imageTag: "1.7.1.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
@@ -1,10 +1,10 @@
 name: fate-10000
 namespace: fate-10000
 chartName: fate
-chartVersion: v1.7.1
+chartVersion: v1.7.1-a
 partyId: 10000
 registry: ""
-imageTag: "1.7.1-release"
+imageTag: "1.7.1.1-release"
 pullPolicy: 
 imagePullSecrets: 
 - name: myregistrykey

diff --git 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.7.1
+chartVersion: v1.7.1-a
 partyId: 10000
 registry: ""
-imageTag: "1.7.1-release"
+imageTag: "1.7.1.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
@@ -1,10 +1,10 @@
 name: fate-9999
 namespace: fate-9999
 chartName: fate
-chartVersion: v1.7.1
+chartVersion: v1.7.1-a
 partyId: 9999
 registry: ""
-imageTag: "1.7.1-release"
+imageTag: "1.7.1.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
@@ -1,10 +1,10 @@
 name: fate-9999
 namespace: fate-9999
 chartName: fate
-chartVersion: v1.7.1
+chartVersion: v1.7.1-a
 partyId: 9999
 registry: ""
-imageTag: "1.7.1-release"
+imageTag: "1.7.1.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
@@ -1,10 +1,10 @@
 name: fate-9999
 namespace: fate-9999
 chartName: fate
-chartVersion: v1.7.1
+chartVersion: v1.7.1-a
 partyId: 9999
 registry: ""
-imageTag: 1.7.1-release
+imageTag: 1.7.1.1-release
 pullPolicy: 
 imagePullSecrets: 
 - name: myregistrykey

diff --git 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.7.1
+chartVersion: v1.7.1-a
 partyId: 9999
 registry: ""
-imageTag: "1.7.1-release"
+imageTag: "1.7.1.1-release"
 pullPolicy: 
 imagePullSecrets: 
 - name: myregistrykey

diff --git 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: v1.7.1
+chartVersion: v1.7.1-a
 partyId: 1
 registry: ""
-imageTag: "1.7.1-release"
+imageTag: "1.7.1.1-release"
 pullPolicy: 
 imagePullSecrets: 
 - name: myregistrykey

diff --git 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: v1.7.1
+chartVersion: v1.7.1-a
 partyId: 1
 registry: ""
-imageTag: "1.7.1-release"
+imageTag: "1.7.1.1-release"
 pullPolicy: 
 imagePullSecrets: 
 - name: myregistrykey