From 4f3326366865071f21957766adb3467631ba6e78 Mon Sep 17 00:00:00 2001 From: RealAnna Date: Thu, 16 Feb 2023 15:06:38 +0100 Subject: [PATCH] feat: added fix Signed-off-by: RealAnna --- pkg/processor/probes/probes.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkg/processor/probes/probes.go b/pkg/processor/probes/probes.go index 894d531..ab8ba4a 100644 --- a/pkg/processor/probes/probes.go +++ b/pkg/processor/probes/probes.go @@ -12,13 +12,13 @@ import ( ) const livenessProbe = "\n{{- if .Values.%[1]s.%[2]s.livenessProbe }}\n" + - "livenessProbe: {{- include \"tplvalues.render\" (dict \"value\" .Values.%[1]s.%[2]s.livenessProbe \"context\" $) | nindent 12 }}\n" + + "livenessProbe: {{- include \"tplvalues.render\" (dict \"value\" .Values.%[1]s.%[2]s.livenessProbe \"context\" $) | nindent 10 }}\n" + " {{- else }}\n" + "livenessProbe:\n%[3]s" + "\n{{- end }}" const readinessProbe = "\n{{- if .Values.%[1]s.%[2]s.readinessProbe }}\n" + - "readinessProbe: {{- include \"tplvalues.render\" (dict \"value\" .Values.%[1]s.%[2]s.readinessProbe \"context\" $) | nindent 12 }}\n" + + "readinessProbe: {{- include \"tplvalues.render\" (dict \"value\" .Values.%[1]s.%[2]s.readinessProbe \"context\" $) | nindent 10 }}\n" + " {{- else }}\n" + "readinessProbe:\n%[3]s" + "\n{{- end }}" @@ -26,13 +26,12 @@ const readinessProbe = "\n{{- if .Values.%[1]s.%[2]s.readinessProbe }}\n" + // ProcessSpecMap adds 'probes' to the Containers in specMap, if they are defined func ProcessSpecMap(name string, specMap map[string]interface{}, values *helmify.Values, pspec corev1.PodSpec) error { - strContainers := make([]interface{}, len(pspec.Containers)) cs, _, err := unstructured.NestedSlice(specMap, "containers") if err != nil { return err } - err = templateContainers(name, cs, pspec, strContainers, values) + strContainers, err := templateContainers(name, cs, pspec, values) if err != nil { return err } @@ -40,25 +39,26 @@ func ProcessSpecMap(name string, specMap map[string]interface{}, values *helmify } -func templateContainers(name string, cs []interface{}, pspec corev1.PodSpec, strContainers []interface{}, values *helmify.Values) error { +func templateContainers(name string, cs []interface{}, pspec corev1.PodSpec, values *helmify.Values) ([]interface{}, error) { + strContainers := make([]interface{}, len(pspec.Containers)) for i := range cs { containerName := strcase.ToLowerCamel(pspec.Containers[i].Name) content, err := yamlformat.Marshal(cs[i], 0) if err != nil { - return err + return nil, err } strContainers[i] = content err = setProbesTemplates(name, &(pspec.Containers[i]), &strContainers[i], containerName) if err != nil { - return err + return nil, err } err = setProbeField(name, &(pspec.Containers[i]), values) if err != nil { - return err + return nil, err } } - return nil + return strContainers, nil } func setProbesTemplates(name string, container *corev1.Container, strContainers *interface{}, containerName string) error {