feat:object storage aksk uses k8s secret storage

charts/milvus/Chart.yaml

@@ -3,7 +3,7 @@ name: milvus
 appVersion: "2.6.3"
 kubeVersion: "^1.10.0-0"
 description: Milvus is an open-source vector database built to power AI applications and vector similarity search.
-version: 5.0.4
+version: 5.0.5
 keywords:
   - milvus
   - elastic

charts/milvus/README.md

@@ -120,6 +120,17 @@ $ helm upgrade --install my-release zilliztech/milvus --set pulsarv3.enabled=fal
 
 By default, milvus cluster uses `mixCoordinator` which contains all coordinators. This is the recommended deployment approach for Milvus v2.6.x and later versions.
 
+### Use external S3 as object storage and store aksk in secret
+1. Create a secret with name `s3-credentials` or use existing aksk secret
+```bash
+$ kubectl create secret generic s3-credentials --from-literal=accessKey=YOUR_ACCESS_KEY --from-literal=secretKey=YOUR_SECRET_KEY
+```
+2. Helm upgrade with this secret
+```bash
+# Helm v3.x
+$ helm upgrade --install my-release --set cluster.enabled=false --set etcd.replicaCount=1 --set pulsarv3.enabled=false --set minio.enabled=false --set externalS3.enabled=true --set externalS3.existingSecret.enabled=true --set externalS3.existingSecret.name=s3-credentials --set externalS3.existingSecret.accessKey=accessKey --set externalS3.existingSecret.secretKey=secretKey --set externalS3.host=YOUR_S3_HOST --set externalS3.port=YOUR_S3_PORT --set externalS3.bucketName=milvus-bucket zilliztech/milvus
+```
+
 ### Upgrading from Milvus v2.5.x to v2.6.x
 
 Upgrading from Milvus 2.5.x to 2.6.x involves significant architectural changes. Please follow these steps carefully:

charts/milvus/templates/datacoord-deployment.yaml

@@ -95,6 +95,18 @@ spec:
         {{- if .Values.dataCoordinator.extraEnv }}
           {{- toYaml .Values.dataCoordinator.extraEnv | nindent 8 }}
         {{- end }}
+        {{- if and .Values.externalS3.enabled .Values.externalS3.existingSecret.enabled }}
+        - name: MINIO_ACCESS_KEY_ID
+          valueFrom:
+            secretKeyRef:
+              name: {{ .Values.externalS3.existingSecret.name }}
+              key: {{ .Values.externalS3.existingSecret.accessKey }}
+        - name: MINIO_SECRET_ACCESS_KEY
+          valueFrom:
+            secretKeyRef:
+              name: {{ .Values.externalS3.existingSecret.name }}
+              key: {{ .Values.externalS3.existingSecret.secretKey }}
+        {{- end }}
         {{ if and (.Values.containerSecurityContext) (not .Values.dataCoordinator.containerSecurityContext) }}
         securityContext:
           {{- toYaml .Values.containerSecurityContext | nindent 12 }}

charts/milvus/templates/datanode-deployment.yaml

@@ -95,6 +95,18 @@ spec:
         {{- if .Values.dataNode.extraEnv }}
           {{- toYaml .Values.dataNode.extraEnv | nindent 8 }}
         {{- end }}
+        {{- if and .Values.externalS3.enabled .Values.externalS3.existingSecret.enabled }}
+        - name: MINIO_ACCESS_KEY_ID
+          valueFrom:
+            secretKeyRef:
+              name: {{ .Values.externalS3.existingSecret.name }}
+              key: {{ .Values.externalS3.existingSecret.accessKey }}
+        - name: MINIO_SECRET_ACCESS_KEY
+          valueFrom:
+            secretKeyRef:
+              name: {{ .Values.externalS3.existingSecret.name }}
+              key: {{ .Values.externalS3.existingSecret.secretKey }}
+        {{- end }}
         ports:
           - name: datanode
             containerPort: 21124

charts/milvus/templates/indexcoord-deployment.yaml

@@ -103,6 +103,18 @@ spec:
         {{- if .Values.indexCoordinator.extraEnv }}
           {{- toYaml .Values.indexCoordinator.extraEnv | nindent 8 }}
         {{- end }}
+        {{- if and .Values.externalS3.enabled .Values.externalS3.existingSecret.enabled }}
+        - name: MINIO_ACCESS_KEY_ID
+          valueFrom:
+            secretKeyRef:
+              name: {{ .Values.externalS3.existingSecret.name }}
+              key: {{ .Values.externalS3.existingSecret.accessKey }}
+        - name: MINIO_SECRET_ACCESS_KEY
+          valueFrom:
+            secretKeyRef:
+              name: {{ .Values.externalS3.existingSecret.name }}
+              key: {{ .Values.externalS3.existingSecret.secretKey }}
+        {{- end }}
         ports:
           - name: indexcoord
             containerPort: 31000

charts/milvus/templates/indexnode-deployment.yaml

@@ -108,6 +108,18 @@ spec:
         {{- if .Values.indexNode.extraEnv }}
           {{- toYaml .Values.indexNode.extraEnv | nindent 8 }}
         {{- end }}
+        {{- if and .Values.externalS3.enabled .Values.externalS3.existingSecret.enabled }}
+        - name: MINIO_ACCESS_KEY_ID
+          valueFrom:
+            secretKeyRef:
+              name: {{ .Values.externalS3.existingSecretKeys.name }}
+              key: {{ .Values.externalS3.existingSecretKeys.accessKey }}
+        - name: MINIO_SECRET_ACCESS_KEY
+          valueFrom:
+            secretKeyRef:
+              name: {{ .Values.externalS3.existingSecretKeys.name }}
+              key: {{ .Values.externalS3.existingSecretKeys.secretKey }}
+        {{- end }}
         ports:
           - name: indexnode
             containerPort: 21121

charts/milvus/templates/mixcoord-deployment.yaml

@@ -99,6 +99,18 @@ spec:
         {{- if .Values.mixCoordinator.extraEnv }}
           {{- toYaml .Values.mixCoordinator.extraEnv | nindent 8 }}
         {{- end }}
+        {{- if and .Values.externalS3.enabled .Values.externalS3.existingSecret.enabled }}
+        - name: MINIO_ACCESS_KEY_ID
+          valueFrom:
+            secretKeyRef:
+              name: {{ .Values.externalS3.existingSecret.name }}
+              key: {{ .Values.externalS3.existingSecret.accessKey }}
+        - name: MINIO_SECRET_ACCESS_KEY
+          valueFrom:
+            secretKeyRef:
+              name: {{ .Values.externalS3.existingSecret.name }}
+              key: {{ .Values.externalS3.existingSecret.secretKey }}
+        {{- end }}
         ports:
           - name: metrics
             containerPort: 9091

charts/milvus/templates/proxy-deployment.yaml

@@ -95,6 +95,18 @@ spec:
         {{- if .Values.proxy.extraEnv }}
           {{- toYaml .Values.proxy.extraEnv | nindent 8 }}
         {{- end }}
+        {{- if and .Values.externalS3.enabled .Values.externalS3.existingSecret.enabled }}
+        - name: MINIO_ACCESS_KEY_ID
+          valueFrom:
+            secretKeyRef:
+              name: {{ .Values.externalS3.existingSecret.name }}
+              key: {{ .Values.externalS3.existingSecret.accessKey }}
+        - name: MINIO_SECRET_ACCESS_KEY
+          valueFrom:
+            secretKeyRef:
+              name: {{ .Values.externalS3.existingSecret.name }}
+              key: {{ .Values.externalS3.existingSecret.secretKey }}
+        {{- end }}
         ports:
           - name: milvus
             containerPort: 19530

charts/milvus/templates/querycoord-deployment.yaml

@@ -103,6 +103,18 @@ spec:
         {{- if .Values.queryCoordinator.extraEnv }}
           {{- toYaml .Values.queryCoordinator.extraEnv | nindent 8 }}
         {{- end }}
+        {{- if and .Values.externalS3.enabled .Values.externalS3.existingSecret.enabled }}
+        - name: MINIO_ACCESS_KEY_ID
+          valueFrom:
+            secretKeyRef:
+              name: {{ .Values.externalS3.existingSecret.name }}
+              key: {{ .Values.externalS3.existingSecret.accessKey }}
+        - name: MINIO_SECRET_ACCESS_KEY
+          valueFrom:
+            secretKeyRef:
+              name: {{ .Values.externalS3.existingSecret.name }}
+              key: {{ .Values.externalS3.existingSecret.secretKey }}
+        {{- end }}
         ports:
           - name: querycoord
             containerPort: 19531

charts/milvus/templates/querynode-deployment.yaml

@@ -104,6 +104,18 @@ spec:
         {{- if .Values.queryNode.extraEnv }}
           {{- toYaml .Values.queryNode.extraEnv | nindent 8 }}
         {{- end }}
+        {{- if and .Values.externalS3.enabled .Values.externalS3.existingSecret.enabled }}
+        - name: MINIO_ACCESS_KEY_ID
+          valueFrom:
+            secretKeyRef:
+              name: {{ .Values.externalS3.existingSecret.name }}
+              key: {{ .Values.externalS3.existingSecret.accessKey }}
+        - name: MINIO_SECRET_ACCESS_KEY
+          valueFrom:
+            secretKeyRef:
+              name: {{ .Values.externalS3.existingSecret.name }}
+              key: {{ .Values.externalS3.existingSecret.secretKey }}
+        {{- end }}
         ports:
           - name: querynode
             containerPort: 21123

charts/milvus/templates/rootcoord-deployment.yaml

@@ -103,6 +103,18 @@ spec:
         {{- if .Values.rootCoordinator.extraEnv }}
           {{- toYaml .Values.rootCoordinator.extraEnv | nindent 8 }}
         {{- end }}
+        {{- if and .Values.externalS3.enabled .Values.externalS3.existingSecret.enabled }}
+        - name: MINIO_ACCESS_KEY_ID
+          valueFrom:
+            secretKeyRef:
+              name: {{ .Values.externalS3.existingSecret.name }}
+              key: {{ .Values.externalS3.existingSecret.accessKey }}
+        - name: MINIO_SECRET_ACCESS_KEY
+          valueFrom:
+            secretKeyRef:
+              name: {{ .Values.externalS3.existingSecret.name }}
+              key: {{ .Values.externalS3.existingSecret.secretKey }}
+        {{- end }}
         ports:
           - name: rootcoord
             containerPort: 53100

charts/milvus/templates/standalone-deployment.yaml

@@ -125,6 +125,18 @@ spec:
         {{- if .Values.standalone.extraEnv }}
           {{- toYaml .Values.standalone.extraEnv | nindent 8 }}
         {{- end }}
+        {{- if and .Values.externalS3.enabled .Values.externalS3.existingSecret.enabled }}
+        - name: MINIO_ACCESS_KEY_ID
+          valueFrom:
+            secretKeyRef:
+              name: {{ .Values.externalS3.existingSecret.name }}
+              key: {{ .Values.externalS3.existingSecret.accessKey }}
+        - name: MINIO_SECRET_ACCESS_KEY
+          valueFrom:
+            secretKeyRef:
+              name: {{ .Values.externalS3.existingSecret.name }}
+              key: {{ .Values.externalS3.existingSecret.secretKey }}
+        {{- end }}
         volumeMounts:
         - mountPath: /milvus/tools
           name: tools

charts/milvus/templates/streamingnode-deployment.yaml

@@ -92,6 +92,18 @@ spec:
         {{- if .Values.streamingNode.extraEnv }}
           {{- toYaml .Values.streamingNode.extraEnv | nindent 8 }}
         {{- end }}
+        {{- if and .Values.externalS3.enabled .Values.externalS3.existingSecret.enabled }}
+        - name: MINIO_ACCESS_KEY_ID
+          valueFrom:
+            secretKeyRef:
+              name: {{ .Values.externalS3.existingSecret.name }}
+              key: {{ .Values.externalS3.existingSecret.accessKey }}
+        - name: MINIO_SECRET_ACCESS_KEY
+          valueFrom:
+            secretKeyRef:
+              name: {{ .Values.externalS3.existingSecret.name }}
+              key: {{ .Values.externalS3.existingSecret.secretKey }}
+        {{- end }}
         ports:
           - name: streamingnode
             containerPort: 22222

charts/milvus/values.yaml

@@ -1289,7 +1289,12 @@ externalS3:
   host: ""
   port: ""
   accessKey: ""
-  secretKey: ""
+  secretKey: ""    
+  existingSecret:
+    enabled: false
+    name: "s3-credentials"
+    accessKey: "accessKey"
+    secretKey: "secretKey"
   useSSL: false
   bucketName: ""
   rootPath: ""