Skip to content

Commit 536ef9f

Browse files
authored
feature: milvus service名称变更 兼容k8s (#97)
feature: milvus service名称变更 兼容k8s (#97)
1 parent fdfcfec commit 536ef9f

File tree

4 files changed

+12
-64
lines changed

4 files changed

+12
-64
lines changed

backend/services/rag-indexer-service/src/main/java/com/datamate/rag/indexer/infrastructure/milvus/MilvusService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
@Slf4j
2121
@Component
2222
public class MilvusService {
23-
@Value("${datamate.rag.milvus-host:milvus-standalone}")
23+
@Value("${datamate.rag.milvus-host:milvus}")
2424
private String milvusHost;
2525
@Value("${datamate.rag.milvus-port:19530}")
2626
private int milvusPort;

deployment/docker/milvus/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ services:
3838
timeout: 20s
3939
retries: 3
4040

41-
standalone:
41+
milvus:
4242
container_name: milvus-standalone
4343
image: milvusdb/milvus:v2.6.2
4444
command: ["milvus", "run", "standalone"]

deployment/helm/datamate/values.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,16 @@ global:
2424
name: "datamate-database"
2525
tag: "latest"
2626

27+
public:
28+
persistentVolumeClaim:
29+
storageClass: ""
30+
size:
31+
dataset: 10Gi
32+
flow: 1Gi
33+
log: 1Gi
34+
database: 1Gi
35+
operator: 1Gi
36+
2737
datasetVolume: &datasetVolume
2838
name: dataset-volume
2939
persistentVolumeClaim:

deployment/helm/milvus/templates/service.yaml

Lines changed: 0 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -58,65 +58,3 @@ spec:
5858
component: "proxy"
5959
{{- end }}
6060
{{- end }}
61-
62-
---
63-
{{- if or .Values.proxy.enabled (not .Values.cluster.enabled) }}
64-
apiVersion: v1
65-
kind: Service
66-
metadata:
67-
name: {{ template "milvus.standalone.fullname" . }}
68-
namespace: {{ .Release.Namespace }}
69-
labels:
70-
{{ include "milvus.labels" . | indent 4 }}
71-
{{- if .Values.service.labels }}
72-
{{ toYaml .Values.service.labels | indent 4 }}
73-
{{- end }}
74-
{{- if not .Values.cluster.enabled }}
75-
component: "standalone"
76-
{{- else if and .Values.proxy.enabled .Values.cluster.enabled }}
77-
component: "proxy"
78-
{{- end }}
79-
{{- with .Values.service.annotations }}
80-
annotations:
81-
{{ toYaml . | indent 4 }}
82-
{{- end }}
83-
spec:
84-
{{- if (or (eq .Values.service.type "ClusterIP") (empty .Values.service.type)) }}
85-
type: ClusterIP
86-
{{- if .Values.service.clusterIP }}
87-
clusterIP: {{ .Values.service.clusterIP }}
88-
{{- end }}
89-
{{- else if eq .Values.service.type "LoadBalancer" }}
90-
type: LoadBalancer
91-
{{- if .Values.service.loadBalancerIP }}
92-
loadBalancerIP: {{ .Values.service.loadBalancerIP }}
93-
{{- end }}
94-
{{- if .Values.service.loadBalancerSourceRanges }}
95-
loadBalancerSourceRanges:
96-
{{ toYaml .Values.service.loadBalancerSourceRanges | indent 4 }}
97-
{{- end -}}
98-
{{- else }}
99-
type: {{ .Values.service.type }}
100-
{{- end }}
101-
ports:
102-
- name: {{ .Values.service.portName }}
103-
port: {{ .Values.service.port }}
104-
protocol: TCP
105-
targetPort: milvus
106-
{{- if (and (eq .Values.service.type "NodePort") (not (empty .Values.service.nodePort))) }}
107-
nodePort: {{.Values.service.nodePort}}
108-
{{- end }}
109-
{{- if .Values.metrics.enabled }}
110-
- name: metrics
111-
protocol: TCP
112-
port: 9091
113-
targetPort: metrics
114-
{{- end }}
115-
selector:
116-
{{ include "milvus.matchLabels" . | indent 4 }}
117-
{{- if not .Values.cluster.enabled }}
118-
component: "standalone"
119-
{{- else if and .Values.proxy.enabled .Values.cluster.enabled }}
120-
component: "proxy"
121-
{{- end }}
122-
{{- end }}

0 commit comments

Comments
 (0)