Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Copy-paste microservices-connector changes from EnterpriseRAG (only for discussion purposes) #644

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Copy-paste microservices-connector changes from EnterpriseRAG (only for discussion purposes) #644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions microservices-connector/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,12 +119,12 @@ docker.build: manager-image router-image
# Build manager Docker image
manager-image:
@echo "Building manager Docker image..."
$(CONTAINER_TOOL) build -t $(DOCKER_REGISTRY)/${CTR_IMG}:$(VERSION) -f Dockerfile.manager .
$(CONTAINER_TOOL) build --build-arg https_proxy --build-arg http_proxy -t $(DOCKER_REGISTRY)/${CTR_IMG}:$(VERSION) -f Dockerfile.manager .

# Build router Docker image
router-image:
@echo "Building router Docker image..."
$(CONTAINER_TOOL) build -t $(DOCKER_REGISTRY)/${ROUTER_IMG}:$(VERSION) -f Dockerfile.router .
$(CONTAINER_TOOL) build --build-arg https_proxy --build-arg http_proxy -t $(DOCKER_REGISTRY)/${ROUTER_IMG}:$(VERSION) -f Dockerfile.router .

# Publish manager and router docker images
.PHONY: docker.push
Expand Down Expand Up @@ -192,7 +192,7 @@ uninstall: manifests kustomize ## Uninstall CRDs from the K8s cluster specified

.PHONY: deploy
deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config.
cd config/manager && $(KUSTOMIZE) edit set image controller=${CTR_IMG}
cd config/manager && $(KUSTOMIZE) edit set image controller=$(DOCKER_REGISTRY)/${CTR_IMG}:$(VERSION)
$(KUSTOMIZE) build config/default | $(KUBECTL) apply -f -

.PHONY: undeploy
Expand All @@ -215,7 +215,7 @@ GOLANGCI_LINT = $(LOCALBIN)/golangci-lint-$(GOLANGCI_LINT_VERSION)

## Tool Versions
KUSTOMIZE_VERSION ?= v5.3.0
CONTROLLER_TOOLS_VERSION ?= v0.14.0
CONTROLLER_TOOLS_VERSION ?= v0.15.0
ENVTEST_VERSION ?= release-0.17
GOLANGCI_LINT_VERSION ?= v1.57.2

Expand Down
12 changes: 12 additions & 0 deletions microservices-connector/api/v1alpha3/gmconnector_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,18 @@ const (
Tgi StepNameType = "Tgi"
// Llm
Llm StepNameType = "Llm"
// LLMGuardInput
LLMGuardInput StepNameType = "LLMGuardInput"
// LLMGuardOutput
LLMGuardOutput StepNameType = "LLMGuardOutput"
// VLLMGaudi
VLLMGaudi StepNameType = "VLLMGaudi"
// VLLM
VLLM StepNameType = "VLLM"
// VLLMOpenVino
VLLMOpenVino StepNameType = "VLLMOpenVino"
// Language-Detection
LanguageDetection StepNameType = "LanguageDetection"
)

type Executor struct {
Expand Down
13 changes: 12 additions & 1 deletion microservices-connector/api/v1alpha3/validating_webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,18 @@ var (
"Whisper",
"WhisperGaudi",
"DataPrep",
"UI",

// EntRag specific
// please keep that in sync with internal/controller/gmconnector_controller.go:41 const section
"Ingestion",
"TorchserveEmbedding",
"TorchserveEmbeddingGaudi",
"LLMGuardInput",
"LLMGuardOutput",
"VLLMGaudi",
"VLLM",
"VLLMOpenVino",
"LanguageDetection",
}
)

Expand Down
2 changes: 1 addition & 1 deletion microservices-connector/api/v1alpha3/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading