feat(k8s-dbs): 支持milvus 2.6.7 TencentBlueKing#15156

jay3cx · jay3cx · commit dbfce6c085d2 · 2026-01-09T16:00:22.000+08:00
diff --git a/dbm-services/k8s-dbs/k8s-utils/helm/storageAddon/milvus-2.0.0/templates/clusterdefinition.yaml b/dbm-services/k8s-dbs/k8s-utils/helm/storageAddon/milvus-2.0.0/templates/clusterdefinition.yaml
@@ -20,10 +20,10 @@ spec:
           compDef: {{ include "milvus.streamingnode.cmpdRegexpPattern" . }}
       orders:
         provision:
-          - mixcoord
-          - querynode,datanode,streamingnode
+          - mixcoord,streamingnode
+          - querynode,datanode
           - proxy,attu
         terminate:
           - proxy,attu
-          - querynode,datanode,streamingnode
-          - mixcoord
+          - querynode,datanode
+          - mixcoord,streamingnode
diff --git a/dbm-services/k8s-dbs/k8s-utils/helm/storageAddon/milvus-2.0.0/templates/cmpd-attu.yaml b/dbm-services/k8s-dbs/k8s-utils/helm/storageAddon/milvus-2.0.0/templates/cmpd-attu.yaml
@@ -4,7 +4,7 @@ metadata:
   name: {{ include "milvus.attu.cmpdName" . }}
 spec:
   serviceKind: milvus
-  serviceVersion: {{ .Values.image.attu.tag }}
+  serviceVersion: {{ .Values.image.attu.tag | replace "v" "" }}-2.0.0
   services:
     - name: attu
       spec:
diff --git a/dbm-services/k8s-dbs/k8s-utils/helm/storageAddon/milvus-2.0.0/templates/cmpd-datanode.yaml b/dbm-services/k8s-dbs/k8s-utils/helm/storageAddon/milvus-2.0.0/templates/cmpd-datanode.yaml
@@ -4,7 +4,7 @@ metadata:
   name: {{ include "milvus.datanode.cmpdName" . }}
 spec:
   serviceKind: milvus
-  serviceVersion: {{ .Values.image.all.tag }}
+  serviceVersion: {{ .Values.image.all.tag | replace "v" "" }}-2.0.0
   services:
     - name: datanode
       spec:
@@ -22,8 +22,15 @@ spec:
         args:
           - -c
           - |
-            pip install PyYAML
+            pip install PyYAML -i https://mirrors.cloud.tencent.com/pypi/simple --trusted-host mirrors.cloud.tencent.com
             /usr/local/bin/python /scripts/config-generator.py
+        resources:
+          requests:
+            cpu: "0.1"
+            memory: "256Mi"
+          limits:
+            cpu: "0.1"
+            memory: "256Mi"
         env:
           {{- range $key, $value := .Values.env }}
           - name: {{ $key }}
diff --git a/dbm-services/k8s-dbs/k8s-utils/helm/storageAddon/milvus-2.0.0/templates/cmpd-mixcoord.yaml b/dbm-services/k8s-dbs/k8s-utils/helm/storageAddon/milvus-2.0.0/templates/cmpd-mixcoord.yaml
@@ -4,7 +4,7 @@ metadata:
   name: {{ include "milvus.mixcoord.cmpdName" . }}
 spec:
   serviceKind: milvus
-  serviceVersion: {{ .Values.image.all.tag }}
+  serviceVersion: {{ .Values.image.all.tag | replace "v" "" }}-2.0.0
   services:
   - name: mixcoord
     serviceName: mixcoord
@@ -27,8 +27,15 @@ spec:
         args:
           - -c
           - |
-            pip install PyYAML
+            pip install PyYAML -i https://mirrors.cloud.tencent.com/pypi/simple --trusted-host mirrors.cloud.tencent.com
             /usr/local/bin/python /scripts/config-generator.py
+        resources:
+          requests:
+            cpu: "0.1"
+            memory: "256Mi"
+          limits:
+            cpu: "0.1"
+            memory: "256Mi"
         env:
           {{- range $key, $value := .Values.env }}
           - name: {{ $key }}
