rework merge logic

tembo-io · Oct 3, 2024 · cd451c3 · cd451c3
1 parent 2d18dc3
commit cd451c3
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 22 deletions.
diff --git a/charts/tembo-ai/templates/inference-service/_helpers.tpl b/charts/tembo-ai/templates/inference-service/_helpers.tpl
@@ -21,28 +21,19 @@ Create the name of the inference-service service account to use
 {{- end }}
 
 {{/*
-Merge configurations with priority to service-specific configs, handling nested structures
+Deepmerge the inference-service default configs and the services sepecific configs
 */}}
-{{- define "tembo-ai.inferenceService.mergeConfigs" -}}
-{{- $result := dict -}}
-{{- range $key, $value := .defaults -}}
+{{- define "tembo-ai.inferenceService.deepMerge" -}}
+{{- $result := deepCopy (index . 0) -}}
+{{- range $key, $value := index . 1 -}}
   {{- if kindIs "map" $value -}}
-    {{- if hasKey $.service $key -}}
-      {{- $nested := dict "defaults" $value "service" (index $.service $key) -}}
-      {{- $_ := set $result $key (fromYaml (include "tembo-ai.mergeConfigs" $nested)) -}}
+    {{- if hasKey $result $key -}}
+      {{- $newValue := fromYaml (include "tembo-ai.inferenceService.deepMerge" (list (get $result $key) $value)) -}}
+      {{- $_ := set $result $key $newValue -}}
     {{- else -}}
       {{- $_ := set $result $key $value -}}
     {{- end -}}
   {{- else -}}
-    {{- if not (hasKey $.service $key) -}}
-      {{- $_ := set $result $key $value -}}
-    {{- else -}}
-      {{- $_ := set $result $key (index $.service $key) -}}
-    {{- end -}}
-  {{- end -}}
-{{- end -}}
-{{- range $key, $value := .service -}}
-  {{- if not (hasKey $result $key) -}}
     {{- $_ := set $result $key $value -}}
   {{- end -}}
 {{- end -}}

diff --git a/charts/tembo-ai/templates/inference-service/external-secret.yaml b/charts/tembo-ai/templates/inference-service/external-secret.yaml
@@ -1,7 +1,7 @@
 {{- if .Values.inferenceService.services }}
   {{- $defaults := .Values.inferenceService.defaults }}
   {{- range $serviceName, $serviceConfig := .Values.inferenceService.services }}
-    {{- $mergedConfig := fromYaml (include "tembo-ai.inferenceService.mergeConfigs" (dict "defaults" $defaults "service" $serviceConfig)) }}
+    {{- $mergedConfig := fromYaml (include "tembo-ai.inferenceService.deepMerge" (list $defaults $serviceConfig)) }}
     {{- if and (default false $mergedConfig.enabled) $mergedConfig.externalSecrets.secretName }}
 ---
 apiVersion: external-secrets.io/v1beta1

diff --git a/charts/tembo-ai/templates/inference-service/pod-monitor.yaml b/charts/tembo-ai/templates/inference-service/pod-monitor.yaml
@@ -2,7 +2,7 @@
   {{- $defaults := .Values.inferenceService.defaults }}
   {{- $releaseName := default "release-name" .Release.Name }}
   {{- range $serviceName, $serviceConfig := .Values.inferenceService.services }}
-    {{- $mergedConfig := fromYaml (include "tembo-ai.inferenceService.mergeConfigs" (dict "defaults" $defaults "service" $serviceConfig)) }}
+    {{- $mergedConfig := fromYaml (include "tembo-ai.inferenceService.deepMerge" (list $defaults $serviceConfig)) }}
     {{- if and (default false $mergedConfig.enabled) (default false $mergedConfig.podMonitor.enabled) }}
 ---
 apiVersion: monitoring.coreos.com/v1

diff --git a/charts/tembo-ai/templates/inference-service/service.yaml b/charts/tembo-ai/templates/inference-service/service.yaml
@@ -1,7 +1,7 @@
 {{- if .Values.inferenceService.services }}
   {{- $defaults := .Values.inferenceService.defaults }}
   {{- range $serviceName, $serviceConfig := .Values.inferenceService.services }}
-    {{- $mergedConfig := fromYaml (include "tembo-ai.inferenceService.mergeConfigs" (dict "defaults" $defaults "service" $serviceConfig)) }}
+    {{- $mergedConfig := fromYaml (include "tembo-ai.inferenceService.deepMerge" (list $defaults $serviceConfig)) }}
     {{- if and (default false $mergedConfig.enabled) (default true $mergedConfig.service.enabled) }}
 ---
 apiVersion: v1

diff --git a/charts/tembo-ai/templates/inference-service/serviceaccount.yaml b/charts/tembo-ai/templates/inference-service/serviceaccount.yaml
@@ -1,7 +1,7 @@
 {{- if .Values.inferenceService.services }}
   {{- $defaults := .Values.inferenceService.defaults }}
   {{- range $serviceName, $serviceConfig := .Values.inferenceService.services }}
-    {{- $mergedConfig := fromYaml (include "tembo-ai.inferenceService.mergeConfigs" (dict "defaults" $defaults "service" $serviceConfig)) }}
+    {{- $mergedConfig := fromYaml (include "tembo-ai.inferenceService.deepMerge" (list $defaults $serviceConfig)) }}
     {{- if and (default false $mergedConfig.enabled) (default true $mergedConfig.serviceAccount.create) }}
 ---
 apiVersion: v1

diff --git a/charts/tembo-ai/templates/inference-service/statefulset.yaml b/charts/tembo-ai/templates/inference-service/statefulset.yaml
@@ -1,7 +1,7 @@
 {{- if .Values.inferenceService.services }}
   {{- $defaults := .Values.inferenceService.defaults }}
   {{- range $serviceName, $serviceConfig := .Values.inferenceService.services }}
-    {{- $mergedConfig := fromYaml (include "tembo-ai.inferenceService.mergeConfigs" (dict "defaults" $defaults "service" $serviceConfig)) }}
+    {{- $mergedConfig := fromYaml (include "tembo-ai.inferenceService.deepMerge" (list $defaults $serviceConfig)) }}
     {{- if (default false $mergedConfig.enabled) }}
 ---
 apiVersion: apps/v1

diff --git a/charts/tembo-ai/values.yaml b/charts/tembo-ai/values.yaml
@@ -168,6 +168,6 @@ inferenceService:
       accessMode: ReadWriteOnce
       mountPath: /root/.cache/
   # Define individual inference services here
-  services: []
+  services: {}
     # service1:
     #   enabled: true