fix: milvus clusters are not specified the correct value (#1288)

(cherry picked from commit 479cfa4)
apecloud · Dec 6, 2024 · 2fefa9a · 2fefa9a
1 parent 7df682d
commit 2fefa9a
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 17 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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: