GMC: replace the service and deployment name if GMC has defined (#98)

1. if GMC has defined the service name, replace the service name in the manifests with the GMC's defined service name and replace the deployment name with "GMC's defined service name" + "-deployment" 2. remove dynamicClient from code, this could help the UT issue 3. set 1min timeout for error provisioning resources to k8s 4. avoid double reconciling when GMC is setting a graph's status 5. reconcile router if GMC spec is changed, previously router don't change if it is existing
opea-project · Jun 18, 2024 · eec8452 · eec8452
1 parent 887bf0d
commit eec8452
Show file tree

Hide file tree

Showing 5 changed files with 302 additions and 219 deletions.
diff --git a/microservices-connector/config/gmcrouter/gmc-router.yaml b/microservices-connector/config/gmcrouter/gmc-router.yaml
@@ -1,19 +1,6 @@
 # Copyright (C) 2024 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: router-service
-spec:
-  selector:
-    app: router-service
-  ports:
-    - protocol: TCP
-      port: 8080
-      targetPort: 8080
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -46,3 +33,16 @@ spec:
         args:
         - "--graph-json"
         - {{.GRAPH_JSON}}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: router-service
+spec:
+  type: ClusterIP
+  selector:
+    app: router-service
+  ports:
+    - protocol: TCP
+      port: 8080
+      targetPort: 8080
diff --git a/microservices-connector/config/samples/chatQnA_xeon.yaml b/microservices-connector/config/samples/chatQnA_xeon.yaml
@@ -56,7 +56,7 @@ spec:
             endpoint: /v1/chat/completions
       - name: Tgi
         internalService:
-          serviceName: tgi-svc
+          serviceName: tgi-service-m
           config:
             endpoint: /generate
           isDownstreamService: true