feat: able to configure public namespace for gpts

Signed-off-by: bjwswang <bjwswang@gmail.com>
kubeagi · Mar 28, 2024 · 99c14c1 · 99c14c1
1 parent fe0a884
commit 99c14c1
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 14 deletions.
diff --git a/deploy/charts/arcadia/Chart.yaml b/deploy/charts/arcadia/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: arcadia
 description: A Helm chart(Also a KubeBB Component) for KubeAGI Arcadia
 type: application
-version: 0.3.25
+version: 0.3.26
 appVersion: "0.2.1"
 
 keywords:

diff --git a/deploy/charts/arcadia/templates/agent-portal.yaml b/deploy/charts/arcadia/templates/agent-portal.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.agentportal.enabled }}
+{{- if .Values.gpts.enabled }}
 apiVersion: v1
 data:
   .env.production: |
@@ -32,7 +32,7 @@ spec:
         app: {{ .Release.Name }}-agentportal
     spec:
       containers:
-      - image: {{ .Values.agentportal.image }}
+      - image: {{ .Values.gpts.agentportal.image }}
         imagePullPolicy: IfNotPresent
         name: agentportal
         env:
@@ -116,14 +116,14 @@ metadata:
   namespace: {{ .Release.Namespace }}
 spec:
   rules:
-  - host: {{ .Values.agentportal.ingress.host }}
+  - host: {{ .Values.gpts.agentportal.ingress.host }}
     http:
       paths:
       - backend:
           service:
             name: {{ .Release.Name }}-agentportal
             port:
               number: 3000
-        path: "/{{ .Values.agentportal.ingress.path }}"
+        path: "/{{ .Values.gpts.agentportal.ingress.path }}"
         pathType: ImplementationSpecific
 {{- end }}
diff --git a/deploy/charts/arcadia/templates/config.yaml b/deploy/charts/arcadia/templates/config.yaml
@@ -71,6 +71,7 @@ data:
       database: {{ .Values.postgresql.global.postgresql.auth.database }}
   # configurations for gpts
   gptsConfig: |
+    public_namespace: {{ .Values.gpts.public_namespace }}
     categories:
       - id: 1
         name: "通用对话"

diff --git a/deploy/charts/arcadia/values.yaml b/deploy/charts/arcadia/values.yaml
@@ -74,15 +74,17 @@ opsconsole:
   ingress:
     path: kubeagi-portal-public
     host: portal.<replaced-ingress-nginx-ip>.nip.io
-  
-# @section portal for arcadia GPT store
-agentportal:
+
+# @section configurations for GPT Store
+gpts:
   enabled: true
-  kubebbEnabled: true
-  image: kubeagi/agent-portal:latest
-  ingress:
-    path: ""
-    host: gpts.<replaced-ingress-nginx-ip>.nip.io
+  # all gpt resources are public in this namespace
+  public_namespace: gpts
+  agentportal:
+    image: kubeagi/agent-portal:latest
+    ingress:
+      path: ""
+      host: gpts.<replaced-ingress-nginx-ip>.nip.io
 
 # @section fastchat is used as fastchat configurations for arcadia
 fastchat:

diff --git a/pkg/config/gpts_config.go b/pkg/config/gpts_config.go
@@ -35,7 +35,9 @@ var (
 
 // GPTsConfig is the configurations for GPT Store
 type GPTsConfig struct {
-	Categories []Category `json:"categories,omitempty"`
+	// PublicNamespace is the namespace which all gpt-releated resources are public
+	PublicNamespace string     `json:"public_namespace,omitempty"`
+	Categories      []Category `json:"categories,omitempty"`
 }
 
 // Category in gpt store