Skip to content

Commit de22d7b

Browse files
committed
copy-past microservices-connector changes from EnterpriseRAG
1 parent e9dc58a commit de22d7b

15 files changed

Lines changed: 900 additions & 383 deletions

File tree

microservices-connector/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,12 +119,12 @@ docker.build: manager-image router-image
119119
# Build manager Docker image
120120
manager-image:
121121
@echo "Building manager Docker image..."
122-
$(CONTAINER_TOOL) build -t $(DOCKER_REGISTRY)/${CTR_IMG}:$(VERSION) -f Dockerfile.manager .
122+
$(CONTAINER_TOOL) build --build-arg https_proxy --build-arg http_proxy -t $(DOCKER_REGISTRY)/${CTR_IMG}:$(VERSION) -f Dockerfile.manager .
123123

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

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

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

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

216216
## Tool Versions
217217
KUSTOMIZE_VERSION ?= v5.3.0
218-
CONTROLLER_TOOLS_VERSION ?= v0.14.0
218+
CONTROLLER_TOOLS_VERSION ?= v0.15.0
219219
ENVTEST_VERSION ?= release-0.17
220220
GOLANGCI_LINT_VERSION ?= v1.57.2
221221

microservices-connector/api/v1alpha3/gmconnector_types.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,18 @@ const (
6969
Tgi StepNameType = "Tgi"
7070
// Llm
7171
Llm StepNameType = "Llm"
72+
// LLMGuardInput
73+
LLMGuardInput StepNameType = "LLMGuardInput"
74+
// LLMGuardOutput
75+
LLMGuardOutput StepNameType = "LLMGuardOutput"
76+
// VLLMGaudi
77+
VLLMGaudi StepNameType = "VLLMGaudi"
78+
// VLLM
79+
VLLM StepNameType = "VLLM"
80+
// VLLMOpenVino
81+
VLLMOpenVino StepNameType = "VLLMOpenVino"
82+
// Language-Detection
83+
LanguageDetection StepNameType = "LanguageDetection"
7284
)
7385

7486
type Executor struct {

microservices-connector/api/v1alpha3/validating_webhook.go

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,18 @@ var (
4646
"Whisper",
4747
"WhisperGaudi",
4848
"DataPrep",
49-
"UI",
49+
50+
// EntRag specific
51+
// please keep that in sync with internal/controller/gmconnector_controller.go:41 const section
52+
"Ingestion",
53+
"TorchserveEmbedding",
54+
"TorchserveEmbeddingGaudi",
55+
"LLMGuardInput",
56+
"LLMGuardOutput",
57+
"VLLMGaudi",
58+
"VLLM",
59+
"VLLMOpenVino",
60+
"LanguageDetection",
5061
}
5162
)
5263

microservices-connector/api/v1alpha3/zz_generated.deepcopy.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)