From 0fb6403b725e450234ed124d04642621089b26ea Mon Sep 17 00:00:00 2001
From: shydefoo <shidefoo@gmail.com>
Date: Fri, 29 Sep 2023 13:40:56 +0800
Subject: [PATCH] Place renderedConfig over default config for merlin

---
 charts/merlin/templates/_helpers.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/merlin/templates/_helpers.tpl b/charts/merlin/templates/_helpers.tpl
index 8f82e540..310ef926 100644
--- a/charts/merlin/templates/_helpers.tpl
+++ b/charts/merlin/templates/_helpers.tpl
@@ -300,7 +300,7 @@ MlflowConfig:
 {{- define "merlin.config" -}}
 {{- $defaultConfig := include "merlin.defaultConfig" . | fromYaml -}}
 {{- $renderedConfig := include "merlin.renderedConfig" (list $ . .Values.rendered ) | fromYaml -}}
-{{-  merge $renderedConfig $defaultConfig .Values.config | toYaml }}
+{{-  merge $defaultConfig $renderedConfig  .Values.config | toYaml }}
 {{- end -}}