diff --git a/dbm-services/k8s-dbs/k8s-utils/helm/storageAddon/milvus-2.0.0/templates/cmpd-proxy.yaml b/dbm-services/k8s-dbs/k8s-utils/helm/storageAddon/milvus-2.0.0/templates/cmpd-proxy.yaml
@@ -4,7 +4,7 @@ metadata:
   name: {{ include "milvus.proxy.cmpdName" . }}
 spec:
   serviceKind: milvus
-  serviceVersion: {{ .Values.image.all.tag }}
+  serviceVersion: {{ .Values.image.all.tag | replace "v" "" }}-2.0.0
   services:
     - name: proxy
       spec:
@@ -28,8 +28,15 @@ spec:
         args:
           - -c
           - |
-            pip install PyYAML
+            pip install PyYAML -i https://mirrors.cloud.tencent.com/pypi/simple --trusted-host mirrors.cloud.tencent.com
             /usr/local/bin/python /scripts/config-generator.py
+        resources:
+          requests:
+            cpu: "0.1"
+            memory: "256Mi"
+          limits:
+            cpu: "0.1"
+            memory: "256Mi"
         env:
           {{- range $key, $value := .Values.env }}
           - name: {{ $key }}
diff --git a/dbm-services/k8s-dbs/k8s-utils/helm/storageAddon/milvus-2.0.0/templates/cmpd-querynode.yaml b/dbm-services/k8s-dbs/k8s-utils/helm/storageAddon/milvus-2.0.0/templates/cmpd-querynode.yaml
@@ -4,7 +4,7 @@ metadata:
   name: {{ include "milvus.querynode.cmpdName" . }}
 spec:
   serviceKind: milvus
-  serviceVersion: {{ .Values.image.all.tag }}
+  serviceVersion: {{ .Values.image.all.tag | replace "v" "" }}-2.0.0
   services:
     - name: querynode
       spec:
@@ -22,8 +22,15 @@ spec:
         args:
           - -c
           - |
-            pip install PyYAML
+            pip install PyYAML -i https://mirrors.cloud.tencent.com/pypi/simple --trusted-host mirrors.cloud.tencent.com
             /usr/local/bin/python /scripts/config-generator.py
+        resources:
+          requests:
+            cpu: "0.1"
+            memory: "256Mi"
+          limits:
+            cpu: "0.1"
+            memory: "256Mi"
         env:
           {{- range $key, $value := .Values.env }}
           - name: {{ $key }}
diff --git a/dbm-services/k8s-dbs/k8s-utils/helm/storageAddon/milvus-2.0.0/templates/cmpd-streamingnode.yaml b/dbm-services/k8s-dbs/k8s-utils/helm/storageAddon/milvus-2.0.0/templates/cmpd-streamingnode.yaml
@@ -4,7 +4,7 @@ metadata:
   name: {{ include "milvus.streamingnode.cmpdName" . }}
 spec:
   serviceKind: milvus
-  serviceVersion: {{ .Values.image.all.tag }}
+  serviceVersion: {{ .Values.image.all.tag | replace "v" "" }}-2.0.0
   services:
   - name: streamingnode
     serviceName: streamingnode
@@ -27,8 +27,15 @@ spec:
         args:
           - -c
           - |
-            pip install PyYAML
+            pip install PyYAML -i https://mirrors.cloud.tencent.com/pypi/simple --trusted-host mirrors.cloud.tencent.com
             /usr/local/bin/python /scripts/config-generator.py
+        resources:
+          requests:
+            cpu: "0.1"
+            memory: "256Mi"
+          limits:
+            cpu: "0.1"
+            memory: "256Mi"
         env:
           {{- range $key, $value := .Values.env }}
           - name: {{ $key }}
diff --git a/dbm-services/k8s-dbs/k8s-utils/helm/storageAddon/milvus-2.0.0/templates/cmpv-attu.yaml b/dbm-services/k8s-dbs/k8s-utils/helm/storageAddon/milvus-2.0.0/templates/cmpv-attu.yaml
@@ -5,11 +5,21 @@ metadata:
 spec:
   compatibilityRules:
     - releases:
-        - attu-v2.5.6
+        - attu-v2.5.6-2.0.0
+        - attu-v2.6.0-2.0.0
+        - attu-v2.6.3-2.0.0
       compDefs:
         - attu-2.0.0
   releases:
