make GIE run on helm

Signed-off-by: Lei Wang <[email protected]>
GraphScope · Jun 13, 2024 · 244f500 · 244f500
1 parent 60759a7
commit 244f500
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/charts/gart/templates/gie_frontend/deployment.yaml b/charts/gart/templates/gie_frontend/deployment.yaml
@@ -31,7 +31,8 @@ spec:
           make run &&
           sleep infinity
         ports:
-          - containerPort: {{ .Values.gie_frontend.gremlinPort }}
+          - name: gremlin 
+            containerPort: {{ .Values.gie_frontend.gremlinPort }}
         envFrom:
         - configMapRef:
             name: {{ include "gart.configmapName" . }}

diff --git a/charts/gart/templates/gie_frontend/svc.yaml b/charts/gart/templates/gie_frontend/svc.yaml
@@ -12,4 +12,5 @@ spec:
   ports:
     - protocol: TCP
       port: {{ .Values.gie_frontend.gremlinPort }}
-      targetPort: gremlin
+      targetPort: gremlin
+      nodePort: null
diff --git a/charts/gart/templates/writer/statefulset.yaml b/charts/gart/templates/writer/statefulset.yaml
@@ -12,7 +12,7 @@ metadata:
   name: {{ include "gart.writer.fullname" . }}
   namespace: {{ .Release.Namespace }}
 spec:
-  serviceName: "writer"
+  serviceName: {{ include "gart.fullname" . }}-gie-executor-service
   replicas: {{ .Values.dataconfig.subgraphNum }}
   selector:
     matchLabels:
@@ -80,20 +80,19 @@ spec:
         image: {{ include "gart.gie_executor.image" . }}
         imagePullPolicy: {{ .Values.gie_executor.image.pullPolicy | quote }}
         ports:
-          - name: gaia-rpc
-            containerPort: {{ .Values.gie_executor.GAIA_RPC_PORT }}
-          - name: gaia-engine
-            containerPort: {{ .Values.gie_executor.ENGINE_PORT }}
+        - name: gaia-rpc
+          containerPort: {{ .Values.gie_executor.GAIA_RPC_PORT }}
+        - name: gaia-engine
+          containerPort: {{ .Values.gie_executor.ENGINE_PORT }}
         command: ["/bin/bash", "-c"]
         args:
         - |
           echo "subgraph id: $((${HOSTNAME##*-} + 0))" &&
           cd /home/graphscope/GART &&
           export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib &&
           ./scripts/update_gie_executor_config.py $((${HOSTNAME##*-} + 0)) {{ .Values.dataconfig.subgraphNum }} {{ .Values.gie_executor.GAIA_RPC_PORT }} {{ .Release.Namespace }} {{ include "gart.writer.fullname" . }} {{ include "gart.fullname" . }}-gie-executor-service {{ .Values.gie_executor.ENGINE_PORT}} &&
-          sleep infinity &&
           cd /home/graphscope/GraphScope/interactive_engine/executor/assembly/grin_gart &&
-          ./target/release/grin_executor ../../../assembly/src/conf/graphscope/log4rs.yml /home/graphscope/gie-executor-config.properties &&
+          echo ./target/release/grin_executor ../../../assembly/src/conf/graphscope/log4rs.yml /home/graphscope/gie-executor-config.properties &&
           sleep infinity
         volumeMounts:
         - name: shared-socket

diff --git a/charts/gart/values.yaml b/charts/gart/values.yaml
@@ -212,10 +212,10 @@ gie_executor:
 dataconfig:
   subgraphNum: 2
   dbHost: "127.0.0.1"
-  dbPort: "3306"
+  dbPort: "5432"
   dbUser: "dbuser"
   dbPassword: "123456"
-  dbType: "mysql"
+  dbType: "postgresql"
   dbName: "ldbc"
   v6dSocket: "/tmp/shared/v6d.sock"
   v6dSize: "750G"