update kustomizations to the latest version of ai-service, without cu…

…stom llms
Canner · Jul 18, 2024 · 655d49e · 655d49e
1 parent 387b611
commit 655d49e
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 17 deletions.
diff --git a/deployment/kustomizations/README.md b/deployment/kustomizations/README.md
@@ -30,7 +30,7 @@ kubectl create namespace wren
 
 # !!!!!!!!!!!!
 # MODIFY secret-wren_example.yaml manifest file FIRST
-# OPENAI_API_KEY is REQUIRED: without a valid key the wren-ai-service-deployment pod will not start
+# LLM_OPENAI_API_KEY and EMBEDDER_OPENAI_API_KEY are REQUIRED: without a valid key the wren-ai-service-deployment pod will not start
 # You must update PG_URL, otherwise wren-ui will not work
 #vi deployment/kustomizations/examples/secret-wren_example.yaml
 kubectl apply -f deployment/kustomizations/examples/secret-wren_example.yaml

diff --git a/deployment/kustomizations/base/cm.yaml b/deployment/kustomizations/base/cm.yaml
@@ -18,9 +18,14 @@ data:
   WREN_AI_SERVICE_VERSION: "0.7.3"
   WREN_UI_VERSION: "0.10.1"
 
-  # OpenAI
+  # LLM and Embedder Configurations
+  LLM_PROVIDER: "openai_llm"
+  LLM_OPENAI_API_BASE: "https://api.openai.com/v1"
   GENERATION_MODEL: "gpt-3.5-turbo"
-  OPENAI_API_BASE: "https://api.openai.com/v1"
+
+  EMBEDDER_PROVIDER: "openai_embedder"
+  EMBEDDER_OPENAI_API_BASE: "https://api.openai.com/v1"
+
 
   # Telemetry
   POSTHOG_HOST: "https://app.posthog.com"

diff --git a/deployment/kustomizations/base/deploy-wren-ai-service.yaml b/deployment/kustomizations/base/deploy-wren-ai-service.yaml
@@ -21,21 +21,36 @@ spec:
               configMapKeyRef:
                 name: wren-config
                 key: WREN_AI_SERVICE_PORT
-          - name: OPENAI_API_KEY
+          - name: LLM_PROVIDER
+            valueFrom:
+              configMapKeyRef:
+                name: wren-config
+                key: LLM_PROVIDER
+          - name: LLM_OPENAI_API_KEY
             valueFrom:
               secretKeyRef:
                 name: wrenai-secrets
-                key: OPENAI_API_KEY
-          - name: LLM_PROVIDER
+                key: LLM_OPENAI_API_KEY
+          - name: LLM_OPENAI_API_BASE
+            valueFrom: 
+              configMapKeyRef:
+                name: wren-config
+                key: LLM_OPENAI_API_BASE
+          - name: EMBEDDER_PROVIDER
+            valueFrom:
+              configMapKeyRef:
+                name: wren-config
+                key: EMBEDDER_PROVIDER
+          - name: EMBEDDER_OPENAI_API_KEY
             valueFrom:
               secretKeyRef:
                 name: wrenai-secrets
-                key: LLM_PROVIDER
-          - name: OPENAI_API_BASE
+                key: EMBEDDER_OPENAI_API_KEY
+          - name: EMBEDDER_OPENAI_API_BASE
             valueFrom: 
               configMapKeyRef:
                 name: wren-config
-                key: OPENAI_API_BASE
+                key: EMBEDDER_OPENAI_API_BASE
           - name: GENERATION_MODEL
             valueFrom: 
               configMapKeyRef:

diff --git a/deployment/kustomizations/examples/secret-wren_example.yaml b/deployment/kustomizations/examples/secret-wren_example.yaml
@@ -5,10 +5,9 @@ metadata:
   name: wrenai-secrets
 type: Opaque
 data:
-  # OPENAI_API_KEY is REQUIRED: without a valid key the wren-ai-service-deployment pod will not start
-  OPENAI_API_KEY: UkVRVUlSRUQ6IHNrLXByb2otYWxsLWFjY2Vzcy1wbGFjZWhvbGRlci00LXdyZW4tYWktc2VydmljZS1kZXBsb3ltZW50
-  OPENAI_API_BASE: aHR0cHM6Ly9hcGkub3BlbmFpLmNvbS92MQ==
-  LLM_PROVIDER: b3BlbmFp
+  # LLM_OPENAI_API_KEY and EMBEDDER_OPENAI_API_KEY are REQUIRED: without a valid key the wren-ai-service-deployment pod will not start
+  LLM_OPENAI_API_KEY: UkVRVUlSRUQ6IHNrLXByb2otYWxsLWFjY2Vzcy1wbGFjZWhvbGRlci00LXdyZW4tYWktc2VydmljZS1kZXBsb3ltZW50
+  EMBEDDER_OPENAI_API_KEY: UkVRVUlSRUQ6IHNrLXByb2otYWxsLWFjY2Vzcy1wbGFjZWhvbGRlci00LXdyZW4tYWktc2VydmljZS1kZXBsb3ltZW50  
   PG_USERNAME: cG9zdGdyZXM=
 
   #Azure openai env

diff --git a/deployment/kustomizations/kustomization.yaml b/deployment/kustomizations/kustomization.yaml
@@ -39,13 +39,13 @@ images:
   - name: ghcr.io/canner/wren-bootstrap
     newTag: 0.1.4 # WREN_BOOTSTRAP_VERSION
   - name: ghcr.io/canner/wren-engine
-    newTag: 0.5.1 # WREN_ENGINE_VERSION
+    newTag: 0.7.0 # WREN_ENGINE_VERSION
   - name: ghcr.io/canner/wren-ui
-    newTag: 0.8.0 # WREN_UI_VERSION
+    newTag: 0.10.0 # WREN_UI_VERSION
   - name: ghcr.io/canner/wren-ai-service
-    newTag: 0.5.7 # WREN_AI_SERVICE_VERSION
+    newTag: 0.7.2 # WREN_AI_SERVICE_VERSION
   - name: ghcr.io/canner/wren-engine-ibis
-    newTag: 0.5.1 # IBIS_SERVER_VERSION
+    newTag: 0.7.0 # IBIS_SERVER_VERSION
 
 resources:
   - base/cm.yaml