-    - name: attu-v2.5.6
-      serviceVersion: 2.5.6
+    - name: attu-v2.5.6-2.0.0
+      serviceVersion: 2.5.6-2.0.0
       images:
-        attu: zilliz/attu:v2.5.6
+        attu: zilliz/attu:v2.5.6
+    - name: attu-v2.6.0-2.0.0
+      serviceVersion: 2.6.0-2.0.0
+      images:
+        attu: zilliz/attu:v2.6.0
+    - name: attu-v2.6.3-2.0.0
+      serviceVersion: 2.6.3-2.0.0
+      images:
+        attu: zilliz/attu:v2.6.3
diff --git a/dbm-services/k8s-dbs/k8s-utils/helm/storageAddon/milvus-2.0.0/templates/cmpv-datanode.yaml b/dbm-services/k8s-dbs/k8s-utils/helm/storageAddon/milvus-2.0.0/templates/cmpv-datanode.yaml
@@ -5,11 +5,18 @@ metadata:
 spec:
   compatibilityRules:
     - releases:
-        - datanode-v2.6.0
+        - datanode-v2.6.0-2.0.0
+        - datanode-v2.6.7-2.0.0
       compDefs:
         - datanode-2.0.0
   releases:
-    - name: datanode-v2.6.0
-      serviceVersion: 2.6.0
+    - name: datanode-v2.6.0-2.0.0
+      serviceVersion: 2.6.0-2.0.0
       images:
-        datanode: milvusdb/milvus:v2.6.0
+        config-generator: {{ .Values.image.python.repository }}:{{ .Values.image.python.tag }}
+        datanode: milvusdb/milvus:v2.6.0
+    - name: datanode-v2.6.7-2.0.0
+      serviceVersion: 2.6.7-2.0.0
+      images:
+        config-generator: {{ .Values.image.python.repository }}:{{ .Values.image.python.tag }}
+        datanode: milvusdb/milvus:v2.6.7
diff --git a/dbm-services/k8s-dbs/k8s-utils/helm/storageAddon/milvus-2.0.0/templates/cmpv-mixcoord.yaml b/dbm-services/k8s-dbs/k8s-utils/helm/storageAddon/milvus-2.0.0/templates/cmpv-mixcoord.yaml
@@ -5,11 +5,18 @@ metadata:
 spec:
   compatibilityRules:
     - releases:
-        - mixcoord-v2.6.0
+        - mixcoord-v2.6.0-2.0.0
+        - mixcoord-v2.6.7-2.0.0
       compDefs:
         - mixcoord-2.0.0
   releases:
-    - name: mixcoord-v2.6.0
-      serviceVersion: 2.6.0
+    - name: mixcoord-v2.6.0-2.0.0
+      serviceVersion: 2.6.0-2.0.0
       images:
-        mixcoord: milvusdb/milvus:v2.6.0
+        config-generator: {{ .Values.image.python.repository }}:{{ .Values.image.python.tag }}
+        mixcoord: milvusdb/milvus:v2.6.0
+    - name: mixcoord-v2.6.7-2.0.0
+      serviceVersion: 2.6.7-2.0.0
+      images:
+        config-generator: {{ .Values.image.python.repository }}:{{ .Values.image.python.tag }}
+        mixcoord: milvusdb/milvus:v2.6.7
diff --git a/dbm-services/k8s-dbs/k8s-utils/helm/storageAddon/milvus-2.0.0/templates/cmpv-proxy.yaml b/dbm-services/k8s-dbs/k8s-utils/helm/storageAddon/milvus-2.0.0/templates/cmpv-proxy.yaml
@@ -5,11 +5,18 @@ metadata:
 spec:
   compatibilityRules:
     - releases:
-        - proxy-v2.6.0
+        - proxy-v2.6.0-2.0.0
+        - proxy-v2.6.7-2.0.0
       compDefs:
         - proxy-2.0.0
   releases:
-    - name: proxy-v2.6.0
-      serviceVersion: 2.6.0
+    - name: proxy-v2.6.0-2.0.0
+      serviceVersion: 2.6.0-2.0.0
       images:
