Merge branch 'master' into 22-proxy-tls-support

zilliztech · Oct 8, 2023 · e2566af · e2566af
2 parents 787c7d7 + 097a219
commit e2566af
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 1 deletion.
diff --git a/charts/milvus/Chart.yaml b/charts/milvus/Chart.yaml
@@ -3,7 +3,7 @@ name: milvus
 appVersion: "2.3.1"
 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.4
+version: 4.1.5
 keywords:
   - milvus
   - elastic

diff --git a/charts/milvus/README.md b/charts/milvus/README.md
@@ -251,6 +251,8 @@ The following table lists the configurable parameters of the Milvus Service and
 | `externalS3.useIAM`                       | If true, use iam to connect to the external S3 | `false`                                                |
 | `externalS3.cloudProvider`                | When `useIAM` enabled, only "aws" & "gcp" is supported for now | `aws`                                  |
 | `externalS3.iamEndpoint`                  | The IAM endpoint of  the external S3 | ``                                                |
+| `externalS3.region`                  | The region of  the external S3 | ``                                                |
+| `externalS3.useVirtualHost`                  | If true, the external S3 whether use virtual host bucket mode | ``                                                |
 | `externalGcs.bucketName`                  | The Bucket Name of the external GCS. Requires GCS gateway to be enabled in the minIO configuration | `unset`                                                |
 | `externalEtcd.enabled`                    | Enable or disable external Etcd               | `false`                                                 |
 | `externalEtcd.endpoints`                  | The endpoints of the external etcd            | `{}`                                                    |

diff --git a/charts/milvus/templates/attu-deployment.yaml b/charts/milvus/templates/attu-deployment.yaml
@@ -57,4 +57,12 @@ spec:
       tolerations:
 {{ toYaml .Values.attu.tolerations | indent 8 }}
     {{- end }}
+{{- if and (.Values.nodeSelector) (not .Values.attu.nodeSelector) }}
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 8 }}
+   {{- end }}
+   {{- if .Values.attu.nodeSelector }}
+      nodeSelector:
+   {{ toYaml .Values.attu.nodeSelector | indent 8 }}
+   {{- end }}
 {{- end }}
diff --git a/charts/milvus/templates/config.tpl b/charts/milvus/templates/config.tpl
@@ -78,6 +78,8 @@ minio:
   useIAM: {{ .Values.externalS3.useIAM }}
   cloudProvider: {{ .Values.externalS3.cloudProvider }}
   iamEndpoint: {{ .Values.externalS3.iamEndpoint }}
+  region: {{ .Values.externalS3.region }}
+  useVirtualHost: {{ .Values.externalS3.useVirtualHost }}
 {{- else }}
 {{- if contains .Values.minio.name .Release.Name }}
   address: {{ .Release.Name }}
@@ -96,6 +98,8 @@ minio:
   rootPath: {{ .Values.minio.rootPath }}
   useIAM: {{ .Values.minio.useIAM }}
   iamEndpoint: {{ .Values.minio.iamEndpoint }}
+  region: {{ .Values.minio.region }}
+  useVirtualHost: {{ .Values.minio.useVirtualHost }}
 {{- end }}
 
 {{- if .Values.externalPulsar.enabled }}

diff --git a/charts/milvus/templates/datanode-deployment.yaml b/charts/milvus/templates/datanode-deployment.yaml
@@ -12,7 +12,9 @@ metadata:
 {{ include "milvus.ud.annotations" . | indent 4 }}
 
 spec:
+  {{- if ge (int .Values.dataNode.replicas) 0 }}
   replicas: {{ .Values.dataNode.replicas }}
+  {{- end }}
   selector:
     matchLabels:
 {{ include "milvus.matchLabels" . | indent 6 }}

diff --git a/charts/milvus/templates/indexnode-deployment.yaml b/charts/milvus/templates/indexnode-deployment.yaml
@@ -11,7 +11,9 @@ metadata:
 {{ include "milvus.ud.annotations" . | indent 4 }}
 
 spec:
+  {{- if ge (int .Values.indexNode.replicas) 0 }}
   replicas: {{ .Values.indexNode.replicas }}
+  {{- end }}
   selector:
     matchLabels:
 {{ include "milvus.matchLabels" . | indent 6 }}

diff --git a/charts/milvus/templates/proxy-deployment.yaml b/charts/milvus/templates/proxy-deployment.yaml
@@ -12,7 +12,9 @@ metadata:
 {{ include "milvus.ud.annotations" . | indent 4 }}
 
 spec:
+  {{- if ge (int .Values.proxy.replicas) 0 }}
   replicas: {{ .Values.proxy.replicas }}
+  {{- end }}
   selector:
     matchLabels:
 {{ include "milvus.matchLabels" . | indent 6 }}

diff --git a/charts/milvus/templates/querynode-deployment.yaml b/charts/milvus/templates/querynode-deployment.yaml
@@ -11,7 +11,9 @@ metadata:
 {{ include "milvus.ud.annotations" . | indent 4 }}
 
 spec:
+  {{- if ge (int .Values.queryNode.replicas) 0 }}
   replicas: {{ .Values.queryNode.replicas }}
+  {{- end }}
   selector:
     matchLabels:
 {{ include "milvus.matchLabels" . | indent 6 }}

diff --git a/charts/milvus/values.yaml b/charts/milvus/values.yaml
@@ -222,6 +222,7 @@ standalone:
 
 proxy:
   enabled: true
+  # You can set the number of replicas to -1 to remove the replicas field in case you want to use HPA
   replicas: 1
   resources: {}
   nodeSelector: {}
@@ -297,6 +298,7 @@ queryCoordinator:
 
 queryNode:
   enabled: true
+  # You can set the number of replicas to -1 to remove the replicas field in case you want to use HPA
   replicas: 1
   resources: {}
   # Set local storage size in resources
@@ -339,6 +341,7 @@ indexCoordinator:
 
 indexNode:
   enabled: true
+  # You can set the number of replicas to -1 to remove the replicas field in case you want to use HPA
   replicas: 1
   resources: {}
   # Set local storage size in resources
@@ -381,6 +384,7 @@ dataCoordinator:
 
 dataNode:
   enabled: true
+  # You can set the number of replicas to -1 to remove the replicas field in case you want to use HPA
   replicas: 1
   resources: {}
   nodeSelector: {}
@@ -462,6 +466,8 @@ minio:
   rootPath: file
   useIAM: false
   iamEndpoint: ""
+  region: ""
+  useVirtualHost: false
   podDisruptionBudget:
     enabled: false
   resources:
@@ -890,6 +896,8 @@ externalS3:
   useIAM: false
   cloudProvider: "aws"
   iamEndpoint: ""
+  region: ""
+  useVirtualHost: false
 
 ###################################
 # GCS Gateway