Protect pulsar.tenant;update milvus with new version minio chart;add (#…

…409) externalS3.cloudProvider 1. Set `pulsar.tenant` must be a string 2. Update requirements with new version minio chart (8.0.15) 3. Add externalS3.cloudProvider for milvus.config Signed-off-by: Sheldon <[email protected]>
milvus-io · Jan 3, 2023 · 4ee38cf · 4ee38cf
1 parent 78dce7c
commit 4ee38cf
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 6 deletions.
diff --git a/charts/milvus/Chart.yaml b/charts/milvus/Chart.yaml
@@ -3,7 +3,7 @@ name: milvus
 appVersion: "2.2.2"
 kubeVersion: "^1.10.0-0"
 description: Milvus is an open-source vector database built to power AI applications and vector similarity search.
-version: 4.0.2
+version: 4.0.3
 keywords:
   - milvus
   - elastic

diff --git a/charts/milvus/README.md b/charts/milvus/README.md
@@ -163,6 +163,7 @@ The following table lists the configurable parameters of the Milvus Service and
 | `externalS3.bucketName`                   | The Bucket Name of the external S3            | `unset`                                                 |
 | `externalS3.useSSL`                       | If true, use SSL to connect to the external S3 | `false`                                                |
 | `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 | ``                                                |
 | `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`                                                 |

diff --git a/charts/milvus/charts/minio-8.0.14.tgz b/charts/milvus/charts/minio-8.0.14.tgz
diff --git a/charts/milvus/charts/minio-8.0.15.tgz b/charts/milvus/charts/minio-8.0.15.tgz
diff --git a/charts/milvus/requirements.lock b/charts/milvus/requirements.lock
@@ -4,7 +4,7 @@ dependencies:
   version: 6.3.3
 - name: minio
   repository: https://milvus-io.github.io/milvus-helm
-  version: 8.0.14
+  version: 8.0.15
 - name: pulsar
   repository: https://pulsar.apache.org/charts
   version: 2.7.8
@@ -14,5 +14,5 @@ dependencies:
 - name: mysql
   repository: https://raw.githubusercontent.com/bitnami/charts/pre-2022/bitnami
   version: 8.5.3
-digest: sha256:9c123c30cb66b994fec4bd646780a3ae665ec7f53920b245ed42ebc1390ce1e9
-generated: "2022-12-22T18:04:42.663581+08:00"
+digest: sha256:ef5a798e473fd13779773dfa4fce6d41117b923ad941d87984ea84f3bd1212f8
+generated: "2022-12-28T17:11:10.312298+08:00"
diff --git a/charts/milvus/requirements.yaml b/charts/milvus/requirements.yaml
@@ -6,7 +6,7 @@ dependencies:
   tags:
     - etcd
 - name: minio
-  version: 8.0.14
+  version: 8.0.15
   repository: https://milvus-io.github.io/milvus-helm
   condition: minio.enabled
   tags:

diff --git a/charts/milvus/templates/config.tpl b/charts/milvus/templates/config.tpl
@@ -76,6 +76,7 @@ minio:
   bucketName: {{ .Values.externalS3.bucketName }}
   rootPath: {{ .Values.externalS3.rootPath }}
   useIAM: {{ .Values.externalS3.useIAM }}
+  cloudProvider: {{ .Values.externalS3.cloudProvider }}
   iamEndpoint: {{ .Values.externalS3.iamEndpoint }}
 {{- else }}
 {{- if contains .Values.minio.name .Release.Name }}
@@ -105,7 +106,7 @@ pulsar:
   address: {{ .Values.externalPulsar.host }}
   port: {{ .Values.externalPulsar.port }}
   maxMessageSize: {{ .Values.externalPulsar.maxMessageSize }}
-  tenant: {{ .Values.externalPulsar.tenant }}
+  tenant: "{{ .Values.externalPulsar.tenant }}"
   namespace: {{ .Values.externalPulsar.namespace }}
   authPlugin: {{ .Values.externalPulsar.authPlugin }}
   authParams: {{ .Values.externalPulsar.authParams }}

diff --git a/charts/milvus/values.yaml b/charts/milvus/values.yaml
@@ -817,6 +817,7 @@ externalS3:
   bucketName: ""
   rootPath: ""
   useIAM: false
+  cloudProvider: "aws"
   iamEndpoint: ""
 
 ###################################