milvus-io
/
milvus
mirror of https://github.com/milvus-io/milvus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Supprot to read the configuration of minio from environment variables (#10534) 

Signed-off-by: cai.zhang <cai.zhang@zilliz.com>
pull/10653/head
cai.zhang 2021-10-26 15:10:03 +08:00 committed by GitHub
parent 664da326e4
commit aff5cd9598
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 56 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
internal/datanode/param_table.go
View File

@ -255,7 +255,7 @@ func (p *ParamTable) initMinioAddress() {
}
func (p *ParamTable) initMinioAccessKeyID() {
keyID, err := p.Load("minio.accessKeyID")
keyID, err := p.Load("_MinioAccessKeyID")
if err != nil {
panic(err)
}
@ -263,7 +263,7 @@ func (p *ParamTable) initMinioAccessKeyID() {
}
func (p *ParamTable) initMinioSecretAccessKey() {
key, err := p.Load("minio.secretAccessKey")
key, err := p.Load("_MinioSecretAccessKey")
if err != nil {
panic(err)
}
@ -271,7 +271,7 @@ func (p *ParamTable) initMinioSecretAccessKey() {
}
func (p *ParamTable) initMinioUseSSL() {
usessl, err := p.Load("minio.useSSL")
usessl, err := p.Load("_MinioUseSSL")
if err != nil {
panic(err)
}
@ -279,7 +279,7 @@ func (p *ParamTable) initMinioUseSSL() {
}
func (p *ParamTable) initMinioBucketName() {
bucketName, err := p.Load("minio.bucketName")
bucketName, err := p.Load("_MinioBucketName")
if err != nil {
panic(err)
}

8
internal/indexnode/param_table.go
View File

@ -105,7 +105,7 @@ func (pt *ParamTable) initMinIOAddress() {
}
func (pt *ParamTable) initMinIOAccessKeyID() {
ret, err := pt.Load("minio.accessKeyID")
ret, err := pt.Load("_MinioAccessKeyID")
if err != nil {
panic(err)
}
@ -113,7 +113,7 @@ func (pt *ParamTable) initMinIOAccessKeyID() {
}
func (pt *ParamTable) initMinIOSecretAccessKey() {
ret, err := pt.Load("minio.secretAccessKey")
ret, err := pt.Load("_MinioSecretAccessKey")
if err != nil {
panic(err)
}
@ -121,7 +121,7 @@ func (pt *ParamTable) initMinIOSecretAccessKey() {
}
func (pt *ParamTable) initMinIOUseSSL() {
ret, err := pt.Load("minio.useSSL")
ret, err := pt.Load("_MinioUseSSL")
if err != nil {
panic(err)
}
@ -160,7 +160,7 @@ func (pt *ParamTable) initIndexRootPath() {
}
func (pt *ParamTable) initMinioBucketName() {
bucketName, err := pt.Load("minio.bucketName")
bucketName, err := pt.Load("_MinioBucketName")
if err != nil {
panic(err)
}

48
internal/util/paramtable/basetable.go
View File

@ -258,6 +258,54 @@ func (gp *BaseTable) tryloadFromEnv() {
if err != nil {
panic(err)
}
minioAccessKey := os.Getenv("MINIO_ACCESS_KEY")
if minioAccessKey == "" {
minioAccessKey, err = gp.Load("minio.accessKeyID")
if err != nil {
panic(err)
}
}
err = gp.Save("_MinioAccessKeyID", minioAccessKey)
if err != nil {
panic(err)
}
minioSecretKey := os.Getenv("MINIO_SECRET_KEY")
if minioSecretKey == "" {
minioSecretKey, err = gp.Load("minio.secretAccessKey")
if err != nil {
panic(err)
}
}
err = gp.Save("_MinioSecretAccessKey", minioSecretKey)
if err != nil {
panic(err)
}
minioUseSSL := os.Getenv("MINIO_USE_SSL")
if minioUseSSL == "" {
minioUseSSL, err = gp.Load("minio.useSSL")
if err != nil {
panic(err)
}
}
err = gp.Save("_MinioUseSSL", minioUseSSL)
if err != nil {
panic(err)
}
minioBucketName := os.Getenv("MINIO_BUCKET_NAME")
if minioBucketName == "" {
minioBucketName, err = gp.Load("minio.bucketName")
if err != nil {
panic(err)
}
}
err = gp.Save("_MinioBucketName", minioBucketName)
if err != nil {
panic(err)
}
}
func (gp *BaseTable) Load(key string) (string, error) {