Allow bring your own s3

ncsa · Apr 17, 2023 · 33be766 · 33be766
1 parent 73f727d
commit 33be766
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 2 deletions.
diff --git a/charts/mlflow/Chart.yaml b/charts/mlflow/Chart.yaml
@@ -8,12 +8,12 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.1.1
+version: 1.2.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 2.1.1
+appVersion: 2.2.1
 
 # List of people that maintain this helm chart.
 maintainers:

diff --git a/charts/mlflow/templates/deployment.yaml b/charts/mlflow/templates/deployment.yaml
@@ -42,6 +42,7 @@ spec:
                     name: {{ .Values.postgresql.auth.existingSecret }}
                     key: password
               {{- end }}
+              {{- if .Values.services.minio.enabled}}
               - name: MLFLOW_S3_ENDPOINT_URL
                 value: "http://{{ .Release.Name }}-minio:{{ .Values.minio.service.ports.api }}"
             {{- if .Values.minio.auth.existingSecret }}
@@ -61,6 +62,27 @@ spec:
               - name: AWS_SECRET_ACCESS_KEY
                 value: "{{ .Values.minio.auth.rootPassword }}"
             {{- end }}
+            {{- else }}
+              - name: MLFLOW_S3_ENDPOINT_URL
+                value: "{{ .Values.s3.url }}"
+            {{- if .Values.s3.secret }}
+              - name: AWS_ACCESS_KEY_ID
+                valueFrom:
+                  secretKeyRef:
+                    name: {{ .Values.s3.secret }}
+                    key: user
+              - name: AWS_SECRET_ACCESS_KEY
+                valueFrom:
+                  secretKeyRef:
+                    name: {{ .Values.s3.secret }}
+                    key: key
+            {{- else }}
+              - name: AWS_ACCESS_KEY_ID
+                value: "{{ .Values.s3.user }}"
+              - name: AWS_SECRET_ACCESS_KEY
+                value: "{{ .Values.s3.key }}"
+            {{- end }}
+          {{- end }}
           args: ["server",
                  "--backend-store-uri", "{{- template "services.postgres.uri" . }}",
                  "--artifacts-destination", "s3://{{ .Values.MLFlow.artifacts.bucketName }}",

diff --git a/charts/mlflow/values.yaml b/charts/mlflow/values.yaml
@@ -25,6 +25,12 @@ services:
   minio:
     enabled: true
     externalURI:
+s3:
+  url:
+  # Secret with values for 'user' and 'key'
+  secret:
+  user:
+  key:
 
 postgresql:
   auth: