GMC: resource management #259

KfreeZ · 2024-08-03T14:17:01Z

Description

This PR introduce the resource management in GMC controller in order to:

delete the resources when GMC pipeline is deleted
delete the resources if it is deleted from a pipeline
record more status details of the resources
update resource status based on event

Issues

#192
#193
#194

Type of change

List the type of change like below. Please delete options that are not relevant.

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds new functionality)
Breaking change (fix or feature that would break existing design and interface)

Dependencies

List the newly introduced 3rd party dependency if exists.

Tests

get status of deployment

  status:
    accessUrl: http://router-service.dataprep.svc.cluster.local:8080
    annotations:
      ConfigMap:v1:data-prep-config:dataprep: provisioned
      ConfigMap:v1:embedding-usvc-config:dataprep: provisioned
      ConfigMap:v1:llm-uservice-config:dataprep: provisioned
      ConfigMap:v1:reranking-usvc-config:dataprep: provisioned
      ConfigMap:v1:retriever-usvc-config:dataprep: provisioned
      ConfigMap:v1:tei-config:dataprep: provisioned
      ConfigMap:v1:teirerank-config:dataprep: provisioned
      ConfigMap:v1:tgi-config:dataprep: provisioned
      Deployment:apps/v1:data-prep-svc-deployment:dataprep: |
        Replicas: 1 desired | 1 updated | 2 total | 1 available | 1 unavailable
        Conditions:
          Type: Available
          Status: True
          Reason: MinimumReplicasAvailable
          Message: Deployment has minimum availability.
          Type: Progressing
          Status: True
          Reason: ReplicaSetUpdated
          Message: ReplicaSet "data-prep-svc-deployment-86f698cd8c" is progressing.
      Deployment:apps/v1:embedding-svc-deployment:dataprep: |
        Replicas: 1 desired | 1 updated | 1 total | 1 available | 0 unavailable
        Conditions:
          Type: Available
          Status: True
          Reason: MinimumReplicasAvailable
          Message: Deployment has minimum availability.
          Type: Progressing
          Status: True
          Reason: NewReplicaSetAvailable
          Message: ReplicaSet "embedding-svc-deployment-858b75bbd" has successfully progressed.
      Deployment:apps/v1:llm-svc-deployment:dataprep: |
        Replicas: 1 desired | 1 updated | 1 total | 1 available | 0 unavailable
        Conditions:
          Type: Available
          Status: True
          Reason: MinimumReplicasAvailable
          Message: Deployment has minimum availability.
          Type: Progressing
          Status: True
          Reason: NewReplicaSetAvailable
          Message: ReplicaSet "llm-svc-deployment-649b7fbd7" has successfully progressed.
      Deployment:apps/v1:redis-vector-db-deployment:dataprep: |
        Replicas: 1 desired | 1 updated | 1 total | 1 available | 0 unavailable
        Conditions:
          Type: Available
          Status: True
          Reason: MinimumReplicasAvailable
          Message: Deployment has minimum availability.
          Type: Progressing
          Status: True
          Reason: NewReplicaSetAvailable
          Message: ReplicaSet "redis-vector-db-deployment-587844d666" has successfully progressed.
      Deployment:apps/v1:reranking-svc-deployment:dataprep: |
        Replicas: 1 desired | 1 updated | 1 total | 1 available | 0 unavailable
        Conditions:
          Type: Available
          Status: True
          Reason: MinimumReplicasAvailable
          Message: Deployment has minimum availability.
          Type: Progressing
          Status: True
          Reason: NewReplicaSetAvailable
          Message: ReplicaSet "reranking-svc-deployment-7745c7cf98" has successfully progressed.
      Deployment:apps/v1:retriever-svc-deployment:dataprep: |
        Replicas: 1 desired | 1 updated | 1 total | 1 available | 0 unavailable
        Conditions:
          Type: Available
          Status: True
          Reason: MinimumReplicasAvailable
          Message: Deployment has minimum availability.
          Type: Progressing
          Status: True
          Reason: NewReplicaSetAvailable
          Message: ReplicaSet "retriever-svc-deployment-795ccd4f84" has successfully progressed.
      Deployment:apps/v1:router-service-deployment:dataprep: |
        Replicas: 1 desired | 1 updated | 2 total | 1 available | 1 unavailable
        Conditions:
          Type: Available
          Status: True
          Reason: MinimumReplicasAvailable
          Message: Deployment has minimum availability.
          Type: Progressing
          Status: True
          Reason: ReplicaSetUpdated
          Message: ReplicaSet "router-service-deployment-6dcc4bc568" is progressing.
      Deployment:apps/v1:tei-embedding-svc-deployment:dataprep: |
        Replicas: 1 desired | 1 updated | 1 total | 1 available | 0 unavailable
        Conditions:
          Type: Available
          Status: True
          Reason: MinimumReplicasAvailable
          Message: Deployment has minimum availability.
          Type: Progressing
          Status: True
          Reason: NewReplicaSetAvailable
          Message: ReplicaSet "tei-embedding-svc-deployment-54b58d57cb" has successfully progressed.
      Deployment:apps/v1:tei-reranking-svc-deployment:dataprep: |
        Replicas: 1 desired | 1 updated | 1 total | 1 available | 0 unavailable
        Conditions:
          Type: Available
          Status: True
          Reason: MinimumReplicasAvailable
          Message: Deployment has minimum availability.
          Type: Progressing
          Status: True
          Reason: NewReplicaSetAvailable
          Message: ReplicaSet "tei-reranking-svc-deployment-54c5dd5795" has successfully progressed.
      Deployment:apps/v1:tgi-service-m-deployment:dataprep: |
        Replicas: 1 desired | 1 updated | 1 total | 1 available | 0 unavailable
        Conditions:
          Type: Available
          Status: True
          Reason: MinimumReplicasAvailable
          Message: Deployment has minimum availability.
          Type: Progressing
          Status: True
          Reason: NewReplicaSetAvailable
          Message: ReplicaSet "tgi-service-m-deployment-5fcff459f5" has successfully progressed.
      Service:v1:data-prep-svc:dataprep: http://data-prep-svc.dataprep.svc.cluster.local:6007/v1/dataprep
      Service:v1:embedding-svc:dataprep: http://embedding-svc.dataprep.svc.cluster.local:6000/v1/embeddings
      Service:v1:llm-svc:dataprep: http://llm-svc.dataprep.svc.cluster.local:9000/v1/chat/completions
      Service:v1:redis-vector-db:dataprep: http://redis-vector-db.dataprep.svc.cluster.local:6379
      Service:v1:reranking-svc:dataprep: http://reranking-svc.dataprep.svc.cluster.local:8000/v1/reranking
      Service:v1:retriever-svc:dataprep: http://retriever-svc.dataprep.svc.cluster.local:7000/v1/retrieval
      Service:v1:router-service:dataprep: http://router-service.dataprep.svc.cluster.local:8080
      Service:v1:tei-embedding-svc:dataprep: http://tei-embedding-svc.dataprep.svc.cluster.local:80
      Service:v1:tei-reranking-svc:dataprep: http://tei-reranking-svc.dataprep.svc.cluster.local:80/rerank
      Service:v1:tgi-service-m:dataprep: http://tgi-service-m.dataprep.svc.cluster.local:80/generate

delete gmc pipeline

spec changed false | meta changed: true
Reconciling connector graph apiVersion gmc.opea.io/v1alpha3 graph codegen
delete resource Service tgi-service codegen
Success to delete Service tgi-service codegen
delete resource ConfigMap llm-uservice-config codegen
Success to delete ConfigMap llm-uservice-config codegen
delete resource ConfigMap tgi-config codegen
Success to delete ConfigMap tgi-config codegen
delete resource Deployment llm-service-deployment codegen
Success to delete Deployment llm-service-deployment codegen
delete resource Deployment router-service-deployment codegen
Success to delete Deployment router-service-deployment codegen
delete resource Deployment tgi-service-deployment codegen
Success to delete Deployment tgi-service-deployment codegen
delete resource Service llm-service codegen
Success to delete Service llm-service codegen
delete resource Service router-service codegen
Success to delete Service router-service codegen

root@cis-gms-worker-3:~/zkf/repo/kfreez/GenAIInfra# kubectl delete gmc -n codegen codegen 
gmconnector.gmc.opea.io "codegen" deleted
root@cis-gms-worker-3:~/zkf/repo/kfreez/GenAIInfra# 
root@cis-gms-worker-3:~/zkf/repo/kfreez/GenAIInfra# 
root@cis-gms-worker-3:~/zkf/repo/kfreez/GenAIInfra# kubectl get deployment -n codegen 
No resources found in codegen namespace.
root@cis-gms-worker-3:~/zkf/repo/kfreez/GenAIInfra# kubectl get service -n codegen 
No resources found in codegen namespace.
root@cis-gms-worker-3:~/zkf/repo/kfreez/GenAIInfra# kubectl get cm -n codegen 
NAME               DATA   AGE

delete delta config
deploy a codegen example

root@cis-gms-worker-3:~/zkf/repo/kfreez/GenAIInfra# kubectl -n codegen apply -f microservices-connector/config/samples/codegen_xeon.yaml
gmconnector.gmc.opea.io/codegen configured
root@cis-gms-worker-3:~/zkf/repo/kfreez/GenAIInfra# kubectl get deployment -n codegen
NAME                        READY   UP-TO-DATE   AVAILABLE   AGE
llm-service-deployment      1/1     1            1           77m
router-service-deployment   1/1     1            1           77m
tgi-service-deployment      0/1     1            0           77m

remove the llm step

root@cis-gms-worker-3:~/zkf/repo/kfreez/GenAIInfra# kubectl get gmc codegen -n codegen -o yaml
apiVersion: gmc.opea.io/v1alpha3
kind: GMConnector
metadata:
  annotations:
    kubectl.kubernetes.io/last-applied-configuration: |
      {"apiVersion":"gmc.opea.io/v1alpha3","kind":"GMConnector","metadata":{"annotations":{},"labels":{"app.kubernetes.io/managed-by":"kustomize","app.kubernetes.io/name":"gmconnector","gmc/platform":"xeon"},"name":"codegen","namespace":"codegen"},"spec":{"nodes":{"root":{"routerType":"Sequence","steps":[{"data":"$response","internalService":{"config":{"TGI_LLM_ENDPOINT":"tgi-service","endpoint":"/v1/chat/completions"},"serviceName":"llm-service"},"name":"Llm"},{"internalService":{"config":{"MODEL_ID":"ise-uiuc/Magicoder-S-DS-6.7B","endpoint":"/generate"},"isDownstreamService":true,"serviceName":"tgi-service"},"name":"Tgi"}]}},"routerConfig":{"name":"router","serviceName":"router-service"}}}
  creationTimestamp: "2024-08-05T01:44:52Z"
  finalizers:
  - gmcFinalizer
  generation: 7
  labels:
    app.kubernetes.io/managed-by: kustomize
    app.kubernetes.io/name: gmconnector
    gmc/platform: xeon
  name: codegen
  namespace: codegen
  resourceVersion: "10108466"
  uid: 4afaedd2-dcdf-4fcd-94b9-6372e561cf6b
spec:
  nodes:
    root:
      routerType: Sequence
      steps:
      - internalService:
          config:
            MODEL_ID: ise-uiuc/Magicoder-S-DS-6.7B
            endpoint: /generate
          isDownstreamService: true
          serviceName: tgi-service
        name: Tgi
  routerConfig:
    name: router
    nameSpace: ""
    serviceName: router-service
status:
  accessUrl: http://router-service.codegen.svc.cluster.local:8080
  annotations:
    ConfigMap:v1:tgi-config:codegen: provisioned
    Deployment:apps/v1:router-service-deployment:codegen: "Status:True\n\tReason:NewReplicaSetAvailable\n\tMessageReplicaSet
      \"router-service-deployment-9cd877b6b\" has successfully progressed."
    Deployment:apps/v1:tgi-service-deployment:codegen: "Status:False\n\tReason:ProgressDeadlineExceeded\n\tMessageReplicaSet
      \"tgi-service-deployment-95dfc4575\" has timed out progressing."
    Service:v1:router-service:codegen: http://router-service.codegen.svc.cluster.local:8080
    Service:v1:tgi-service:codegen: http://tgi-service.codegen.svc.cluster.local:80/generate
  condition: {}
  status: 1/0/2

controller log:

spec changed true | meta changed: false
Reconciling connector graph apiVersion gmc.opea.io/v1alpha3 graph codegen

