feat(interactive): Upgrade graphscope-store imageto 0.30.0 and enable portal in onepod mode (#4550)

As titled.

Author: zhanglei1949

charts/graphscope-store/templates/configmap.yaml

@@ -182,7 +182,11 @@ data:
 
     while true
     do
+      {{- if .Values.distributed.enabled }}
       export HOST="${INSTANCE_NAME}-graphscope-store-frontend-0.${INSTANCE_NAME}-graphscope-store-frontend-headless"
+      {{- else }}
+      export HOST="localhost"
+      {{- end }}
       export GRPC_PORT=${GROOT_GRPC_PORT}
       export GREMLIN_PORT=${GROOT_GREMLIN_PORT}
       echo "${HOST} ${GRPC_PORT} ${GREMLIN_PORT}"

charts/graphscope-store/templates/onepod/statefulset.yaml

@@ -142,6 +142,75 @@ spec:
             {{- if .Values.store.extraVolumeMounts }}
             {{- include "common.tplvalues.render" (dict "value" .Values.store.extraVolumeMounts "context" $) | nindent 12 }}
             {{- end }}
+        {{- if .Values.portal.enabled }}
+        - name: gs-coordinator
+          image: {{ include "graphscope-store.portal.coordinator.image" . }}
+          imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
+          {{- if .Values.containerSecurityContext.enabled }}
+          securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 12 }}
+          {{- end }}
+          command:
+            - /etc/coordinator/setup.sh
+          env:
+            - name: CLUSTER_TYPE
+              value: "KUBERNETES"
+            - name: VERSION
+              value: {{ .Chart.Version | quote }}
+            - name: GROOT_USERNAME
+              value: {{ .Values.auth.username | quote }}
+            - name: GROOT_PASSWORD
+              value: {{ .Values.auth.password | b64enc | quote }}
+            - name: GROOT_GRPC_PORT
+              value: {{ .Values.frontend.service.servicePort | quote }}
+            - name: GROOT_GREMLIN_PORT
+              value: {{ .Values.frontend.service.gremlinPort | quote }}
+            - name: GROOT_CYPHER_PORT
+              value: {{ .Values.frontend.service.cypherPort | quote }}
+            {{- if not .Values.distributed.enabled }}
+            - name: GROOT_FRONTEND_POD_SUFFIX
+              value: {{ printf "%s-store" (include "graphscope-store.name" .) }}
+            {{- end }}
+            - name: INSTANCE_NAME
+              value: {{ .Release.Name | quote }}
+            - name: NAMESPACE
+              value: {{ .Release.Namespace | quote }}
+            - name: SERVICE_PORT
+              value: {{ .Values.portal.service.servicePort | quote }} 
+            - name: WORKSPACE
+              value: {{ .Values.portal.runtimePath | quote }}
+            - name: STUDIO_WRAPPER_ENDPOINT
+              value: {{ .Values.portal.studioWrapperEndpoint | quote }}
+            - name: BASEID
+              value: {{ .Values.portal.baseId | quote }}
+            - name: SOLUTION
+              value: "GRAPHSCOPE_INSIGHT"
+            {{- range $key, $value := .Values.env }}
+            - name: {{ $key }}
+              value: {{ $value | quote }}
+            {{- end }}
+          ports:
+            - name: http
+              containerPort:  {{ .Values.portal.service.servicePort }}
+          {{- if .Values.portal.resources }}
+          resources: {{- toYaml .Values.portal.resources | nindent 12 }}
+          {{- end }}
+          {{- if .Values.livenessProbe.enabled }}
+          livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.livenessProbe "enabled") "context" $) | nindent 12 }}
+            tcpSocket:
+              port: http
+          {{- end }}
+          {{- if .Values.readinessProbe.enabled }}
+          readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.readinessProbe "enabled") "context" $) | nindent 12 }}
+            tcpSocket:
+              port: http
+          {{- end }}
+          volumeMounts:
+            - name: runtime
+              mountPath: {{ .Values.portal.runtimePath | quote }}
+            - name: config
+              mountPath: /etc/coordinator/setup.sh
+              subPath: portal_setup.sh
+        {{- end }}
       volumes:
         - name: config
           configMap:
@@ -166,6 +235,14 @@ spec:
           persistentVolumeClaim:
             claimName: {{ printf "%s" (tpl .Values.logPersistence.existingClaim .) }}
         {{- end }}
+        {{- if and .Values.portal.enabled .Values.portal.persistence.enabled .Values.portal.persistence.existingClaim }}
+        - name: runtime
+          persistentVolumeClaim:
+            claimName: {{ printf "%s" (tpl .Values.portal.persistence.existingClaim .) }}
+        {{- else if and .Values.portal.enabled (not .Values.portal.persistence.enabled) }}
+        - name: runtime
+          emptyDir: {}
+        {{- end }}
   volumeClaimTemplates:
     {{- if and .Values.store.persistence.enabled (not .Values.store.persistence.existingClaim) }}
     - metadata:
@@ -211,4 +288,26 @@ spec:
         selector: {{- include "graphscope-store.tplvalues.render" (dict "value" .Values.logPersistence.selector "context" $) | nindent 10 }}
         {{- end -}}
     {{- end }}
+    {{- if and .Values.portal.enabled .Values.portal.persistence.enabled (not .Values.portal.persistence.existingClaim) }}
+    - metadata:
+        name: runtime
+        {{- if .Values.persistence.annotations }}
+        annotations: {{- include "common.tplvalues.render" (dict "value" .Values.persistence.annotations "context" $) | nindent 10 }}
+        {{- end }}
+        {{- if .Values.persistence.labels }}
+        labels: {{- include "common.tplvalues.render" (dict "value" .Values.persistence.labels "context" $) | nindent 10 }}
+        {{- end }}
+      spec:
+        accessModes:
+          {{- range .Values.persistence.accessModes }}
+          - {{ . | quote }}
+          {{- end }}
+        resources:
+          requests:
+            storage: {{ .Values.portal.persistence.size | quote }}
+        {{ include "graphscope-store.storageClass" . | nindent 8 }}
+        {{- if .Values.portal.persistence.selector }}
+        selector: {{- include "graphscope-store.tplvalues.render" (dict "value" .Values.portal.persistence.selector "context" $) | nindent 10 }}
+        {{- end -}}
+    {{- end }}
 {{- end }}

charts/graphscope-store/templates/portal/statefulset.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.portal.enabled }}
+{{- if and .Values.portal.enabled .Values.distributed.enabled }}
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:

charts/graphscope-store/values.yaml

@@ -25,7 +25,7 @@ image:
   registry: registry.cn-hongkong.aliyuncs.com
   repository: graphscope/graphscope-store
   # Overrides the image tag whose default is the chart appVersion.
-  tag: "0.29.0"
+  tag: "0.30.0"
   digest: ""
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
@@ -263,7 +263,7 @@ portal:
   coordinatorImage:
     registry: registry.cn-hongkong.aliyuncs.com
     repository: graphscope/coordinator
-    tag: "0.29.0"
+    tag: "0.30.0"
   ## Service parameters
   ##
   service:

coordinator/gscoordinator/flex/core/config.py

@@ -108,7 +108,7 @@ def str_to_bool(s):
     GROOT_PASSWORD = base64.b64decode(GROOT_PASSWORD).decode('utf-8')
 except Exception as e:
     logger.warn("Invalid base64-encoded string found, use original value: %s", str(e))
-
+GROOT_FRONTEND_POD_SUFFIX = os.environ.get("GROOT_FRONTEND_POD_SUFFIX", "graphscope-store-frontend")
 
 # dataloading service for groot
 STUDIO_WRAPPER_ENDPOINT = os.environ.get("STUDIO_WRAPPER_ENDPOINT", None)

coordinator/gscoordinator/flex/core/insight/graph.py

@@ -30,6 +30,7 @@
 from gscoordinator.flex.core.config import CLUSTER_TYPE
 from gscoordinator.flex.core.config import CREATION_TIME
 from gscoordinator.flex.core.config import GROOT_CYPHER_PORT
+from gscoordinator.flex.core.config import GROOT_FRONTEND_POD_SUFFIX
 from gscoordinator.flex.core.config import GROOT_GREMLIN_PORT
 from gscoordinator.flex.core.config import GROOT_GRPC_PORT
 from gscoordinator.flex.core.config import GROOT_PASSWORD
@@ -88,8 +89,8 @@ def _fetch_endpoints_impl(self):
 
         try:
             # frontend statefulset and service name
-            frontend_pod_name = "{0}-graphscope-store-frontend-0".format(
-                INSTANCE_NAME
+            frontend_pod_name = "{0}-{1}-0".format(
+                INSTANCE_NAME, GROOT_FRONTEND_POD_SUFFIX
             )
             pod = self._core_api.read_namespaced_pod(frontend_pod_name, NAMESPACE)
             endpoints = [
@@ -312,14 +313,14 @@ def get_groot_graph_from_k8s():
     core_api = kube_client.CoreV1Api(api_client)
     app_api = kube_client.AppsV1Api(api_client)
     # frontend statefulset and service name
-    name = "{0}-graphscope-store-frontend".format(INSTANCE_NAME)
+    name = "{0}-{1}".format(INSTANCE_NAME, GROOT_FRONTEND_POD_SUFFIX)
     response = app_api.read_namespaced_stateful_set(name, NAMESPACE)
     # creation time
     creation_time = response.metadata.creation_timestamp.astimezone(
         tz.tzlocal()
     ).strftime("%Y/%m/%d %H:%M:%S")
     # service endpoints: [grpc_endpoint, gremlin_endpoint]
-    frontend_pod_name = "{0}-graphscope-store-frontend-0".format(INSTANCE_NAME)
+    frontend_pod_name = "{0}-{1}-0".format(INSTANCE_NAME, GROOT_FRONTEND_POD_SUFFIX)
     pod = core_api.read_namespaced_pod(frontend_pod_name, NAMESPACE)
     endpoints = [
         f"{pod.status.pod_ip}:{GROOT_GRPC_PORT}",