fix cluster.yaml of example (#476)

Signed-off-by: ChenLong Ma <[email protected]>
FederatedAI · Sep 15, 2021 · a5d5089 · a5d5089
1 parent d7a5a43
commit a5d5089
Show file tree

Hide file tree

Showing 12 changed files with 191 additions and 91 deletions.
diff --git a/k8s-deploy/cluster-serving.yaml b/k8s-deploy/cluster-serving.yaml
@@ -20,25 +20,25 @@ modules:
   - servingZookeeper
   - servingAdmin
 
-ingress:
-  servingProxy: 
-    # annotations: 
-    hosts:
-    - name: serving-proxy.kubefate.net
-      path: /
-  # tls:
-    # - secretName: my-tls-secret
-      # hosts:
-        # - serving-proxy.kubefate.net
-  servingAdmin: 
-    # annotations: 
-    hosts:
-    - name: serving-admin.kubefate.net
-      path: /
-  # tls:
-    # - secretName: my-tls-secret
-      # hosts:
-         # - serving-admin.kubefate.net
+# ingress:
+  # servingProxy: 
+    # # annotations: 
+    # hosts:
+    # - name: serving-proxy.kubefate.net
+      # path: /
+  # # tls:
+    # # - secretName: my-tls-secret
+      # # hosts:
+        # # - serving-proxy.kubefate.net
+  # servingAdmin: 
+    # # annotations: 
+    # hosts:
+    # - name: serving-admin.kubefate.net
+      # path: /
+  # # tls:
+    # # - secretName: my-tls-secret
+      # # hosts:
+         # # - serving-admin.kubefate.net
 
 # servingAdmin:
   # nodeSelector:

diff --git a/k8s-deploy/cluster-spark.yaml b/k8s-deploy/cluster-spark.yaml
@@ -26,12 +26,28 @@ modules:
 backend: spark
 
 # Specify domain name for service
-# host:
-  # fateboard: 9999.fateboard.kubefate.net
-  # client: 9999.notebook.kubefate.net
-  # sparkUI: 9999.spark.kubefate.net
-  # rabbitmqUI: 9999.rabbitmq.kubefate.net
-  # pulsarUI: 9999.pulsar.kubefate.net
+# ingress:
+  # fateboard: 
+    # # annotations:
+    # hosts:
+    # - name: 9999.fateboard.kubefate.net
+      # path: /
+    # # tls: 
+    # # - secretName: my-tls-secret
+      # # hosts:
+        # # - 9999.fateboard.kubefate.net
+  # client: 
+    # hosts:
+    # - name: 9999.notebook.kubefate.net
+  # spark: 
+    # hosts:
+    # - name: 9999.spark.kubefate.net
+  # rabbitmq: 
+    # hosts:
+    # - name: 9999.rabbitmq.kubefate.net
+  # pulsar: 
+    # hosts:
+    # - name: 9999.pulsar.kubefate.net
 
 # Specify rollsite properties
 # rollsite: 

diff --git a/k8s-deploy/cluster.yaml b/k8s-deploy/cluster.yaml
@@ -24,13 +24,29 @@ modules:
 
 backend: eggroll
 
- # Specify domain name for service
-# host:
-  # fateboard: 9999.fateboard.kubefate.net
-  # client: 9999.notebook.kubefate.net
-  # sparkUI: 9999.spark.kubefate.net
-  # rabbitmqUI: 9999.rabbitmq.kubefate.net
-  # pulsarUI: 9999.pulsar.kubefate.net
+# Specify domain name for service
+# ingress:
+  # fateboard: 
+    # annotations:
+    # hosts:
+    # - name: 9999.fateboard.kubefate.net
+      # path: /
+    # tls: 
+    # - secretName: my-tls-secret
+      # hosts:
+        # - 9999.fateboard.kubefate.net
+  # client: 
+    # hosts:
+    # - name: 9999.notebook.kubefate.net
+  # spark: 
+    # hosts:
+    # - name: 9999.spark.kubefate.net
+  # rabbitmq: 
+    # hosts:
+    # - name: 9999.rabbitmq.kubefate.net
+  # pulsar: 
+    # hosts:
+    # - name: 9999.pulsar.kubefate.net
 
 # Specify rollsite properties
 # rollsite: 

diff --git a/k8s-deploy/examples/config.sh b/k8s-deploy/examples/config.sh
@@ -2,22 +2,24 @@
 
 source party.config
 
-echo ${chartVersion}
-echo ${imageTAG}
+echo ${fate_chartVersion}
+echo ${fate_imageTAG}
+echo ${fate_serving_chartVersion}
+echo ${fate_serving_imageTAG}
 echo ${party_9999_IP}
 echo ${party_10000_IP}
 echo ${party_exchange_IP}
 
 # 9999 config
-sed -i "s/chartVersion: .*/chartVersion: ${chartVersion}/g" ./party-9999/cluster.yaml
-sed -i "s/chartVersion: .*/chartVersion: ${chartVersion}/g" ./party-9999/cluster-serving.yaml
-sed -i "s/chartVersion: .*/chartVersion: ${chartVersion}/g" ./party-9999/cluster-spark.yaml
-sed -i "s/chartVersion: .*/chartVersion: ${chartVersion}/g" ./party-9999/cluster-spark-pulsar.yaml
+sed -i "s/chartVersion: .*/chartVersion: ${fate_chartVersion}/g" ./party-9999/cluster.yaml
+sed -i "s/chartVersion: .*/chartVersion: ${fate_serving_chartVersion}/g" ./party-9999/cluster-serving.yaml
+sed -i "s/chartVersion: .*/chartVersion: ${fate_chartVersion}/g" ./party-9999/cluster-spark.yaml
+sed -i "s/chartVersion: .*/chartVersion: ${fate_chartVersion}/g" ./party-9999/cluster-spark-pulsar.yaml
 
-sed -i "s/imageTag: .*/imageTag: ${imageTAG}/g" ./party-9999/cluster.yaml
-sed -i "s/imageTag: .*/imageTag: ${imageTAG}/g" ./party-9999/cluster-serving.yaml
-sed -i "s/imageTag: .*/imageTag: ${imageTAG}/g" ./party-9999/cluster-spark.yaml
-sed -i "s/imageTag: .*/imageTag: ${imageTAG}/g" ./party-9999/cluster-spark-pulsar.yaml
+sed -i "s/imageTag: .*/imageTag: ${fate_imageTAG}/g" ./party-9999/cluster.yaml
+sed -i "s/imageTag: .*/imageTag: ${fate_serving_imageTAG}/g" ./party-9999/cluster-serving.yaml
+sed -i "s/imageTag: .*/imageTag: ${fate_imageTAG}/g" ./party-9999/cluster-spark.yaml
+sed -i "s/imageTag: .*/imageTag: ${fate_imageTAG}/g" ./party-9999/cluster-spark-pulsar.yaml
 
 
 sed -i "s/192.168.9.1/${party_9999_IP}/g" ./party-9999/cluster.yaml
@@ -37,15 +39,15 @@ sed -i "s/192.168.0.1/${party_exchange_IP}/g" ./party-9999/cluster-spark-pulsar.
 
 # 10000 config
 
-sed -i "s/chartVersion: .*/chartVersion: ${chartVersion}/g" ./party-10000/cluster.yaml
-sed -i "s/chartVersion: .*/chartVersion: ${chartVersion}/g" ./party-10000/cluster-serving.yaml
-sed -i "s/chartVersion: .*/chartVersion: ${chartVersion}/g" ./party-10000/cluster-spark.yaml
-sed -i "s/chartVersion: .*/chartVersion: ${chartVersion}/g" ./party-10000/cluster-spark-pulsar.yaml
+sed -i "s/chartVersion: .*/chartVersion: ${fate_chartVersion}/g" ./party-10000/cluster.yaml
+sed -i "s/chartVersion: .*/chartVersion: ${fate_serving_chartVersion}/g" ./party-10000/cluster-serving.yaml
+sed -i "s/chartVersion: .*/chartVersion: ${fate_chartVersion}/g" ./party-10000/cluster-spark.yaml
+sed -i "s/chartVersion: .*/chartVersion: ${fate_chartVersion}/g" ./party-10000/cluster-spark-pulsar.yaml
 
-sed -i "s/imageTag: .*/imageTag: ${imageTAG}/g" ./party-10000/cluster.yaml
-sed -i "s/imageTag: .*/imageTag: ${imageTAG}/g" ./party-10000/cluster-serving.yaml
-sed -i "s/imageTag: .*/imageTag: ${imageTAG}/g" ./party-10000/cluster-spark.yaml
-sed -i "s/imageTag: .*/imageTag: ${imageTAG}/g" ./party-10000/cluster-spark-pulsar.yaml
+sed -i "s/imageTag: .*/imageTag: ${fate_imageTAG}/g" ./party-10000/cluster.yaml
+sed -i "s/imageTag: .*/imageTag: ${fate_serving_imageTAG}/g" ./party-10000/cluster-serving.yaml
+sed -i "s/imageTag: .*/imageTag: ${fate_imageTAG}/g" ./party-10000/cluster-spark.yaml
+sed -i "s/imageTag: .*/imageTag: ${fate_imageTAG}/g" ./party-10000/cluster-spark-pulsar.yaml
 
 sed -i "s/192.168.9.1/${party_9999_IP}/g" ./party-10000/cluster.yaml
 sed -i "s/192.168.9.1/${party_9999_IP}/g" ./party-10000/cluster-serving.yaml
@@ -68,8 +70,8 @@ sed -i "s/192.168.0.1/${party_exchange_IP}/g" ./party-10000/cluster-spark-pulsar
 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/imageTag: .*/imageTag: ${imageTAG}/g" ./party-exchange/rollsite.yaml
-sed -i "s/imageTag: .*/imageTag: ${imageTAG}/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
 
 sed -i "s/192.168.9.1/${party_9999_IP}/g" ./party-exchange/rollsite.yaml
 sed -i "s/192.168.9.1/${party_9999_IP}/g" ./party-exchange/trafficServer.yaml

diff --git a/k8s-deploy/examples/party-10000/cluster-serving.yaml b/k8s-deploy/examples/party-10000/cluster-serving.yaml
@@ -20,15 +20,23 @@ modules:
   - servingZookeeper
   - servingAdmin
 
+ingress:
+  servingProxy: 
+    hosts:
+    - name: party10000.serving-proxy.kubefate.net
+      path: /
+  servingAdmin: 
+    hosts:
+    - name: party10000.serving-admin.kubefate.net
+      path: /
+
 servingAdmin:
-  ingressHost: 10000.serving-admin.kubefate.net
   username: admin
   password: admin
 
 servingProxy: 
   nodePort: 30106
   type: NodePort
-  ingerssHost: 10000.serving-proxy.kubefate.net
   partyList:
   - partyId: 9999
     partyIp: 192.168.9.1

diff --git a/k8s-deploy/examples/party-10000/cluster-spark-pulsar.yaml b/k8s-deploy/examples/party-10000/cluster-spark-pulsar.yaml
@@ -25,11 +25,20 @@ modules:
 
 backend: spark
 
-# host:
-  # fateboard: 10000.fateboard.kubefate.net
-  # client: 10000.notebook.kubefate.net
-  # sparkUI: 10000.spark.kubefate.net
-  # pulsarUI: 10000.pulsar.kubefate.net
+ingress:
+  fateboard: 
+    hosts:
+    - name: party10000.fateboard.kubefate.net
+      path: /
+  client: 
+    hosts:
+    - name: party10000.notebook.kubefate.net
+  spark: 
+    hosts:
+    - name: party10000.spark.kubefate.net
+  pulsar: 
+    hosts:
+    - name: party10000.pulsar.kubefate.net
 
 python:
   type: NodePort
@@ -66,4 +75,5 @@ pulsar:
     10000:
       host: pulsar
       port: 6650
-      sslPort:6651
+      sslPort: 6651
+
diff --git a/k8s-deploy/examples/party-10000/cluster-spark.yaml b/k8s-deploy/examples/party-10000/cluster-spark.yaml
@@ -25,11 +25,20 @@ modules:
 
 backend: spark
 
-# host:
-  # fateboard: 10000.fateboard.kubefate.net
-  # client: 10000.notebook.kubefate.net
-  # sparkUI: 10000.spark.kubefate.net
-  # rabbitmqUI: 10000.rabbitmq.kubefate.net
+ingress:
+  fateboard: 
+    hosts:
+    - name: party10000.fateboard.kubefate.net
+      path: /
+  client: 
+    hosts:
+    - name: party10000.notebook.kubefate.net
+  spark: 
+    hosts:
+    - name: party10000.spark.kubefate.net
+  rabbitmq: 
+    hosts:
+    - name: party10000.rabbitmq.kubefate.net
 
 python:
   type: NodePort
@@ -63,4 +72,5 @@ rabbitmq:
     10000:
       host: pulsar
       port: 6650
-      sslPort:6651
+      sslPort: 6651
+
diff --git a/k8s-deploy/examples/party-10000/cluster.yaml b/k8s-deploy/examples/party-10000/cluster.yaml
@@ -24,9 +24,14 @@ modules:
 
 backend: eggroll
 
-# host:
-  # fateboard: 10000.fateboard.kubefate.net
-  # client: 10000.notebook.kubefate.net
+ingress:
+  fateboard: 
+    hosts:
+    - name: party10000.fateboard.kubefate.net
+      path: /
+  client: 
+    hosts:
+    - name: party10000.notebook.kubefate.net
 
 rollsite: 
   type: NodePort
@@ -42,4 +47,4 @@ python:
   grpcNodePort: 30102
 
 servingIp: 192.168.10.1
-servingPort: 30105
+servingPort: 30105
diff --git a/k8s-deploy/examples/party-9999/cluster-serving.yaml b/k8s-deploy/examples/party-9999/cluster-serving.yaml
@@ -19,16 +19,24 @@ modules:
   - servingServer
   - servingZookeeper
   - servingAdmin
-
+
+ingress:
+  servingProxy: 
+    hosts:
+    - name: party9999.serving-proxy.kubefate.net
+      path: /
+  servingAdmin: 
+    hosts:
+    - name: party9999.serving-admin.kubefate.net
+      path: /
+
 servingAdmin:
-  ingressHost: 9999.serving-admin.kubefate.net
   username: admin
   password: admin
 
 servingProxy: 
   nodePort: 30096
   type: NodePort
-  ingerssHost: 9999.serving-proxy.kubefate.net
   partyList:
   - partyId: 10000
     partyIp: 192.168.10.1

diff --git a/k8s-deploy/examples/party-9999/cluster-spark-pulsar.yaml b/k8s-deploy/examples/party-9999/cluster-spark-pulsar.yaml
@@ -25,11 +25,20 @@ modules:
 
 backend: spark
 
-# host:
-  # fateboard: 9999.fateboard.kubefate.net
-  # client: 9999.notebook.kubefate.net
-  # sparkUI: 9999.spark.kubefate.net
-  # pulsarUI: 9999.pulsar.kubefate.net
+ingress:
+  fateboard: 
+    hosts:
+    - name: party9999.fateboard.kubefate.net
+      path: /
+  client: 
+    hosts:
+    - name: party9999.notebook.kubefate.net
+  spark: 
+    hosts:
+    - name: party9999.spark.kubefate.net
+  pulsar: 
+    hosts:
+    - name: party9999.pulsar.kubefate.net
 
 python:
   type: NodePort
@@ -61,9 +70,10 @@ pulsar:
     9999:
       host: pulsar
       port: 6650
-      sslPort:6651
+      sslPort: 6651
     10000:
       host: 192.168.10.1
       port: 30104
       sslPort: 30109
-      proxy: ""
+      proxy: ""
+