diff --git a/charts/milvus/templates/config.tpl b/charts/milvus/templates/config.tpl index ce86114..2013bac 100644 --- a/charts/milvus/templates/config.tpl +++ b/charts/milvus/templates/config.tpl @@ -47,8 +47,13 @@ minio: {{- if .Values.externalS3.enabled }} address: {{ .Values.externalS3.host }} port: {{ .Values.externalS3.port }} + {{- if not .Values.keysFromSecret.enabled}} accessKeyID: {{ .Values.externalS3.accessKey }} secretAccessKey: {{ .Values.externalS3.secretKey }} + {{- end}} + {{- if .Values.externalS3.tlsCACert}} + ssl.tlsCACert: {{ .Values.externalS3.tlsCACert }} ## custom path to certs file + {{- end}} useSSL: {{ .Values.externalS3.useSSL }} bucketName: {{ .Values.externalS3.bucketName }} rootPath: {{ .Values.externalS3.rootPath }} diff --git a/charts/milvus/templates/datanode-deployment.yaml b/charts/milvus/templates/datanode-deployment.yaml index 1c38184..31014a8 100644 --- a/charts/milvus/templates/datanode-deployment.yaml +++ b/charts/milvus/templates/datanode-deployment.yaml @@ -92,6 +92,18 @@ spec: - name: LD_LIBRARY_PATH value: /milvus/tools/heaptrack/lib:/milvus/lib:/usr/lib {{- end }} + {{- if .Values.externalS3.keysFromSecret.enabled }} + - name: MINIO_ACCESS_KEY_ID + valueFrom: + secretKeyRef: + name: {{ .Values.externalS3.loadKeysFromSecret.secretName }} + key: s3_accessKey + - name: MINIO_SECRET_ACCESS_KEY + valueFrom: + secretKeyRef: + name: {{ .Values.externalS3.loadKeysFromSecret.secretName }} + key: s3_secretKey + {{- end }} {{- if .Values.dataNode.extraEnv }} {{- toYaml .Values.dataNode.extraEnv | nindent 8 }} {{- end }} diff --git a/charts/milvus/templates/indexnode-deployment.yaml b/charts/milvus/templates/indexnode-deployment.yaml index 8adc19b..c6d0744 100644 --- a/charts/milvus/templates/indexnode-deployment.yaml +++ b/charts/milvus/templates/indexnode-deployment.yaml @@ -105,6 +105,18 @@ spec: divisor: 1Gi resource: limits.ephemeral-storage {{- end }} + {{- if .Values.externalS3.keysFromSecret.enabled }} + - name: MINIO_ACCESS_KEY_ID + valueFrom: + secretKeyRef: + name: {{ .Values.externalS3.loadKeysFromSecret.secretName }} + key: s3_accessKey + - name: MINIO_SECRET_ACCESS_KEY + valueFrom: + secretKeyRef: + name: {{ .Values.externalS3.loadKeysFromSecret.secretName }} + key: s3_secretKey + {{- end }} {{- if .Values.indexNode.extraEnv }} {{- toYaml .Values.indexNode.extraEnv | nindent 8 }} {{- end }} diff --git a/charts/milvus/templates/querynode-deployment.yaml b/charts/milvus/templates/querynode-deployment.yaml index 3ebe44a..c887b1f 100644 --- a/charts/milvus/templates/querynode-deployment.yaml +++ b/charts/milvus/templates/querynode-deployment.yaml @@ -115,6 +115,18 @@ spec: - name: MILVUS_SERVER_LABEL_RESOURCE_GROUP value: {{ .rg | quote }} {{- end }} + {{- if .Values.externalS3.keysFromSecret.enabled }} + - name: MINIO_ACCESS_KEY_ID + valueFrom: + secretKeyRef: + name: {{ .Values.externalS3.loadKeysFromSecret.secretName }} + key: s3_accessKey + - name: MINIO_SECRET_ACCESS_KEY + valueFrom: + secretKeyRef: + name: {{ .Values.externalS3.loadKeysFromSecret.secretName }} + key: s3_secretKey + {{- end }} {{- if .Values.queryNode.extraEnv }} {{- toYaml .Values.queryNode.extraEnv | nindent 8 }} {{- end }} diff --git a/charts/milvus/templates/standalone-deployment.yaml b/charts/milvus/templates/standalone-deployment.yaml index 4109457..7cdf00f 100644 --- a/charts/milvus/templates/standalone-deployment.yaml +++ b/charts/milvus/templates/standalone-deployment.yaml @@ -122,6 +122,18 @@ spec: divisor: 1Gi resource: limits.ephemeral-storage {{- end }} + {{- if .Values.externalS3.keysFromSecret.enabled }} + - name: MINIO_ACCESS_KEY_ID + valueFrom: + secretKeyRef: + name: {{ .Values.externalS3.loadKeysFromSecret.secretName }} + key: s3_accessKey + - name: MINIO_SECRET_ACCESS_KEY + valueFrom: + secretKeyRef: + name: {{ .Values.externalS3.loadKeysFromSecret.secretName }} + key: s3_secretKey + {{- end }} {{- if .Values.standalone.extraEnv }} {{- toYaml .Values.standalone.extraEnv | nindent 8 }} {{- end }} diff --git a/charts/milvus/templates/streamingnode-deployment.yaml b/charts/milvus/templates/streamingnode-deployment.yaml index ec33cb9..c26caf8 100644 --- a/charts/milvus/templates/streamingnode-deployment.yaml +++ b/charts/milvus/templates/streamingnode-deployment.yaml @@ -103,6 +103,18 @@ spec: - name: MILVUS_SERVER_LABEL_RESOURCE_GROUP value: {{ .rg | quote }} {{- end }} + {{- if .Values.externalS3.keysFromSecret.enabled }} + - name: MINIO_ACCESS_KEY_ID + valueFrom: + secretKeyRef: + name: {{ .Values.externalS3.loadKeysFromSecret.secretName }} + key: s3_accessKey + - name: MINIO_SECRET_ACCESS_KEY + valueFrom: + secretKeyRef: + name: {{ .Values.externalS3.loadKeysFromSecret.secretName }} + key: s3_secretKey + {{- end }} {{- if .Values.streamingNode.extraEnv }} {{- toYaml .Values.streamingNode.extraEnv | nindent 8 }} {{- end }} diff --git a/charts/milvus/values.yaml b/charts/milvus/values.yaml index 25dd8f3..e122271 100644 --- a/charts/milvus/values.yaml +++ b/charts/milvus/values.yaml @@ -1385,6 +1385,9 @@ externalS3: enabled: false host: "" port: "" + keysFromSecret: #load accesskey and secret key from a secret + enabled: false + secret_name: "" accessKey: "" secretKey: "" useSSL: false