reconcile resource for node: Tgi
trying to reconcile internal service [ tgi-service ] in namespace  
get resource config: {Tgi { {tgi-service  map[MODEL_ID:ise-uiuc/Magicoder-S-DS-6.7B endpoint:/generate] true} }    }
The raw yaml file has been split into 4 yaml files
Success to reconcile ConfigMap: tgi-config
Success to reconcile Service: tgi-service
Success to reconcile Deployment: tgi-service-deployment
the service URL is: http://tgi-service.codegen.svc.cluster.local:80/generate

user config {codegen router-service router-service-deployment    '{"nodes":{"root":{"routerType":"Sequence","steps":[{"name":"Tgi","internalService":{"serviceName":"tgi-service","config":{"MODEL_ID":"ise-uiuc/Magicoder-S-DS-6.7B","endpoint":"/generate"},"isDownstreamService":true}}]}},"routerConfig":{"name":"router","serviceName":"router-service","nameSpace":"","config":null}}'}
Success to reconcile Deployment: router-service-deployment
Success to reconcile Service: router-service
the router URL is: http://router-service.codegen.svc.cluster.local:8080

spec changed false | meta changed: false
Success to delete Service:v1:llm-service:codegen
Success to delete ConfigMap:v1:llm-uservice-config:codegen
Success to delete Deployment:apps/v1:llm-service-deployment:codegen

result:

root@cis-gms-worker-3:~/zkf/repo/kfreez/GenAIInfra# kubectl get deployment -n codegen
NAME                        READY   UP-TO-DATE   AVAILABLE   AGE
router-service-deployment   1/1     1            1           77m
tgi-service-deployment      0/1     1            0           77m

update based on resource status changing

only router service is up when pipeline is deployed

root@cis-gms-worker-3:~# kubectl get gmc -n codegen
NAME      URL                                                    STATUS   AGE
codegen   http://router-service.codegen.svc.cluster.local:8080   1/0/3    28s
root@cis-gms-worker-3:~#
root@cis-gms-worker-3:~# kubectl get deployment -n codegen
NAME                        READY   UP-TO-DATE   AVAILABLE   AGE
llm-service-deployment      0/1     1            0           34s
router-service-deployment   1/1     1            1           33s
tgi-service-deployment      0/1     1            0           33s

llm service is up after 6 min, the event triggers the update

| codegen:llm-service-deployment: status changed from : False to True|
-----------------Reconciling GMConnector namespace codegen name codegen -------------------------
Reconciling kind  GMConnector apiVersion  gmc.opea.io/v1alpha3  graph  codegen

reconcile resource for node: Llm
trying to reconcile internal service [ llm-service ] in namespace  
get resource config: {Llm { {llm-service  map[TGI_LLM_ENDPOINT:tgi-service endpoint:/v1/chat/completions] false} } $response   }
The raw yaml file has been split into 4 yaml files
Success to reconcile ConfigMap: llm-uservice-config
Success to reconcile Service: llm-service
find downstream service for Llm with name tgi-service 
Success to reconcile Deployment: llm-service-deployment
the service URL is: http://llm-service.codegen.svc.cluster.local:9000/v1/chat/completions

reconcile resource for node: Tgi
trying to reconcile internal service [ tgi-service ] in namespace  
get resource config: {Tgi { {tgi-service  map[MODEL_ID:ise-uiuc/Magicoder-S-DS-6.7B endpoint:/generate] true} }    }
The raw yaml file has been split into 4 yaml files
Success to reconcile ConfigMap: tgi-config
Success to reconcile Service: tgi-service
Success to reconcile Deployment: tgi-service-deployment
the service URL is: http://tgi-service.codegen.svc.cluster.local:80/generate

user config {codegen router-service router-service-deployment    '{"metadata":{"creationTimestamp":null},"spec":{"nodes":{"root":{"routerType":"Sequence","steps":[{"name":"Llm","internalService":{"serviceName":"llm-service","config":{"TGI_LLM_ENDPOINT":"tgi-service","endpoint":"/v1/chat/completions"}},"data":"$response","serviceUrl":"http://llm-service.codegen.svc.cluster.local:9000/v1/chat/completions"},{"name":"Tgi","internalService":{"serviceName":"tgi-service","config":{"MODEL_ID":"ise-uiuc/Magicoder-S-DS-6.7B","endpoint":"/generate"},"isDownstreamService":true},"serviceUrl":"http://tgi-service.codegen.svc.cluster.local:80/generate"}]}},"routerConfig":{"name":"router","serviceName":"router-service","nameSpace":"","config":null}},"status":{"condition":{"lastUpdateTime":null}}}'}
Success to reconcile Deployment: router-service-deployment
Success to reconcile Service: router-service
the router URL is: http://router-service.codegen.svc.cluster.local:8080

| spec changed false | meta changed: false |

the gmc's status is updated accordingly

root@cis-gms-worker-3:~# kubectl get pods -n codegen
NAME                                         READY   STATUS              RESTARTS   AGE
llm-service-deployment-6f45f9cf64-rqmsn      1/1     Running             0          6m46s
router-service-deployment-559645d584-vhws8   1/1     Running             0          6m45s
tgi-service-deployment-855cb977c6-hh9jm      0/1     ContainerCreating   0          6m45s
root@cis-gms-worker-3:~# kubectl get gmc -n codegen
NAME      URL                                                    STATUS   AGE
codegen   http://router-service.codegen.svc.cluster.local:8080   2/0/3    6m50s
root@cis-gms-worker-3:~# kubectl get gmc -n codegen -o yaml
apiVersion: v1
items:
- apiVersion: gmc.opea.io/v1alpha3
  kind: GMConnector
  metadata:
    annotations:
      kubectl.kubernetes.io/last-applied-configuration: |
        {"apiVersion":"gmc.opea.io/v1alpha3","kind":"GMConnector","metadata":{"annotations":{},"labels":{"app.kubernetes.io/managed-by":"kustomize","app.kubernetes.io/name":"gmconnector","gmc/platform":"xeon"},"name":"codegen","namespace":"codegen"},"spec":{"nodes":{"root":{"routerType":"Sequence","steps":[{"data":"$response","internalService":{"config":{"TGI_LLM_ENDPOINT":"tgi-service","endpoint":"/v1/chat/completions"},"serviceName":"llm-service"},"name":"Llm"},{"internalService":{"config":{"MODEL_ID":"ise-uiuc/Magicoder-S-DS-6.7B","endpoint":"/generate"},"isDownstreamService":true,"serviceName":"tgi-service"},"name":"Tgi"}]}},"routerConfig":{"name":"router","serviceName":"router-service"}}}
    creationTimestamp: "2024-08-14T13:18:07Z"
    generation: 1
    labels:
      app.kubernetes.io/managed-by: kustomize
      app.kubernetes.io/name: gmconnector
      gmc/platform: xeon
    name: codegen
    namespace: codegen
    resourceVersion: "11597342"
    uid: c7486905-bc33-4b64-a558-2097b48b6187
  spec:
    nodes:
      root:
        routerType: Sequence
        steps:
        - data: $response
          internalService:
            config:
              TGI_LLM_ENDPOINT: tgi-service
              endpoint: /v1/chat/completions
            serviceName: llm-service
          name: Llm
        - internalService:
            config:
              MODEL_ID: ise-uiuc/Magicoder-S-DS-6.7B
              endpoint: /generate
            isDownstreamService: true
            serviceName: tgi-service
          name: Tgi
    routerConfig:
      name: router
      serviceName: router-service
  status:
    accessUrl: http://router-service.codegen.svc.cluster.local:8080
    annotations:
      ConfigMap:v1:llm-uservice-config:codegen: provisioned
      ConfigMap:v1:tgi-config:codegen: provisioned
      Deployment:apps/v1:llm-service-deployment:codegen: |
        Replicas: 1 desired | 1 updated | 1 total | 1 available | 0 unavailable
        Conditions:
          Type: Available
          Status: True
          Reason: MinimumReplicasAvailable
          Message: Deployment has minimum availability.
          Type: Progressing
          Status: True
          Reason: NewReplicaSetAvailable
          Message: ReplicaSet "llm-service-deployment-6f45f9cf64" has successfully progressed.
      Deployment:apps/v1:router-service-deployment:codegen: |
        Replicas: 1 desired | 1 updated | 1 total | 1 available | 0 unavailable
        Conditions:
          Type: Available
          Status: True
          Reason: MinimumReplicasAvailable
          Message: Deployment has minimum availability.
          Type: Progressing
          Status: True
          Reason: NewReplicaSetAvailable
          Message: ReplicaSet "router-service-deployment-559645d584" has successfully progressed.
      Deployment:apps/v1:tgi-service-deployment:codegen: |
        Replicas: 1 desired | 1 updated | 1 total | 0 available | 1 unavailable
        Conditions:
          Type: Available
          Status: False
          Reason: MinimumReplicasUnavailable
          Message: Deployment does not have minimum availability.
          Type: Progressing
          Status: True
          Reason: ReplicaSetUpdated
          Message: ReplicaSet "tgi-service-deployment-855cb977c6" is progressing.
      Service:v1:llm-service:codegen: http://llm-service.codegen.svc.cluster.local:9000/v1/chat/completions
      Service:v1:router-service:codegen: http://router-service.codegen.svc.cluster.local:8080
      Service:v1:tgi-service:codegen: http://tgi-service.codegen.svc.cluster.local:80/generate
    condition: {}
    status: 2/0/3
