refactor(instant-chart): render containers & initContainers

teguru-labs · Jul 26, 2024 · ee5c73d · ee5c73d
1 parent 00ee68d
commit ee5c73d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/charts/instant-chart/templates/_helpers.tpl b/charts/instant-chart/templates/_helpers.tpl
@@ -80,3 +80,15 @@ Clean volumes by removing .persistentVolumeClaim.requests
 {{- end -}}
 {{- $cleanVolumes | toYaml | nindent 0 | trim -}}
 {{- end -}}
+
+{{/*
+Generate the container definitions
+Usage:
+{{- include "instant-chart.containers" (dict "containers" .Values.containers "prefix" "container") | trim | nindent 6 -}}
+*/}}
+{{- define "instant-chart.containers" -}}
+{{- range $index, $container := .containers }}
+- name: {{ $container.name | default (printf "%s-%d" $.prefix $index) }}
+  {{- omit $container "name" | toYaml | nindent 2 }}
+{{- end -}}
+{{- end -}}
diff --git a/charts/instant-chart/templates/deployment.yaml b/charts/instant-chart/templates/deployment.yaml
@@ -22,16 +22,10 @@ spec:
         {{- include "instant-chart.labels" . | nindent 8 }}
     spec:
       containers:
-      {{- range $index, $container := .Values.containers }}
-      - name: {{ $container.name | default (printf "container-%d" $index) }}
-        {{- omit $container  "name" | toYaml | nindent 8 }}
-      {{- end }}
+      {{- include "instant-chart.containers" (dict "containers" .Values.containers "prefix" "container") | trim | nindent 6 -}}
       {{- with .Values.initContainers }}
       initContainers:
-      {{- range $index, $container := . }}
-      - name: {{ $container.name | default (printf "init-%d" $index) }}
-        {{- omit $container  "name" | toYaml | nindent 8 }}
-      {{- end }}
+      {{- include "instant-chart.containers" (dict "containers" . "prefix" "init") | trim | nindent 6 -}}
       {{- end }}
       {{- if .Values.volumes }}
       volumes: