copy-past microservices-connector changes from EnterpriseRAG

opea-project · Dec 16, 2024 · de22d7b · de22d7b
1 parent e9dc58a
commit de22d7b
Show file tree

Hide file tree

Showing 15 changed files with 900 additions and 383 deletions.
diff --git a/microservices-connector/Makefile b/microservices-connector/Makefile
@@ -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
@@ -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
@@ -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
 

diff --git a/microservices-connector/api/v1alpha3/gmconnector_types.go b/microservices-connector/api/v1alpha3/gmconnector_types.go
@@ -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 {

diff --git a/microservices-connector/api/v1alpha3/validating_webhook.go b/microservices-connector/api/v1alpha3/validating_webhook.go
@@ -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",
 	}
 )
 

diff --git a/microservices-connector/api/v1alpha3/zz_generated.deepcopy.go b/microservices-connector/api/v1alpha3/zz_generated.deepcopy.go