Update merlin chart to accept extra deployment configuration for mlflow

charts/merlin/Chart.yaml

@@ -33,4 +33,4 @@ maintainers:
 - email: [email protected]
   name: caraml-dev
 name: merlin
-version: 0.13.19
+version: 0.13.20

charts/merlin/README.md

@@ -1,7 +1,7 @@
 # merlin
 
 ---
-![Version: 0.13.19](https://img.shields.io/badge/Version-0.13.19-informational?style=flat-square)
+![Version: 0.13.20](https://img.shields.io/badge/Version-0.13.20-informational?style=flat-square)
 ![AppVersion: v0.42.0](https://img.shields.io/badge/AppVersion-v0.42.0-informational?style=flat-square)
 
 Kubernetes-friendly ML model management, deployment, and serving.

charts/merlin/templates/mlflow-deployment.yaml

@@ -81,16 +81,27 @@ spec:
         - name: GOOGLE_APPLICATION_CREDENTIALS
           value: /etc/gcp_service_account/service-account.json
         {{- end }}
+        {{- with .Values.mlflow.extraEnvs }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
 
-        {{- if .Values.gcpServiceAccount }}
+        {{- if or .Values.gcpServiceAccount .Values.mlflow.extraVolumeMounts }}
         volumeMounts:
+        {{- end }}
+        {{- if .Values.gcpServiceAccount }}
         - name: gcp-service-account
           mountPath: "/etc/gcp_service_account"
           readOnly: true
         {{- end }}
+        {{- with .Values.mlflow.extraVolumeMounts }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
       {{- if .Values.mlflowExternalPostgresql.enableProxySidecar }}
       {{- tpl (toYaml (index .Values.mlflowExternalPostgresql.sidecarSpec .Values.mlflowExternalPostgresql.proxyType "spec")) . | nindent 6 }}
       {{- end }}
+      {{- with .Values.mlflow.extraContainers }}
+      {{- toYaml . | nindent 6 }}
+      {{- end }}
 {{- if .Values.mlflow.imagePullSecrets }}
       imagePullSecrets:
 {{ toYaml .Values.mlflow.imagePullSecrets | indent 6 }}
@@ -103,15 +114,20 @@ spec:
 {{- if and .Values.mlflow.serviceAccount.create }}
       serviceAccountName: {{ default "mlflow" .Values.mlflow.serviceAccount.name }}
 {{- end }}
-{{- if .Values.gcpServiceAccount }}
+{{- if or .Values.gcpServiceAccount .Values.mlflow.extraVolumes }}
       volumes:
+{{- end }}
+{{- if .Values.gcpServiceAccount }}
       - name: gcp-service-account
         secret:
           secretName: {{ .Values.gcpServiceAccount.secretName }}
           items:
             - key: {{ .Values.gcpServiceAccount.secretKey }}
               path: service-account.json
 {{- end }}
+{{- with .Values.mlflow.extraVolumes }}
+{{- toYaml . | nindent 6 }}
+{{- end }}
 {{- with .Values.mlflow.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}