From 2fefa9ab012eaa053e82c644c76a5b8a5c600e86 Mon Sep 17 00:00:00 2001 From: wangyelei Date: Fri, 6 Dec 2024 10:25:30 +0800 Subject: [PATCH] fix: milvus clusters are not specified the correct value (#1288) (cherry picked from commit 479cfa4cc3af41350e5580ddf8160e41d91ca426) --- addons-cluster/milvus/templates/cluster.yaml | 5 ---- .../milvus/templates/standalone.yaml | 3 --- addons-cluster/milvus/values.schema.json | 23 +++++++++++++++++++ addons-cluster/milvus/values.yaml | 4 ++++ examples/milvus/cluster-standalone.yaml | 1 - examples/milvus/cluster.yaml | 8 ------- 6 files changed, 27 insertions(+), 17 deletions(-) diff --git a/addons-cluster/milvus/templates/cluster.yaml b/addons-cluster/milvus/templates/cluster.yaml index e74f25ed5..fa9744ac8 100644 --- a/addons-cluster/milvus/templates/cluster.yaml +++ b/addons-cluster/milvus/templates/cluster.yaml @@ -18,7 +18,6 @@ spec: {{- include "milvus.serviceRef.meta" . | indent 8 }} {{- include "milvus.serviceRef.log" . | indent 8 }} {{- include "milvus.serviceRef.object" . | indent 8 }} - serviceAccountName: {{ include "kblib.serviceAccountName" . }} {{- include "kblib.componentMonitor" . | indent 6 }} {{- end }} - name: mixcoord @@ -28,7 +27,6 @@ spec: {{- include "milvus.serviceRef.meta" . | indent 8 }} {{- include "milvus.serviceRef.log" . | indent 8 }} {{- include "milvus.serviceRef.object" . | indent 8 }} - serviceAccountName: {{ include "kblib.serviceAccountName" . }} {{- include "kblib.componentMonitor" . | indent 6 }} - name: datanode replicas: {{ .Values.datanode.replicas}} @@ -38,7 +36,6 @@ spec: {{- include "milvus.serviceRef.meta" . | indent 8 }} {{- include "milvus.serviceRef.log" . | indent 8 }} {{- include "milvus.serviceRef.object" . | indent 8 }} - serviceAccountName: {{ include "kblib.serviceAccountName" . }} {{- include "kblib.componentMonitor" . | indent 6 }} - name: indexnode replicas: {{ .Values.indexnode.replicas}} @@ -48,7 +45,6 @@ spec: {{- include "milvus.serviceRef.meta" . | indent 8 }} {{- include "milvus.serviceRef.log" . | indent 8 }} {{- include "milvus.serviceRef.object" . | indent 8 }} - serviceAccountName: {{ include "kblib.serviceAccountName" . }} {{- include "kblib.componentMonitor" . | indent 6 }} - name: querynode replicas: {{ .Values.querynode.replicas}} @@ -58,6 +54,5 @@ spec: {{- include "milvus.serviceRef.meta" . | indent 8 }} {{- include "milvus.serviceRef.log" . | indent 8 }} {{- include "milvus.serviceRef.object" . | indent 8 }} - serviceAccountName: {{ include "kblib.serviceAccountName" . }} {{- include "kblib.componentMonitor" . | indent 6 }} {{- end }} diff --git a/addons-cluster/milvus/templates/standalone.yaml b/addons-cluster/milvus/templates/standalone.yaml index bacce8e6e..ca984ee8f 100644 --- a/addons-cluster/milvus/templates/standalone.yaml +++ b/addons-cluster/milvus/templates/standalone.yaml @@ -17,7 +17,6 @@ spec: volumeClaimTemplates: {{- include "milvus.vct.data" . | indent 8 }} {{- end }} - serviceAccountName: {{ include "kblib.serviceAccountName" . }} {{- include "kblib.componentMonitor" . | indent 6 }} - name: minio replicas: {{ .Values.replicas | default 1 }} @@ -26,7 +25,6 @@ spec: volumeClaimTemplates: {{- include "milvus.vct.data" . | indent 8 }} {{- end }} - serviceAccountName: {{ include "kblib.serviceAccountName" . }} {{- include "kblib.componentMonitor" . | indent 6 }} - name: milvus replicas: {{ .Values.replicas | default 1 }} @@ -35,6 +33,5 @@ spec: volumeClaimTemplates: {{- include "milvus.vct.data" . | indent 8 }} {{- end }} - serviceAccountName: {{ include "kblib.serviceAccountName" . }} {{- include "kblib.componentMonitor" . | indent 6 }} {{- end }} diff --git a/addons-cluster/milvus/values.schema.json b/addons-cluster/milvus/values.schema.json index 66f488231..4b5019c6e 100644 --- a/addons-cluster/milvus/values.schema.json +++ b/addons-cluster/milvus/values.schema.json @@ -18,6 +18,29 @@ "default": 1, "description": "Number of replicas for standalone mode" }, + "cpu": { + "title": "CPU", + "description": "CPU cores.", + "type": [ + "number", + "string" + ], + "default": 0.5, + "minimum": 0.5, + "maximum": 64, + "multipleOf": 0.5 + }, + "memory": { + "title": "Memory(Gi)", + "description": "Memory, the unit is Gi.", + "type": [ + "number", + "string" + ], + "default": 0.5, + "minimum": 0.5, + "maximum": 1000 + }, "persistence": { "type": "object", "properties": { diff --git a/addons-cluster/milvus/values.yaml b/addons-cluster/milvus/values.yaml index 56ae45694..2a6965a3b 100644 --- a/addons-cluster/milvus/values.yaml +++ b/addons-cluster/milvus/values.yaml @@ -12,6 +12,10 @@ mode: ##### parameters for standalone mode replicas: 1 +cpu: 0.5 + +memory: 0.5 + persistence: enabled: true data: diff --git a/examples/milvus/cluster-standalone.yaml b/examples/milvus/cluster-standalone.yaml index a6409f20a..675801ae5 100644 --- a/examples/milvus/cluster-standalone.yaml +++ b/examples/milvus/cluster-standalone.yaml @@ -18,7 +18,6 @@ spec: componentSpecs: - name: milvus disableExporter: true - serviceAccountName: kb-milvus-cluster replicas: 1 resources: limits: diff --git a/examples/milvus/cluster.yaml b/examples/milvus/cluster.yaml index fe8aef9ce..751aaad9a 100644 --- a/examples/milvus/cluster.yaml +++ b/examples/milvus/cluster.yaml @@ -19,7 +19,6 @@ spec: # ClusterComponentSpec defines the specifications for a Component in a Cluster. componentSpecs: - name: proxy - serviceAccountName: kb-milvus-cluster replicas: 1 resources: limits: @@ -45,7 +44,6 @@ spec: component: minio name: admin - name: mixcoord - serviceAccountName: kb-milvus-cluster replicas: 1 resources: limits: @@ -71,7 +69,6 @@ spec: component: minio name: admin - name: datanode - serviceAccountName: kb-milvus-cluster replicas: 1 resources: limits: @@ -97,7 +94,6 @@ spec: component: minio name: admin - name: indexnode - serviceAccountName: kb-milvus-cluster replicas: 1 resources: limits: @@ -123,7 +119,6 @@ spec: component: minio name: admin - name: querynode - serviceAccountName: kb-milvus-cluster replicas: 1 resources: limits: @@ -169,7 +164,6 @@ spec: requests: cpu: '0.5' memory: 0.5Gi - serviceAccountName: kb-etcdm-cluster volumeClaimTemplates: - name: data spec: @@ -195,7 +189,6 @@ spec: - name: pulsar-broker componentDefRef: pulsar-broker disableExporter: true - serviceAccountName: kb-pulsarm-cluster replicas: 1 resources: limits: @@ -268,7 +261,6 @@ spec: componentSpecs: - name: minio componentDef: milvus-minio-0.9.0 - serviceAccountName: kb-miniom-cluster replicas: 1 resources: limits: