Skip to content
This repository was archived by the owner on Aug 16, 2023. It is now read-only.

Commit 4ee38cf

Browse files
author
Sheldon
authored
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 <chuanfeng.liu@zilliz.com>
1 parent 78dce7c commit 4ee38cf

8 files changed

Lines changed: 9 additions & 6 deletions

File tree

charts/milvus/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: milvus
33
appVersion: "2.2.2"
44
kubeVersion: "^1.10.0-0"
55
description: Milvus is an open-source vector database built to power AI applications and vector similarity search.
6-
version: 4.0.2
6+
version: 4.0.3
77
keywords:
88
- milvus
99
- elastic

charts/milvus/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ The following table lists the configurable parameters of the Milvus Service and
163163
| `externalS3.bucketName` | The Bucket Name of the external S3 | `unset` |
164164
| `externalS3.useSSL` | If true, use SSL to connect to the external S3 | `false` |
165165
| `externalS3.useIAM` | If true, use iam to connect to the external S3 | `false` |
166+
| `externalS3.cloudProvider` | When `useIAM` enabled, only "aws" & "gcp" is supported for now | `aws` |
166167
| `externalS3.iamEndpoint` | The IAM endpoint of the external S3 | `` |
167168
| `externalGcs.bucketName` | The Bucket Name of the external GCS. Requires GCS gateway to be enabled in the minIO configuration | `unset` |
168169
| `externalEtcd.enabled` | Enable or disable external Etcd | `false` |
-20.7 KB
Binary file not shown.
21 KB
Binary file not shown.

charts/milvus/requirements.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ dependencies:
44
version: 6.3.3
55
- name: minio
66
repository: https://milvus-io.github.io/milvus-helm
7-
version: 8.0.14
7+
version: 8.0.15
88
- name: pulsar
99
repository: https://pulsar.apache.org/charts
1010
version: 2.7.8
@@ -14,5 +14,5 @@ dependencies:
1414
- name: mysql
1515
repository: https://raw.githubusercontent.com/bitnami/charts/pre-2022/bitnami
1616
version: 8.5.3
17-
digest: sha256:9c123c30cb66b994fec4bd646780a3ae665ec7f53920b245ed42ebc1390ce1e9
18-
generated: "2022-12-22T18:04:42.663581+08:00"
17+
digest: sha256:ef5a798e473fd13779773dfa4fce6d41117b923ad941d87984ea84f3bd1212f8
18+
generated: "2022-12-28T17:11:10.312298+08:00"

charts/milvus/requirements.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ dependencies:
66
tags:
77
- etcd
88
- name: minio
9-
version: 8.0.14
9+
version: 8.0.15
1010
repository: https://milvus-io.github.io/milvus-helm
1111
condition: minio.enabled
1212
tags:

charts/milvus/templates/config.tpl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ minio:
7676
bucketName: {{ .Values.externalS3.bucketName }}
7777
rootPath: {{ .Values.externalS3.rootPath }}
7878
useIAM: {{ .Values.externalS3.useIAM }}
79+
cloudProvider: {{ .Values.externalS3.cloudProvider }}
7980
iamEndpoint: {{ .Values.externalS3.iamEndpoint }}
8081
{{- else }}
8182
{{- if contains .Values.minio.name .Release.Name }}
@@ -105,7 +106,7 @@ pulsar:
105106
address: {{ .Values.externalPulsar.host }}
106107
port: {{ .Values.externalPulsar.port }}
107108
maxMessageSize: {{ .Values.externalPulsar.maxMessageSize }}
108-
tenant: {{ .Values.externalPulsar.tenant }}
109+
tenant: "{{ .Values.externalPulsar.tenant }}"
109110
namespace: {{ .Values.externalPulsar.namespace }}
110111
authPlugin: {{ .Values.externalPulsar.authPlugin }}
111112
authParams: {{ .Values.externalPulsar.authParams }}

charts/milvus/values.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -817,6 +817,7 @@ externalS3:
817817
bucketName: ""
818818
rootPath: ""
819819
useIAM: false
820+
cloudProvider: "aws"
820821
iamEndpoint: ""
821822

822823
###################################

0 commit comments

Comments
 (0)