-        proxy: milvusdb/milvus:v2.6.0
+        config-generator: {{ .Values.image.python.repository }}:{{ .Values.image.python.tag }}
+        proxy: milvusdb/milvus:v2.6.0
+    - name: proxy-v2.6.7-2.0.0
+      serviceVersion: 2.6.7-2.0.0
+      images:
+        config-generator: {{ .Values.image.python.repository }}:{{ .Values.image.python.tag }}
+        proxy: milvusdb/milvus:v2.6.7
diff --git a/dbm-services/k8s-dbs/k8s-utils/helm/storageAddon/milvus-2.0.0/templates/cmpv-querynode.yaml b/dbm-services/k8s-dbs/k8s-utils/helm/storageAddon/milvus-2.0.0/templates/cmpv-querynode.yaml
@@ -5,11 +5,18 @@ metadata:
 spec:
   compatibilityRules:
     - releases:
-        - querynode-v2.6.0
+        - querynode-v2.6.0-2.0.0
+        - querynode-v2.6.7-2.0.0
       compDefs:
         - querynode-2.0.0
   releases:
-    - name: querynode-v2.6.0
-      serviceVersion: 2.6.0
+    - name: querynode-v2.6.0-2.0.0
+      serviceVersion: 2.6.0-2.0.0
       images:
-        querynode: milvusdb/milvus:v2.6.0
+        config-generator: {{ .Values.image.python.repository }}:{{ .Values.image.python.tag }}
+        querynode: milvusdb/milvus:v2.6.0
+    - name: querynode-v2.6.7-2.0.0
+      serviceVersion: 2.6.7-2.0.0
+      images:
+        config-generator: {{ .Values.image.python.repository }}:{{ .Values.image.python.tag }}
+        querynode: milvusdb/milvus:v2.6.7
diff --git a/dbm-services/k8s-dbs/k8s-utils/helm/storageAddon/milvus-2.0.0/templates/cmpv-streamingnode.yaml b/dbm-services/k8s-dbs/k8s-utils/helm/storageAddon/milvus-2.0.0/templates/cmpv-streamingnode.yaml
@@ -5,11 +5,18 @@ metadata:
 spec:
   compatibilityRules:
     - releases:
-        - streamingnode-v2.6.0
+        - streamingnode-v2.6.0-2.0.0
+        - streamingnode-v2.6.7-2.0.0
       compDefs:
         - streamingnode-2.0.0
   releases:
-    - name: streamingnode-v2.6.0
-      serviceVersion: 2.6.0
+    - name: streamingnode-v2.6.0-2.0.0
+      serviceVersion: 2.6.0-2.0.0
       images:
-        streamingnode: milvusdb/milvus:v2.6.0
+        config-generator: {{ .Values.image.python.repository }}:{{ .Values.image.python.tag }}
+        streamingnode: milvusdb/milvus:v2.6.0
+    - name: streamingnode-v2.6.7-2.0.0
+      serviceVersion: 2.6.7-2.0.0
+      images:
+        config-generator: {{ .Values.image.python.repository }}:{{ .Values.image.python.tag }}
+        streamingnode: milvusdb/milvus:v2.6.7
diff --git a/dbm-services/k8s-dbs/k8s-utils/helm/storageAddonCluster/milvus-2.0.0-cluster/Chart.yaml b/dbm-services/k8s-dbs/k8s-utils/helm/storageAddonCluster/milvus-2.0.0-cluster/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 appVersion: 1.10.0
 description: A Milvus cluster Helm chart for KubeBlocks.
-name: milvus-2.0.0-cluster
+name: milvus-cluster
 type: application
 version: 2.0.0
diff --git a/dbm-services/k8s-dbs/k8s-utils/helm/storageAddonCluster/milvus-2.0.0-cluster/templates/config.tpl b/dbm-services/k8s-dbs/k8s-utils/helm/storageAddonCluster/milvus-2.0.0-cluster/templates/config.tpl
@@ -33,7 +33,11 @@ common:
 
 minio:
 {{- if .Values.externalS3.enabled }}
+  {{- if .Values.externalS3.port }}
+  address: {{ .Values.externalS3.host }}:{{ .Values.externalS3.port }}
+  {{- else }}
   address: {{ .Values.externalS3.host }}
+  {{- end }}
   port: {{ .Values.externalS3.port }}
   accessKeyID: {{ .Values.externalS3.accessKey }}
   secretAccessKey: {{ .Values.externalS3.secretKey }}
