From 0535fc8330fdcaac189a61a67a1dde7f5e789f8c Mon Sep 17 00:00:00 2001 From: Alex Giurgiu Date: Fri, 12 Jul 2024 06:19:28 +0300 Subject: [PATCH 1/4] [milvus] Ability to use user specified ConfigMap for Milvus configuration (#97) * added new value for using a custom ConfigMap Signed-off-by: Alex Giurgiu * the fully customized user config should be mounted at user.yaml Signed-off-by: Alex Giurgiu * bumped version Signed-off-by: Alex Giurgiu --------- Signed-off-by: Alex Giurgiu --- charts/milvus/Chart.yaml | 2 +- charts/milvus/README.md | 3 ++- charts/milvus/templates/configmap.yaml | 3 +++ charts/milvus/templates/datacoord-deployment.yaml | 11 +++++++++++ charts/milvus/templates/datanode-deployment.yaml | 11 +++++++++++ charts/milvus/templates/indexcoord-deployment.yaml | 11 +++++++++++ charts/milvus/templates/indexnode-deployment.yaml | 11 +++++++++++ charts/milvus/templates/mixcoord-deployment.yaml | 13 ++++++++++++- charts/milvus/templates/proxy-deployment.yaml | 11 +++++++++++ charts/milvus/templates/querycoord-deployment.yaml | 11 +++++++++++ charts/milvus/templates/querynode-deployment.yaml | 11 +++++++++++ charts/milvus/templates/rootcoord-deployment.yaml | 11 +++++++++++ charts/milvus/templates/standalone-deployment.yaml | 11 +++++++++++ charts/milvus/values.yaml | 7 +++++++ 14 files changed, 124 insertions(+), 3 deletions(-) diff --git a/charts/milvus/Chart.yaml b/charts/milvus/Chart.yaml index 76f8441..0af4672 100644 --- a/charts/milvus/Chart.yaml +++ b/charts/milvus/Chart.yaml @@ -3,7 +3,7 @@ name: milvus appVersion: "2.4.5" kubeVersion: "^1.10.0-0" description: Milvus is an open-source vector database built to power AI applications and vector similarity search. -version: 4.1.34 +version: 4.1.35 keywords: - milvus - elastic diff --git a/charts/milvus/README.md b/charts/milvus/README.md index b0de9b8..1c14b3a 100644 --- a/charts/milvus/README.md +++ b/charts/milvus/README.md @@ -214,7 +214,7 @@ In case you want to use a different `secretName` or mount path inside pod, modif ## Milvus with External Object Storage -As of https://github.com/minio/minio/releases/tag/RELEASE.2022-10-29T06-21-33Z, the MinIO Gateway and the related filesystem mode code have been removed. It is now recommended to utilize the `externalS3` configuration for integrating with various object storage services. Notably, Milvus now provides support for popular object storage platforms such as AWS S3, GCP GCS, Azure Blob, Aliyun OSS and Tencent COS. +As of https://github.com/minio/minio/releases/tag/RELEASE.2022-10-29T06-21-33Z, the MinIO Gateway and the related filesystem mode code have been removed. It is now recommended to utilize the `externalS3` configuration for integrating with various object storage services. Notably, Milvus now provides support for popular object storage platforms such as AWS S3, GCP GCS, Azure Blob, Aliyun OSS and Tencent COS. The recommended configuration option for `externalS3.cloudProvider` includes the following choices: `aws`, `gcp`, `azure`, `aliyun`, and `tencent`. Here's an example to use AWS S3 for Milvus object storage: @@ -266,6 +266,7 @@ The following table lists the configurable parameters of the Milvus Service and | `image.tools.repository` | Config image repository | `milvusdb/milvus-config-tool` | | `image.tools.tag` | Config image tag | `v0.1.2` | | `image.tools.pullPolicy` | Config image pull policy | `IfNotPresent` | +| `customConfigMap` | User specified ConfigMap for configuration | | `extraConfigFiles` | Extra config to override default milvus.yaml | `user.yaml:` | | `service.type` | Service type | `ClusterIP` | | `service.port` | Port where service is exposed | `19530` | diff --git a/charts/milvus/templates/configmap.yaml b/charts/milvus/templates/configmap.yaml index 68cc099..6e71f0e 100644 --- a/charts/milvus/templates/configmap.yaml +++ b/charts/milvus/templates/configmap.yaml @@ -1,3 +1,5 @@ +# If customConfigMap is not set, this ConfigMap will be redendered. +{{- if not .Values.customConfigMap }} apiVersion: v1 kind: ConfigMap metadata: @@ -10,3 +12,4 @@ data: {{ $key }}: |- {{ $value | indent 4 }} {{- end }} +{{- end }} diff --git a/charts/milvus/templates/datacoord-deployment.yaml b/charts/milvus/templates/datacoord-deployment.yaml index 34d00b4..c65f2bf 100644 --- a/charts/milvus/templates/datacoord-deployment.yaml +++ b/charts/milvus/templates/datacoord-deployment.yaml @@ -121,6 +121,12 @@ spec: resources: {{- toYaml .Values.dataCoordinator.resources | nindent 10 }} volumeMounts: + {{- if .Values.customConfigMap }} + - name: milvus-config + mountPath: /milvus/configs/user.yaml + subPath: milvus.yaml + readOnly: true + {{- else }} - name: milvus-config mountPath: /milvus/configs/default.yaml subPath: default.yaml @@ -129,6 +135,7 @@ spec: mountPath: /milvus/configs/user.yaml subPath: user.yaml readOnly: true + {{- end }} {{- if .Values.log.persistence.enabled }} - name: milvus-logs-disk mountPath: {{ .Values.log.persistence.mountPath | quote }} @@ -165,7 +172,11 @@ spec: volumes: - name: milvus-config configMap: + {{- if .Values.customConfigMap }} + name: {{ .Values.customConfigMap }} + {{- else }} name: {{ template "milvus.fullname" . }} + {{- end }} {{- if .Values.log.persistence.enabled }} - name: milvus-logs-disk persistentVolumeClaim: diff --git a/charts/milvus/templates/datanode-deployment.yaml b/charts/milvus/templates/datanode-deployment.yaml index ef88a3b..72c8ef6 100644 --- a/charts/milvus/templates/datanode-deployment.yaml +++ b/charts/milvus/templates/datanode-deployment.yaml @@ -117,6 +117,12 @@ spec: resources: {{- toYaml .Values.dataNode.resources | nindent 10 }} volumeMounts: + {{- if .Values.customConfigMap }} + - name: milvus-config + mountPath: /milvus/configs/user.yaml + subPath: milvus.yaml + readOnly: true + {{- else }} - name: milvus-config mountPath: /milvus/configs/default.yaml subPath: default.yaml @@ -125,6 +131,7 @@ spec: mountPath: /milvus/configs/user.yaml subPath: user.yaml readOnly: true + {{- end }} {{- if .Values.log.persistence.enabled }} - name: milvus-logs-disk mountPath: {{ .Values.log.persistence.mountPath | quote }} @@ -160,7 +167,11 @@ spec: volumes: - name: milvus-config configMap: + {{- if .Values.customConfigMap }} + name: {{ .Values.customConfigMap }} + {{- else }} name: {{ template "milvus.fullname" . }} + {{- end }} {{- if .Values.log.persistence.enabled }} - name: milvus-logs-disk persistentVolumeClaim: diff --git a/charts/milvus/templates/indexcoord-deployment.yaml b/charts/milvus/templates/indexcoord-deployment.yaml index f876943..6ae9b6e 100644 --- a/charts/milvus/templates/indexcoord-deployment.yaml +++ b/charts/milvus/templates/indexcoord-deployment.yaml @@ -121,6 +121,12 @@ spec: resources: {{- toYaml .Values.indexCoordinator.resources | nindent 10 }} volumeMounts: + {{- if .Values.customConfigMap }} + - name: milvus-config + mountPath: /milvus/configs/user.yaml + subPath: milvus.yaml + readOnly: true + {{- else }} - name: milvus-config mountPath: /milvus/configs/default.yaml subPath: default.yaml @@ -129,6 +135,7 @@ spec: mountPath: /milvus/configs/user.yaml subPath: user.yaml readOnly: true + {{- end }} {{- if .Values.log.persistence.enabled }} - name: milvus-logs-disk mountPath: {{ .Values.log.persistence.mountPath | quote }} @@ -165,7 +172,11 @@ spec: volumes: - name: milvus-config configMap: + {{- if .Values.customConfigMap }} + name: {{ .Values.customConfigMap }} + {{- else }} name: {{ template "milvus.fullname" . }} + {{- end }} {{- if .Values.log.persistence.enabled }} - name: milvus-logs-disk persistentVolumeClaim: diff --git a/charts/milvus/templates/indexnode-deployment.yaml b/charts/milvus/templates/indexnode-deployment.yaml index 2303f4a..9321d52 100644 --- a/charts/milvus/templates/indexnode-deployment.yaml +++ b/charts/milvus/templates/indexnode-deployment.yaml @@ -123,6 +123,12 @@ spec: resources: {{- toYaml .Values.indexNode.resources | nindent 10 }} volumeMounts: + {{- if .Values.customConfigMap }} + - name: milvus-config + mountPath: /milvus/configs/user.yaml + subPath: milvus.yaml + readOnly: true + {{- else }} - name: milvus-config mountPath: /milvus/configs/default.yaml subPath: default.yaml @@ -131,6 +137,7 @@ spec: mountPath: /milvus/configs/user.yaml subPath: user.yaml readOnly: true + {{- end }} {{- if .Values.log.persistence.enabled }} - name: milvus-logs-disk mountPath: {{ .Values.log.persistence.mountPath | quote }} @@ -172,7 +179,11 @@ spec: volumes: - name: milvus-config configMap: + {{- if .Values.customConfigMap }} + name: {{ .Values.customConfigMap }} + {{- else }} name: {{ template "milvus.fullname" . }} + {{- end }} {{- if .Values.log.persistence.enabled }} - name: milvus-logs-disk persistentVolumeClaim: diff --git a/charts/milvus/templates/mixcoord-deployment.yaml b/charts/milvus/templates/mixcoord-deployment.yaml index 86ab063..543c7b6 100644 --- a/charts/milvus/templates/mixcoord-deployment.yaml +++ b/charts/milvus/templates/mixcoord-deployment.yaml @@ -118,6 +118,12 @@ spec: resources: {{- toYaml .Values.mixCoordinator.resources | nindent 10 }} volumeMounts: + {{- if .Values.customConfigMap }} + - name: milvus-config + mountPath: /milvus/configs/user.yaml + subPath: milvus.yaml + readOnly: true + {{- else }} - name: milvus-config mountPath: /milvus/configs/default.yaml subPath: default.yaml @@ -126,6 +132,7 @@ spec: mountPath: /milvus/configs/user.yaml subPath: user.yaml readOnly: true + {{- end }} {{- if .Values.log.persistence.enabled }} - name: milvus-logs-disk mountPath: {{ .Values.log.persistence.mountPath | quote }} @@ -162,7 +169,11 @@ spec: volumes: - name: milvus-config configMap: + {{- if .Values.customConfigMap }} + name: {{ .Values.customConfigMap }} + {{- else }} name: {{ template "milvus.fullname" . }} + {{- end }} {{- if .Values.log.persistence.enabled }} - name: milvus-logs-disk persistentVolumeClaim: @@ -170,4 +181,4 @@ spec: {{- end }} - name: tools emptyDir: {} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/charts/milvus/templates/proxy-deployment.yaml b/charts/milvus/templates/proxy-deployment.yaml index f9c278f..e19311a 100644 --- a/charts/milvus/templates/proxy-deployment.yaml +++ b/charts/milvus/templates/proxy-deployment.yaml @@ -117,6 +117,12 @@ spec: resources: {{- toYaml .Values.proxy.resources | nindent 10 }} volumeMounts: + {{- if .Values.customConfigMap }} + - name: milvus-config + mountPath: /milvus/configs/user.yaml + subPath: milvus.yaml + readOnly: true + {{- else }} - name: milvus-config mountPath: /milvus/configs/default.yaml subPath: default.yaml @@ -125,6 +131,7 @@ spec: mountPath: /milvus/configs/user.yaml subPath: user.yaml readOnly: true + {{- end }} {{- if .Values.log.persistence.enabled }} - name: milvus-logs-disk mountPath: {{ .Values.log.persistence.mountPath | quote }} @@ -164,7 +171,11 @@ spec: volumes: - name: milvus-config configMap: + {{- if .Values.customConfigMap }} + name: {{ .Values.customConfigMap }} + {{- else }} name: {{ template "milvus.fullname" . }} + {{- end }} {{- if .Values.log.persistence.enabled }} - name: milvus-logs-disk persistentVolumeClaim: diff --git a/charts/milvus/templates/querycoord-deployment.yaml b/charts/milvus/templates/querycoord-deployment.yaml index e3159c9..90694fb 100644 --- a/charts/milvus/templates/querycoord-deployment.yaml +++ b/charts/milvus/templates/querycoord-deployment.yaml @@ -121,6 +121,12 @@ spec: resources: {{- toYaml .Values.queryCoordinator.resources | nindent 10 }} volumeMounts: + {{- if .Values.customConfigMap }} + - name: milvus-config + mountPath: /milvus/configs/user.yaml + subPath: milvus.yaml + readOnly: true + {{- else }} - name: milvus-config mountPath: /milvus/configs/default.yaml subPath: default.yaml @@ -129,6 +135,7 @@ spec: mountPath: /milvus/configs/user.yaml subPath: user.yaml readOnly: true + {{- end }} {{- if .Values.log.persistence.enabled }} - name: milvus-logs-disk mountPath: {{ .Values.log.persistence.mountPath | quote }} @@ -165,7 +172,11 @@ spec: volumes: - name: milvus-config configMap: + {{- if .Values.customConfigMap }} + name: {{ .Values.customConfigMap }} + {{- else }} name: {{ template "milvus.fullname" . }} + {{- end }} {{- if .Values.log.persistence.enabled }} - name: milvus-logs-disk persistentVolumeClaim: diff --git a/charts/milvus/templates/querynode-deployment.yaml b/charts/milvus/templates/querynode-deployment.yaml index c470aa5..888d655 100644 --- a/charts/milvus/templates/querynode-deployment.yaml +++ b/charts/milvus/templates/querynode-deployment.yaml @@ -123,6 +123,12 @@ spec: resources: {{- toYaml .Values.queryNode.resources | nindent 10 }} volumeMounts: + {{- if .Values.customConfigMap }} + - name: milvus-config + mountPath: /milvus/configs/user.yaml + subPath: milvus.yaml + readOnly: true + {{- else }} - name: milvus-config mountPath: /milvus/configs/default.yaml subPath: default.yaml @@ -131,6 +137,7 @@ spec: mountPath: /milvus/configs/user.yaml subPath: user.yaml readOnly: true + {{- end }} {{- if .Values.log.persistence.enabled }} - name: milvus-logs-disk mountPath: {{ .Values.log.persistence.mountPath | quote }} @@ -171,7 +178,11 @@ spec: volumes: - name: milvus-config configMap: + {{- if .Values.customConfigMap }} + name: {{ .Values.customConfigMap }} + {{- else }} name: {{ template "milvus.fullname" . }} + {{- end }} {{- if .Values.log.persistence.enabled }} - name: milvus-logs-disk persistentVolumeClaim: diff --git a/charts/milvus/templates/rootcoord-deployment.yaml b/charts/milvus/templates/rootcoord-deployment.yaml index 2e16efe..2100c6a 100644 --- a/charts/milvus/templates/rootcoord-deployment.yaml +++ b/charts/milvus/templates/rootcoord-deployment.yaml @@ -121,6 +121,12 @@ spec: resources: {{- toYaml .Values.rootCoordinator.resources | nindent 10 }} volumeMounts: + {{- if .Values.customConfigMap }} + - name: milvus-config + mountPath: /milvus/configs/user.yaml + subPath: milvus.yaml + readOnly: true + {{- else }} - name: milvus-config mountPath: /milvus/configs/default.yaml subPath: default.yaml @@ -129,6 +135,7 @@ spec: mountPath: /milvus/configs/user.yaml subPath: user.yaml readOnly: true + {{- end }} {{- if .Values.log.persistence.enabled }} - name: milvus-logs-disk mountPath: {{ .Values.log.persistence.mountPath | quote }} @@ -165,7 +172,11 @@ spec: volumes: - name: milvus-config configMap: + {{- if .Values.customConfigMap }} + name: {{ .Values.customConfigMap }} + {{- else }} name: {{ template "milvus.fullname" . }} + {{- end }} {{- if .Values.log.persistence.enabled }} - name: milvus-logs-disk persistentVolumeClaim: diff --git a/charts/milvus/templates/standalone-deployment.yaml b/charts/milvus/templates/standalone-deployment.yaml index 26c59f5..74770fc 100644 --- a/charts/milvus/templates/standalone-deployment.yaml +++ b/charts/milvus/templates/standalone-deployment.yaml @@ -121,6 +121,12 @@ spec: volumeMounts: - mountPath: /milvus/tools name: tools + {{- if .Values.customConfigMap }} + - name: milvus-config + mountPath: /milvus/configs/user.yaml + subPath: milvus.yaml + readOnly: true + {{- else }} - name: milvus-config mountPath: /milvus/configs/default.yaml subPath: default.yaml @@ -129,6 +135,7 @@ spec: mountPath: /milvus/configs/user.yaml subPath: user.yaml readOnly: true + {{- end }} - name: milvus-data-disk mountPath: {{ .Values.standalone.persistence.mountPath | quote }} subPath: {{ .Values.standalone.persistence.persistentVolumeClaim.subPath | default "" }} @@ -172,7 +179,11 @@ spec: name: tools - name: milvus-config configMap: + {{- if .Values.customConfigMap }} + name: {{ .Values.customConfigMap }} + {{- else }} name: {{ template "milvus.fullname" . }} + {{- end }} - name: milvus-data-disk {{- if .Values.standalone.persistence.enabled }} persistentVolumeClaim: diff --git a/charts/milvus/values.yaml b/charts/milvus/values.yaml index 1c7a234..43e0c73 100644 --- a/charts/milvus/values.yaml +++ b/charts/milvus/values.yaml @@ -38,6 +38,13 @@ affinity: {} labels: {} annotations: {} +## +## If set, the whole config will be mounted from this custom ConfigMap. +## The ConfigMap should have a key named `milvus.yaml` which contains the full Milvus config. +## extraConfigFiles will be ignored if this variable is set. +## +customConfigMap: "" + # Extra configs for milvus.yaml # If set, this config will merge into milvus.yaml # Please follow the config structure in the milvus.yaml From 30390052ba2c1225fd54f30ef5f95fd0a15990af Mon Sep 17 00:00:00 2001 From: shaoyue Date: Fri, 12 Jul 2024 11:29:28 +0800 Subject: [PATCH 2/4] Update approvers & reviewers in OWNERS file (#105) Signed-off-by: haorenfsa --- OWNERS | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/OWNERS b/OWNERS index 5311d07..03c2fa5 100644 --- a/OWNERS +++ b/OWNERS @@ -4,7 +4,8 @@ filters: - jeffoverflow - zwd1208 - loveeachday + - haorenfsa + - yellow-shine reviewers: - - jeffoverflow - - zwd1208 - loveeachday + - haorenfsa From 2252056be6b7430cbe345d1c352f9e4cfd74924a Mon Sep 17 00:00:00 2001 From: Tosone Date: Mon, 15 Jul 2024 16:25:30 +0800 Subject: [PATCH 3/4] Fix configmap chaos (#103) Signed-off-by: Tosone --- charts/milvus/Chart.yaml | 2 +- charts/milvus/templates/config.tpl | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/charts/milvus/Chart.yaml b/charts/milvus/Chart.yaml index 0af4672..34da009 100644 --- a/charts/milvus/Chart.yaml +++ b/charts/milvus/Chart.yaml @@ -3,7 +3,7 @@ name: milvus appVersion: "2.4.5" kubeVersion: "^1.10.0-0" description: Milvus is an open-source vector database built to power AI applications and vector similarity search. -version: 4.1.35 +version: 4.1.36 keywords: - milvus - elastic diff --git a/charts/milvus/templates/config.tpl b/charts/milvus/templates/config.tpl index af7f40e..655428d 100644 --- a/charts/milvus/templates/config.tpl +++ b/charts/milvus/templates/config.tpl @@ -44,8 +44,12 @@ minio: rootPath: {{ .Values.externalS3.rootPath }} useIAM: {{ .Values.externalS3.useIAM }} cloudProvider: {{ .Values.externalS3.cloudProvider }} - iamEndpoint: {{ .Values.externalS3.iamEndpoint }} - region: {{ .Values.externalS3.region }} + {{- if .Values.minio.useIAM }} + iamEndpoint: {{ .Values.minio.iamEndpoint }} + {{- end }} + {{- if ne .Values.minio.region "" }} + region: {{ .Values.minio.region }} + {{- end }} useVirtualHost: {{ .Values.externalS3.useVirtualHost }} {{- else }} {{- if contains .Values.minio.name .Release.Name }} @@ -60,8 +64,12 @@ minio: bucketName: {{ .Values.minio.bucketName }} rootPath: {{ .Values.minio.rootPath }} useIAM: {{ .Values.minio.useIAM }} + {{- if .Values.minio.useIAM }} iamEndpoint: {{ .Values.minio.iamEndpoint }} + {{- end }} + {{- if ne .Values.minio.region "" }} region: {{ .Values.minio.region }} + {{- end }} useVirtualHost: {{ .Values.minio.useVirtualHost }} {{- end }} From 0f54460f5f2a3fa8ad79c6cea67a0a24f353aab3 Mon Sep 17 00:00:00 2001 From: "edward.zeng" Date: Tue, 16 Jul 2024 23:27:34 +0800 Subject: [PATCH 4/4] Bump milvus version to v2.4.6 (#108) Signed-off-by: Edward Zeng --- charts/milvus/Chart.yaml | 4 ++-- charts/milvus/README.md | 2 +- charts/milvus/templates/datacoord-deployment.yaml | 14 ++------------ charts/milvus/templates/datanode-deployment.yaml | 14 ++------------ .../milvus/templates/indexcoord-deployment.yaml | 14 ++------------ charts/milvus/templates/indexnode-deployment.yaml | 14 ++------------ charts/milvus/templates/mixcoord-deployment.yaml | 14 ++------------ charts/milvus/templates/proxy-deployment.yaml | 14 ++------------ .../milvus/templates/querycoord-deployment.yaml | 14 ++------------ charts/milvus/templates/querynode-deployment.yaml | 14 ++------------ charts/milvus/templates/rootcoord-deployment.yaml | 14 ++------------ .../milvus/templates/standalone-deployment.yaml | 14 ++------------ charts/milvus/values.yaml | 15 ++++++++------- 13 files changed, 31 insertions(+), 130 deletions(-) diff --git a/charts/milvus/Chart.yaml b/charts/milvus/Chart.yaml index 34da009..8521aed 100644 --- a/charts/milvus/Chart.yaml +++ b/charts/milvus/Chart.yaml @@ -1,9 +1,9 @@ apiVersion: v1 name: milvus -appVersion: "2.4.5" +appVersion: "2.4.6" kubeVersion: "^1.10.0-0" description: Milvus is an open-source vector database built to power AI applications and vector similarity search. -version: 4.1.36 +version: 4.2.0 keywords: - milvus - elastic diff --git a/charts/milvus/README.md b/charts/milvus/README.md index 1c14b3a..78e3c2c 100644 --- a/charts/milvus/README.md +++ b/charts/milvus/README.md @@ -260,7 +260,7 @@ The following table lists the configurable parameters of the Milvus Service and |-------------------------------------------|-----------------------------------------------|---------------------------------------------------------| | `cluster.enabled` | Enable or disable Milvus Cluster mode | `true` | | `image.all.repository` | Image repository | `milvusdb/milvus` | -| `image.all.tag` | Image tag | `v2.4.5` | +| `image.all.tag` | Image tag | `v2.4.6` | | `image.all.pullPolicy` | Image pull policy | `IfNotPresent` | | `image.all.pullSecrets` | Image pull secrets | `{}` | | `image.tools.repository` | Config image repository | `milvusdb/milvus-config-tool` | diff --git a/charts/milvus/templates/datacoord-deployment.yaml b/charts/milvus/templates/datacoord-deployment.yaml index c65f2bf..b8ae6c9 100644 --- a/charts/milvus/templates/datacoord-deployment.yaml +++ b/charts/milvus/templates/datacoord-deployment.yaml @@ -62,24 +62,14 @@ spec: - mountPath: /milvus/tools name: tools {{- end }} - - name: config - command: - - /cp - - /run-helm.sh,/merge - - /milvus/tools/run-helm.sh,/milvus/tools/merge - image: "{{ .Values.image.tools.repository }}:{{ .Values.image.tools.tag }}" - imagePullPolicy: {{ .Values.image.tools.pullPolicy}} - volumeMounts: - - mountPath: /milvus/tools - name: tools containers: - name: datacoord image: "{{ .Values.image.all.repository }}:{{ .Values.image.all.tag }}" imagePullPolicy: {{ .Values.image.all.pullPolicy }} {{- if .Values.dataCoordinator.heaptrack.enabled }} - args: [ "/milvus/tools/run-helm.sh", "/milvus/tools/heaptrack/bin/heaptrack", "milvus", "run", "datacoord" ] + args: [ "/milvus/tools/heaptrack/bin/heaptrack", "milvus", "run", "datacoord" ] {{- else }} - args: [ "/milvus/tools/run-helm.sh", "milvus", "run", "datacoord" ] + args: [ "milvus", "run", "datacoord" ] {{- end }} env: {{- if .Values.dataCoordinator.heaptrack.enabled }} diff --git a/charts/milvus/templates/datanode-deployment.yaml b/charts/milvus/templates/datanode-deployment.yaml index 72c8ef6..a49516c 100644 --- a/charts/milvus/templates/datanode-deployment.yaml +++ b/charts/milvus/templates/datanode-deployment.yaml @@ -58,24 +58,14 @@ spec: - mountPath: /milvus/tools name: tools {{- end }} - - name: config - command: - - /cp - - /run-helm.sh,/merge - - /milvus/tools/run-helm.sh,/milvus/tools/merge - image: "{{ .Values.image.tools.repository }}:{{ .Values.image.tools.tag }}" - imagePullPolicy: {{ .Values.image.tools.pullPolicy}} - volumeMounts: - - mountPath: /milvus/tools - name: tools containers: - name: datanode image: "{{ .Values.image.all.repository }}:{{ .Values.image.all.tag }}" imagePullPolicy: {{ .Values.image.all.pullPolicy }} {{- if .Values.dataNode.heaptrack.enabled }} - args: [ "/milvus/tools/run-helm.sh", "/milvus/tools/heaptrack/bin/heaptrack", "milvus", "run", "datanode" ] + args: [ "/milvus/tools/heaptrack/bin/heaptrack", "milvus", "run", "datanode" ] {{- else }} - args: [ "/milvus/tools/run-helm.sh", "milvus", "run", "datanode" ] + args: [ "milvus", "run", "datanode" ] {{- end }} env: {{- if .Values.dataNode.heaptrack.enabled }} diff --git a/charts/milvus/templates/indexcoord-deployment.yaml b/charts/milvus/templates/indexcoord-deployment.yaml index 6ae9b6e..1b4c7be 100644 --- a/charts/milvus/templates/indexcoord-deployment.yaml +++ b/charts/milvus/templates/indexcoord-deployment.yaml @@ -62,24 +62,14 @@ spec: - mountPath: /milvus/tools name: tools {{- end }} - - name: config - command: - - /cp - - /run-helm.sh,/merge - - /milvus/tools/run-helm.sh,/milvus/tools/merge - image: "{{ .Values.image.tools.repository }}:{{ .Values.image.tools.tag }}" - imagePullPolicy: {{ .Values.image.tools.pullPolicy}} - volumeMounts: - - mountPath: /milvus/tools - name: tools containers: - name: indexcoord image: "{{ .Values.image.all.repository }}:{{ .Values.image.all.tag }}" imagePullPolicy: {{ .Values.image.all.pullPolicy }} {{- if .Values.indexCoordinator.heaptrack.enabled }} - args: [ "/milvus/tools/run-helm.sh", "/milvus/tools/heaptrack/bin/heaptrack", "milvus", "run", "indexcoord" ] + args: [ "/milvus/tools/heaptrack/bin/heaptrack", "milvus", "run", "indexcoord" ] {{- else }} - args: [ "/milvus/tools/run-helm.sh", "milvus", "run", "indexcoord" ] + args: [ "milvus", "run", "indexcoord" ] {{- end }} env: {{- if .Values.indexCoordinator.heaptrack.enabled }} diff --git a/charts/milvus/templates/indexnode-deployment.yaml b/charts/milvus/templates/indexnode-deployment.yaml index 9321d52..9a47c8f 100644 --- a/charts/milvus/templates/indexnode-deployment.yaml +++ b/charts/milvus/templates/indexnode-deployment.yaml @@ -57,24 +57,14 @@ spec: - mountPath: /milvus/tools name: tools {{- end }} - - name: config - command: - - /cp - - /run-helm.sh,/merge - - /milvus/tools/run-helm.sh,/milvus/tools/merge - image: "{{ .Values.image.tools.repository }}:{{ .Values.image.tools.tag }}" - imagePullPolicy: {{ .Values.image.tools.pullPolicy}} - volumeMounts: - - mountPath: /milvus/tools - name: tools containers: - name: indexnode image: "{{ .Values.image.all.repository }}:{{ .Values.image.all.tag }}" imagePullPolicy: {{ .Values.image.all.pullPolicy }} {{- if .Values.indexNode.heaptrack.enabled }} - args: [ "/milvus/tools/run-helm.sh", "/milvus/tools/heaptrack/bin/heaptrack", "milvus", "run", "indexnode" ] + args: [ "/milvus/tools/heaptrack/bin/heaptrack", "milvus", "run", "indexnode" ] {{- else }} - args: [ "/milvus/tools/run-helm.sh", "milvus", "run", "indexnode" ] + args: [ "milvus", "run", "indexnode" ] {{- end }} env: {{- if .Values.indexNode.heaptrack.enabled }} diff --git a/charts/milvus/templates/mixcoord-deployment.yaml b/charts/milvus/templates/mixcoord-deployment.yaml index 543c7b6..02753f8 100644 --- a/charts/milvus/templates/mixcoord-deployment.yaml +++ b/charts/milvus/templates/mixcoord-deployment.yaml @@ -62,24 +62,14 @@ spec: - mountPath: /milvus/tools name: tools {{- end }} - - name: config - command: - - /cp - - /run-helm.sh,/merge - - /milvus/tools/run-helm.sh,/milvus/tools/merge - image: "{{ .Values.image.tools.repository }}:{{ .Values.image.tools.tag }}" - imagePullPolicy: {{ .Values.image.tools.pullPolicy}} - volumeMounts: - - mountPath: /milvus/tools - name: tools containers: - name: mixcoord image: "{{ .Values.image.all.repository }}:{{ .Values.image.all.tag }}" imagePullPolicy: {{ .Values.image.all.pullPolicy }} {{- if .Values.mixCoordinator.heaptrack.enabled }} - args: [ "/milvus/tools/heaptrack/bin/heaptrack", "/milvus/tools/run-helm.sh", "milvus", "run", "mixture", "-rootcoord", "-querycoord", "-datacoord", "-indexcoord" ] - {{- else }} args: [ "/milvus/tools/run-helm.sh", "milvus", "run", "mixture", "-rootcoord", "-querycoord", "-datacoord", "-indexcoord" ] + {{- else }} + args: [ "milvus", "run", "mixture", "-rootcoord", "-querycoord", "-datacoord", "-indexcoord" ] {{- end }} env: {{- if .Values.mixCoordinator.heaptrack.enabled }} diff --git a/charts/milvus/templates/proxy-deployment.yaml b/charts/milvus/templates/proxy-deployment.yaml index e19311a..c719763 100644 --- a/charts/milvus/templates/proxy-deployment.yaml +++ b/charts/milvus/templates/proxy-deployment.yaml @@ -58,24 +58,14 @@ spec: - mountPath: /milvus/tools name: tools {{- end }} - - name: config - command: - - /cp - - /run-helm.sh,/merge - - /milvus/tools/run-helm.sh,/milvus/tools/merge - image: "{{ .Values.image.tools.repository }}:{{ .Values.image.tools.tag }}" - imagePullPolicy: {{ .Values.image.tools.pullPolicy}} - volumeMounts: - - mountPath: /milvus/tools - name: tools containers: - name: proxy image: "{{ .Values.image.all.repository }}:{{ .Values.image.all.tag }}" imagePullPolicy: {{ .Values.image.all.pullPolicy }} {{- if .Values.proxy.heaptrack.enabled }} - args: [ "/milvus/tools/run-helm.sh", "/milvus/tools/heaptrack/bin/heaptrack", "milvus", "run", "proxy" ] + args: [ "/milvus/tools/heaptrack/bin/heaptrack", "milvus", "run", "proxy" ] {{- else }} - args: [ "/milvus/tools/run-helm.sh", "milvus", "run", "proxy" ] + args: [ "milvus", "run", "proxy" ] {{- end }} env: {{- if .Values.proxy.heaptrack.enabled }} diff --git a/charts/milvus/templates/querycoord-deployment.yaml b/charts/milvus/templates/querycoord-deployment.yaml index 90694fb..6fd33a4 100644 --- a/charts/milvus/templates/querycoord-deployment.yaml +++ b/charts/milvus/templates/querycoord-deployment.yaml @@ -62,24 +62,14 @@ spec: - mountPath: /milvus/tools name: tools {{- end }} - - name: config - command: - - /cp - - /run-helm.sh,/merge - - /milvus/tools/run-helm.sh,/milvus/tools/merge - image: "{{ .Values.image.tools.repository }}:{{ .Values.image.tools.tag }}" - imagePullPolicy: {{ .Values.image.tools.pullPolicy}} - volumeMounts: - - mountPath: /milvus/tools - name: tools containers: - name: querycoord image: "{{ .Values.image.all.repository }}:{{ .Values.image.all.tag }}" imagePullPolicy: {{ .Values.image.all.pullPolicy }} {{- if .Values.queryCoordinator.heaptrack.enabled }} - args: [ "/milvus/tools/run-helm.sh", "/milvus/tools/heaptrack/bin/heaptrack", "milvus", "run", "querycoord" ] + args: [ "/milvus/tools/heaptrack/bin/heaptrack", "milvus", "run", "querycoord" ] {{- else }} - args: [ "/milvus/tools/run-helm.sh", "milvus", "run", "querycoord" ] + args: [ "milvus", "run", "querycoord" ] {{- end }} env: {{- if .Values.queryCoordinator.heaptrack.enabled }} diff --git a/charts/milvus/templates/querynode-deployment.yaml b/charts/milvus/templates/querynode-deployment.yaml index 888d655..8cec842 100644 --- a/charts/milvus/templates/querynode-deployment.yaml +++ b/charts/milvus/templates/querynode-deployment.yaml @@ -57,24 +57,14 @@ spec: - mountPath: /milvus/tools name: tools {{- end }} - - name: config - command: - - /cp - - /run-helm.sh,/merge - - /milvus/tools/run-helm.sh,/milvus/tools/merge - image: "{{ .Values.image.tools.repository }}:{{ .Values.image.tools.tag }}" - imagePullPolicy: {{ .Values.image.tools.pullPolicy}} - volumeMounts: - - mountPath: /milvus/tools - name: tools containers: - name: querynode image: "{{ .Values.image.all.repository }}:{{ .Values.image.all.tag }}" imagePullPolicy: {{ .Values.image.all.pullPolicy }} {{- if .Values.queryNode.heaptrack.enabled }} - args: [ "/milvus/tools/run-helm.sh", "/milvus/tools/heaptrack/bin/heaptrack", "milvus", "run", "querynode" ] + args: [ "/milvus/tools/heaptrack/bin/heaptrack", "milvus", "run", "querynode" ] {{- else }} - args: [ "/milvus/tools/run-helm.sh", "milvus", "run", "querynode" ] + args: [ "milvus", "run", "querynode" ] {{- end }} env: {{- if .Values.queryNode.heaptrack.enabled }} diff --git a/charts/milvus/templates/rootcoord-deployment.yaml b/charts/milvus/templates/rootcoord-deployment.yaml index 2100c6a..c3f2123 100644 --- a/charts/milvus/templates/rootcoord-deployment.yaml +++ b/charts/milvus/templates/rootcoord-deployment.yaml @@ -62,24 +62,14 @@ spec: - mountPath: /milvus/tools name: tools {{- end }} - - name: config - command: - - /cp - - /run-helm.sh,/merge - - /milvus/tools/run-helm.sh,/milvus/tools/merge - image: "{{ .Values.image.tools.repository }}:{{ .Values.image.tools.tag }}" - imagePullPolicy: {{ .Values.image.tools.pullPolicy}} - volumeMounts: - - mountPath: /milvus/tools - name: tools containers: - name: rootcoord image: "{{ .Values.image.all.repository }}:{{ .Values.image.all.tag }}" imagePullPolicy: {{ .Values.image.all.pullPolicy }} {{- if .Values.rootCoordinator.heaptrack.enabled }} - args: [ "/milvus/tools/run-helm.sh", "/milvus/tools/heaptrack/bin/heaptrack", "milvus", "run", "rootcoord" ] + args: [ "/milvus/tools/heaptrack/bin/heaptrack", "milvus", "run", "rootcoord" ] {{- else }} - args: [ "/milvus/tools/run-helm.sh", "milvus", "run", "rootcoord" ] + args: [ "milvus", "run", "rootcoord" ] {{- end }} env: {{- if .Values.rootCoordinator.heaptrack.enabled }} diff --git a/charts/milvus/templates/standalone-deployment.yaml b/charts/milvus/templates/standalone-deployment.yaml index 74770fc..cbb2f3b 100644 --- a/charts/milvus/templates/standalone-deployment.yaml +++ b/charts/milvus/templates/standalone-deployment.yaml @@ -53,24 +53,14 @@ spec: - mountPath: /milvus/tools name: tools {{- end }} - - name: config - command: - - /cp - - /run-helm.sh,/merge - - /milvus/tools/run-helm.sh,/milvus/tools/merge - image: "{{ .Values.image.tools.repository }}:{{ .Values.image.tools.tag }}" - imagePullPolicy: {{ .Values.image.tools.pullPolicy}} - volumeMounts: - - mountPath: /milvus/tools - name: tools containers: - name: standalone image: "{{ .Values.image.all.repository }}:{{ .Values.image.all.tag }}" imagePullPolicy: {{ .Values.image.all.pullPolicy }} {{- if .Values.standalone.heaptrack.enabled }} - args: [ "/milvus/tools/run-helm.sh", "/milvus/tools/heaptrack/bin/heaptrack", "milvus", "run", "standalone" ] + args: [ "/milvus/tools/heaptrack/bin/heaptrack", "milvus", "run", "standalone" ] {{- else }} - args: [ "/milvus/tools/run-helm.sh", "milvus", "run", "standalone" ] + args: [ "milvus", "run", "standalone" ] {{- end }} ports: - name: milvus diff --git a/charts/milvus/values.yaml b/charts/milvus/values.yaml index 43e0c73..e08230d 100644 --- a/charts/milvus/values.yaml +++ b/charts/milvus/values.yaml @@ -5,7 +5,7 @@ cluster: image: all: repository: milvusdb/milvus - tag: v2.4.5 + tag: v2.4.6 pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. ## Secrets must be manually created in the namespace. @@ -649,23 +649,23 @@ pulsar: broker: repository: apachepulsar/pulsar pullPolicy: IfNotPresent - tag: 2.8.2 + tag: 2.9.5 autorecovery: repository: apachepulsar/pulsar - tag: 2.8.2 + tag: 2.9.5 pullPolicy: IfNotPresent zookeeper: repository: apachepulsar/pulsar pullPolicy: IfNotPresent - tag: 2.8.2 + tag: 2.9.5 bookie: repository: apachepulsar/pulsar pullPolicy: IfNotPresent - tag: 2.8.2 + tag: 2.9.5 proxy: repository: apachepulsar/pulsar pullPolicy: IfNotPresent - tag: 2.8.2 + tag: 2.9.5 pulsar_manager: repository: apachepulsar/pulsar-manager pullPolicy: IfNotPresent @@ -783,6 +783,7 @@ pulsar: type: ClusterIP ports: pulsar: 6650 + http: 8080 configData: PULSAR_MEM: > -Xms2048m -Xmx2048m @@ -801,7 +802,7 @@ pulsar: image: # the image used for running `pulsar-cluster-initialize` job repository: apachepulsar/pulsar - tag: 2.8.2 + tag: 2.9.5 ## Configuration values for the kafka dependency