From cccb1cb7181059ecdab7ca994aa8721c59dc9ab1 Mon Sep 17 00:00:00 2001 From: Bangqi Zhu <68867834+bangqipropel@users.noreply.github.com> Date: Fri, 4 Oct 2024 10:15:18 -0700 Subject: [PATCH 1/2] feat: add WorkerNodes to RAGEngineStatus (#612) **Reason for Change**: add WorkerNodes to RAGEngineStatus **Requirements** - [ ] added unit tests and e2e tests (if applicable). **Issue Fixed**: **Notes for Reviewers**: Signed-off-by: Bangqi Zhu Co-authored-by: Bangqi Zhu --- Makefile | 1 + api/v1alpha1/ragengine_types.go | 4 ++++ charts/kaito/ragengine/crds/kaito.sh_ragengines.yaml | 6 ++++++ config/crd/bases/kaito.sh_ragengines.yaml | 6 ++++++ 4 files changed, 17 insertions(+) diff --git a/Makefile b/Makefile index 59d09d7e3..752602baa 100644 --- a/Makefile +++ b/Makefile @@ -81,6 +81,7 @@ SHELL = /usr/bin/env bash -o pipefail manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects. $(CONTROLLER_GEN) rbac:roleName=manager-role crd webhook paths="./..." output:crd:artifacts:config=config/crd/bases cp config/crd/bases/kaito.sh_workspaces.yaml charts/kaito/workspace/crds/ + cp config/crd/bases/kaito.sh_ragengines.yaml charts/kaito/ragengine/crds/ .PHONY: generate generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations. diff --git a/api/v1alpha1/ragengine_types.go b/api/v1alpha1/ragengine_types.go index a5d35205e..5a79ffaa6 100644 --- a/api/v1alpha1/ragengine_types.go +++ b/api/v1alpha1/ragengine_types.go @@ -79,6 +79,10 @@ type RAGEngineSpec struct { // RAGEngineStatus defines the observed state of RAGEngine type RAGEngineStatus struct { + // WorkerNodes is the list of nodes chosen to run the workload based on the RAGEngine resource requirement. + // +optional + WorkerNodes []string `json:"workerNodes,omitempty"` + Conditions []metav1.Condition `json:"conditions,omitempty"` } diff --git a/charts/kaito/ragengine/crds/kaito.sh_ragengines.yaml b/charts/kaito/ragengine/crds/kaito.sh_ragengines.yaml index f7b18cd63..3b5f7407d 100644 --- a/charts/kaito/ragengine/crds/kaito.sh_ragengines.yaml +++ b/charts/kaito/ragengine/crds/kaito.sh_ragengines.yaml @@ -261,6 +261,12 @@ spec: - type type: object type: array + workerNodes: + description: WorkerNodes is the list of nodes chosen to run the workload + based on the RAGEngine resource requirement. + items: + type: string + type: array type: object type: object served: true diff --git a/config/crd/bases/kaito.sh_ragengines.yaml b/config/crd/bases/kaito.sh_ragengines.yaml index f7b18cd63..3b5f7407d 100644 --- a/config/crd/bases/kaito.sh_ragengines.yaml +++ b/config/crd/bases/kaito.sh_ragengines.yaml @@ -261,6 +261,12 @@ spec: - type type: object type: array + workerNodes: + description: WorkerNodes is the list of nodes chosen to run the workload + based on the RAGEngine resource requirement. + items: + type: string + type: array type: object type: object served: true From 2b07c299cb88fdb21eb72275d73e5bbba83af502 Mon Sep 17 00:00:00 2001 From: Ishaan Sehgal Date: Tue, 8 Oct 2024 08:50:19 -0700 Subject: [PATCH 2/2] fix: Update kaito-e2e.yml (#614) **Reason for Change**: Prevent auto run of az-karpenter while its WIP Signed-off-by: Ishaan Sehgal --- .github/workflows/kaito-e2e.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/kaito-e2e.yml b/.github/workflows/kaito-e2e.yml index 68967ad28..1ed05c209 100644 --- a/.github/workflows/kaito-e2e.yml +++ b/.github/workflows/kaito-e2e.yml @@ -20,7 +20,7 @@ jobs: strategy: fail-fast: false matrix: - node-provisioner: [gpuprovisioner, azkarpenter] + node-provisioner: [gpuprovisioner] # WIP: azkarpenter] permissions: contents: read id-token: write