kind: List
metadata:
  resourceVersion: ""
root@cis-gms-worker-3:~#

Signed-off-by: KfreeZ <kefei.zhang@intel.com>

zhlsunshine · 2024-08-08T07:43:12Z

microservices-connector/internal/controller/gmconnector_controller.go

+	var success uint = 0
+	// graph.SetFinalizers(append(graph.GetFinalizers(), fmt.Sprintf("%s-.-%s-.-%s", obj.GetKind(), obj.GetNamespace(), obj.GetName())))
+	// save the resource name into annotation for status update and resource management
+	graph.Status.Annotations[fmt.Sprintf("%s:%s:%s:%s", obj.GetKind(), obj.GetAPIVersion(), obj.GetName(), obj.GetNamespace())] = "provisioned"


Hi @KfreeZ, is there any possible to simply the Annotations to obj.GetName():obj.GetNamespace()

I think not, the ApiVersion is needed when I delete this resource.

zhlsunshine · 2024-08-08T07:49:16Z

microservices-connector/internal/controller/gmconnector_controller.go

+	// save the resource name into annotation for status update and resource management
+	graph.Status.Annotations[fmt.Sprintf("%s:%s:%s:%s", obj.GetKind(), obj.GetAPIVersion(), obj.GetName(), obj.GetNamespace())] = "provisioned"
+
+	if obj.GetKind() == Service {


Hi @KfreeZ, is it more simply if we can separately handle Service and Deployment?

Signed-off-by: KfreeZ <kefei.zhang@intel.com>

…into deleteResource

Signed-off-by: KfreeZ <kefei.zhang@intel.com>

irisdingbj · 2024-08-12T18:47:33Z

microservices-connector/internal/controller/gmconnector_controller.go

@@ -153,6 +158,16 @@ func reconcileResource(ctx context.Context, client client.Client, graphNs string
 			obj.SetNamespace(ns)
 		}

+		// set the owner reference for auto deleting the resources when GMC is deleted
+		obj.SetOwnerReferences([]metav1.OwnerReference{


ownerRef can only clean up reousrces in the same namespace, Let's decide how we want to handle this.

irisdingbj · 2024-08-12T20:01:39Z

microservices-connector/internal/controller/gmconnector_controller.go

@@ -643,5 +789,7 @@ func (r *GMConnectorReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&mcv1alpha3.GMConnector{}).
 		WithEventFilter(ignoreStatusUpdatePredicate). // Use the predicate here
+		Owns(&appsv1.Deployment{}).


suppose we can also get service and deployment update and we can Update Status in annotation as well

Signed-off-by: KfreeZ <kefei.zhang@intel.com>

…into deleteResource

Signed-off-by: KfreeZ <kefei.zhang@intel.com>

KfreeZ · 2024-08-15T08:42:45Z

@irisdingbj @zhlsunshine this PR is ready for review

irisdingbj

We will also need to add e2e cases to cover the different scenarios supported in this PR.

irisdingbj · 2024-08-15T20:44:01Z

microservices-connector/internal/controller/gmconnector_controller.go

@@ -66,6 +72,7 @@ const (
 	SpeechT5Gaudi            = "SpeechT5Gaudi"
 	Whisper                  = "Whisper"
 	WhisperGaudi             = "WhisperGaudi"
+	gmcFinalizer             = "gmcFinalizer"


This is useless now?

irisdingbj · 2024-08-15T20:45:21Z

microservices-connector/internal/controller/gmconnector_controller.go

@@ -212,13 +221,28 @@ func reconcileResource(ctx context.Context, client client.Client, graphNs string
 				}
 			}

+			// // although apply a same config to k8s is fine, but we don't want to do it


are we applying the same config or not? this comments are confusing

irisdingbj · 2024-08-15T21:13:21Z

microservices-connector/internal/controller/gmconnector_controller.go

+	}
+}
+
+func (r *GMConnectorReconciler) collectResourceStatus(graph *mcv1alpha3.GMConnector, ctx context.Context, externalServiceCnt int) error {


better to change this to collectDeploymentStatus since this collects for deployment only

zhlsunshine · 2024-08-16T01:20:58Z

microservices-connector/internal/controller/gmconnector_controller.go

-func reconcileRouterService(ctx context.Context, client client.Client, graph *mcv1alpha3.GMConnector) error {
-	routerService := &corev1.Service{}
-	jsonBytes, err := json.Marshal(graph)
+func (r *GMConnectorReconciler) reconcileRouterService(ctx context.Context, client client.Client, graph *mcv1alpha3.GMConnector) error {


Hi @KfreeZ, I notice that there is client.Client in r, it's unnecessary to pass client into this function.

Signed-off-by: KfreeZ <kefei.zhang@intel.com>

…into deleteResource

Signed-off-by: KfreeZ <kefei.zhang@intel.com>

zhlsunshine

We can merge these code into main branch firstly, then @KfreeZ please fix the bugs and comments in extra PRs.

initial commit for resource manangement feature

5294ade

Signed-off-by: KfreeZ <kefei.zhang@intel.com>

KfreeZ changed the title ~~initial commit for resource manangement feature~~ GMC: resource management Aug 3, 2024

KfreeZ marked this pull request as draft August 3, 2024 14:19

KfreeZ changed the title ~~GMC: resource management~~ [WIP] GMC: resource management Aug 3, 2024

KfreeZ added 8 commits August 4, 2024 17:26

delete resource when delete GMC pipeline

26550cf

Signed-off-by: KfreeZ <kefei.zhang@intel.com>

merge with upstrea main

3db58fa

Signed-off-by: KfreeZ <kefei.zhang@intel.com>

Merge remote-tracking branch 'upstream/main' into deleteResource

b2de8a4

reduce duplicated code

6050242

Signed-off-by: KfreeZ <kefei.zhang@intel.com>

avoid uncleared finalizer blocks the delete procedure

5528497

Signed-off-by: KfreeZ <kefei.zhang@intel.com>

use owner reference

40a7702

Signed-off-by: KfreeZ <kefei.zhang@intel.com>

use owner reference for deletetion

92456ae

Signed-off-by: KfreeZ <kefei.zhang@intel.com>

Merge branch 'main' into deleteResource

ce33ad4

zhlsunshine reviewed Aug 8, 2024

View reviewed changes

KfreeZ added 8 commits August 8, 2024 16:01

enhance status messages

abbcde0

Signed-off-by: KfreeZ <kefei.zhang@intel.com>

Merge branch 'deleteResource' of https://github.com/KfreeZ/GenAIInfra …

0109168

…into deleteResource

make lint happy

2a4e939

Signed-off-by: KfreeZ <kefei.zhang@intel.com>

Merge remote-tracking branch 'upstream/main' into deleteResource

b429d78

adjust unit test

d28e3a8

Signed-off-by: KfreeZ <kefei.zhang@intel.com>

update ut

9b67b39

Signed-off-by: KfreeZ <kefei.zhang@intel.com>

fix passing incomplete config to router

e3561a7

Signed-off-by: KfreeZ <kefei.zhang@intel.com>

Merge branch 'main' into deleteResource

cb981ce

KfreeZ marked this pull request as ready for review August 12, 2024 08:21

KfreeZ changed the title ~~[WIP] GMC: resource management~~ GMC: resource management Aug 12, 2024

irisdingbj reviewed Aug 12, 2024

View reviewed changes

KfreeZ added 3 commits August 14, 2024 21:32

trigger status update on the events

b60ad04

Signed-off-by: KfreeZ <kefei.zhang@intel.com>

Merge branch 'deleteResource' of https://github.com/KfreeZ/GenAIInfra …

b70da34

…into deleteResource

Merge branch 'main' into deleteResource

85a7c63

KfreeZ mentioned this pull request Aug 15, 2024

GMC: Watch cr status #117

Closed

3 tasks

seperate the provision and status update logic

79d9c17

Signed-off-by: KfreeZ <kefei.zhang@intel.com>

irisdingbj reviewed Aug 15, 2024

View reviewed changes

Merge branch 'main' into deleteResource

640fc38

zhlsunshine reviewed Aug 16, 2024

View reviewed changes

KfreeZ added 4 commits August 16, 2024 12:01

1. add e2e tests 2.change according comments

67d8753

Signed-off-by: KfreeZ <kefei.zhang@intel.com>

fix e2e error

01b7b0b

Signed-off-by: KfreeZ <kefei.zhang@intel.com>

fix e2e err

16634f7

Signed-off-by: KfreeZ <kefei.zhang@intel.com>

fix e2e err

12813d2

Signed-off-by: KfreeZ <kefei.zhang@intel.com>

daisy-ycguo approved these changes Aug 16, 2024

View reviewed changes

KfreeZ added 16 commits August 16, 2024 19:20

fix e2e err

18a880f

Signed-off-by: KfreeZ <kefei.zhang@intel.com>

fix e2e err

7612626

Signed-off-by: KfreeZ <kefei.zhang@intel.com>

update status after update graph

a01aee1

Signed-off-by: KfreeZ <kefei.zhang@intel.com>

fix e2e err

e47b286

Signed-off-by: KfreeZ <kefei.zhang@intel.com>

Merge branch 'main' into deleteResource

7db6373

fix e2e err

dfadc60

Signed-off-by: KfreeZ <kefei.zhang@intel.com>

Merge branch 'deleteResource' of https://github.com/KfreeZ/GenAIInfra …

cb6fe5d

…into deleteResource

fix lint err

44383c1

Signed-off-by: KfreeZ <kefei.zhang@intel.com>

fix shell lint

1ce935f

Signed-off-by: KfreeZ <kefei.zhang@intel.com>

fix shell lint err

00c6515

Signed-off-by: KfreeZ <kefei.zhang@intel.com>

fix e2e err

03071a5

Signed-off-by: KfreeZ <kefei.zhang@intel.com>

fix e2e err

9585f66

Signed-off-by: KfreeZ <kefei.zhang@intel.com>

fix e2e err

9543833

Signed-off-by: KfreeZ <kefei.zhang@intel.com>

fix e2e err

41976f4

Signed-off-by: KfreeZ <kefei.zhang@intel.com>

fix e2e err

dcc1d34

Signed-off-by: KfreeZ <kefei.zhang@intel.com>

fix e2e err

5293588

Signed-off-by: KfreeZ <kefei.zhang@intel.com>

zhlsunshine approved these changes Aug 17, 2024

View reviewed changes

KfreeZ merged commit 81060ab into opea-project:main Aug 17, 2024
9 checks passed

This was referenced Aug 22, 2024

GMC enhancement: update time is long if resources are scaled #228

Closed

GMC opearator doesn't reflect #192

Closed

KfreeZ deleted the deleteResource branch August 30, 2024 00:54

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

GMC: resource management #259

GMC: resource management #259

KfreeZ commented Aug 3, 2024 •

edited

Loading

zhlsunshine Aug 8, 2024

KfreeZ Aug 8, 2024

zhlsunshine Aug 8, 2024

irisdingbj Aug 12, 2024

irisdingbj Aug 12, 2024

KfreeZ commented Aug 15, 2024

irisdingbj left a comment

irisdingbj Aug 15, 2024

irisdingbj Aug 15, 2024

irisdingbj Aug 15, 2024

zhlsunshine Aug 16, 2024

zhlsunshine left a comment

GMC: resource management #259

GMC: resource management #259

Conversation

KfreeZ commented Aug 3, 2024 • edited Loading

Description

Issues

Type of change

Dependencies

Tests

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

KfreeZ commented Aug 15, 2024

irisdingbj left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

zhlsunshine left a comment

Choose a reason for hiding this comment

KfreeZ commented Aug 3, 2024 •

edited

Loading