Fixed the Indent length for CronJob

examples/app/templates/cron-job.yaml

@@ -10,7 +10,8 @@ spec:
       template:
         spec:
           containers:
-          - command:
+          - args: {{- toYaml .Values.cronJob.hello.args | nindent 12 }}
+            command:
             - /bin/sh
             - -c
             - date; echo Hello from the Kubernetes cluster
@@ -21,6 +22,6 @@ spec:
               | default .Chart.AppVersion }}
             imagePullPolicy: {{ .Values.cronJob.hello.imagePullPolicy }}
             name: hello
-            resources: {}
+            resources: {{- toYaml .Values.cronJob.hello.resources | nindent 14 }}
           restartPolicy: OnFailure
   schedule: {{ .Values.cronJob.schedule | quote }}

examples/app/values.yaml

@@ -6,10 +6,15 @@ batchJob:
       tag: 5.34.0
 cronJob:
   hello:
+    args:
+    - --health-probe-bind-address=:8081
     image:
       repository: busybox
       tag: "1.28"
     imagePullPolicy: IfNotPresent
+    resources:
+      requests:
+        storage: 1Gi
   schedule: '* * * * *'
 fluentdElasticsearch:
   fluentdElasticsearch:

pkg/app/context.go

@@ -75,7 +75,7 @@ func (c *appContext) CreateHelm(stop <-chan struct{}) error {
 		default:
 		}
 	}
-	return c.output.Create(c.config.ChartDir, c.config.ChartName, c.config.Crd, c.config.CertManagerAsSubchart, c.config.CertManagerVersion , templates, filenames)
+	return c.output.Create(c.config.ChartDir, c.config.ChartName, c.config.Crd, c.config.CertManagerAsSubchart, c.config.CertManagerVersion, templates, filenames)
 }
 
 func (c *appContext) process(obj *unstructured.Unstructured) (helmify.Template, error) {

pkg/processor/daemonset/daemonset.go

@@ -98,7 +98,7 @@ func (d daemonset) Process(appMeta helmify.AppMetadata, obj *unstructured.Unstru
 	}
 
 	nameCamel := strcase.ToLowerCamel(name)
-	specMap, podValues, err := pod.ProcessSpec(nameCamel, appMeta, dae.Spec.Template.Spec)
+	specMap, podValues, err := pod.ProcessSpec(nameCamel, appMeta, dae.Spec.Template.Spec, 0)
 	if err != nil {
 		return true, nil, err
 	}

pkg/processor/deployment/deployment.go

@@ -115,7 +115,7 @@ func (d deployment) Process(appMeta helmify.AppMetadata, obj *unstructured.Unstr
 	}
 
 	nameCamel := strcase.ToLowerCamel(name)
-	specMap, podValues, err := pod.ProcessSpec(nameCamel, appMeta, depl.Spec.Template.Spec)
+	specMap, podValues, err := pod.ProcessSpec(nameCamel, appMeta, depl.Spec.Template.Spec, 0)
 	if err != nil {
 		return true, nil, err
 	}

pkg/processor/job/cron.go

@@ -105,7 +105,7 @@ func (p cron) Process(appMeta helmify.AppMetadata, obj *unstructured.Unstructure
 	}
 
 	// process job pod template:
-	podSpecMap, podValues, err := pod.ProcessSpec(nameCamelCase, appMeta, jobObj.Spec.JobTemplate.Spec.Template.Spec)
+	podSpecMap, podValues, err := pod.ProcessSpec(nameCamelCase, appMeta, jobObj.Spec.JobTemplate.Spec.Template.Spec, 4)
 	if err != nil {
 		return true, nil, err
 	}

pkg/processor/job/job.go

@@ -104,7 +104,7 @@ func (p job) Process(appMeta helmify.AppMetadata, obj *unstructured.Unstructured
 		}
 	}
 	// process job pod template:
-	podSpecMap, podValues, err := pod.ProcessSpec(nameCamelCase, appMeta, jobObj.Spec.Template.Spec)
+	podSpecMap, podValues, err := pod.ProcessSpec(nameCamelCase, appMeta, jobObj.Spec.Template.Spec, 0)
 	if err != nil {
 		return true, nil, err
 	}

pkg/processor/pod/pod.go

@@ -16,7 +16,12 @@ import (
 const imagePullPolicyTemplate = "{{ .Values.%[1]s.%[2]s.imagePullPolicy }}"
 const envValue = "{{ quote .Values.%[1]s.%[2]s.%[3]s.%[4]s }}"
 
-func ProcessSpec(objName string, appMeta helmify.AppMetadata, spec corev1.PodSpec) (map[string]interface{}, helmify.Values, error) {
+func ProcessSpec(
+	objName string,
+	appMeta helmify.AppMetadata,
+	spec corev1.PodSpec,
+	indentOffset uint,
+) (map[string]interface{}, helmify.Values, error) {
 	values, err := processPodSpec(objName, appMeta, &spec)
 	if err != nil {
 		return nil, nil, err
@@ -39,12 +44,12 @@ func ProcessSpec(objName string, appMeta helmify.AppMetadata, spec corev1.PodSpe
 		return nil, nil, fmt.Errorf("%w: unable to convert podSpec to map", err)
 	}
 
-	specMap, values, err = processNestedContainers(specMap, objName, values, "containers")
+	specMap, values, err = processNestedContainers(specMap, objName, values, "containers", indentOffset)
 	if err != nil {
 		return nil, nil, err
 	}
 
-	specMap, values, err = processNestedContainers(specMap, objName, values, "initContainers")
+	specMap, values, err = processNestedContainers(specMap, objName, values, "initContainers", indentOffset)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -76,14 +81,20 @@ func ProcessSpec(objName string, appMeta helmify.AppMetadata, spec corev1.PodSpe
 	return specMap, values, nil
 }
 
-func processNestedContainers(specMap map[string]interface{}, objName string, values map[string]interface{}, containerKey string) (map[string]interface{}, map[string]interface{}, error) {
+func processNestedContainers(
+	specMap map[string]interface{},
+	objName string,
+	values map[string]interface{},
+	containerKey string,
+	indentOffset uint,
+) (map[string]interface{}, map[string]interface{}, error) {
 	containers, _, err := unstructured.NestedSlice(specMap, containerKey)
 	if err != nil {
 		return nil, nil, err
 	}
 
 	if len(containers) > 0 {
-		containers, values, err = processContainers(objName, values, containerKey, containers)
+		containers, values, err = processContainers(objName, values, containerKey, containers, indentOffset)
 		if err != nil {
 			return nil, nil, err
 		}
@@ -97,26 +108,41 @@ func processNestedContainers(specMap map[string]interface{}, objName string, val
 	return specMap, values, nil
 }
 
-func processContainers(objName string, values helmify.Values, containerType string, containers []interface{}) ([]interface{}, helmify.Values, error) {
+func processContainers(
+	objName string,
+	values helmify.Values,
+	containerType string,
+	containers []interface{},
+	indentOffset uint,
+) ([]interface{}, helmify.Values, error) {
 	for i := range containers {
-		containerName := strcase.ToLowerCamel((containers[i].(map[string]interface{})["name"]).(string))
+		container := containers[i].(map[string]interface{})
+		containerName := strcase.ToLowerCamel(container["name"].(string))
 		res, exists, err := unstructured.NestedMap(values, objName, containerName, "resources")
 		if err != nil {
 			return nil, nil, err
 		}
 		if exists && len(res) > 0 {
-			err = unstructured.SetNestedField(containers[i].(map[string]interface{}), fmt.Sprintf(`{{- toYaml .Values.%s.%s.resources | nindent 10 }}`, objName, containerName), "resources")
+			err = unstructured.SetNestedField(
+				container,
+				fmt.Sprintf(`{{- toYaml .Values.%s.%s.resources | nindent %d }}`, objName, containerName, 10+indentOffset),
+				"resources",
+			)
 			if err != nil {
 				return nil, nil, err
 			}
 		}
 
-		args, exists, err := unstructured.NestedStringSlice(containers[i].(map[string]interface{}), "args")
+		args, exists, err := unstructured.NestedStringSlice(container, "args")
 		if err != nil {
 			return nil, nil, err
 		}
 		if exists && len(args) > 0 {
-			err = unstructured.SetNestedField(containers[i].(map[string]interface{}), fmt.Sprintf(`{{- toYaml .Values.%[1]s.%[2]s.args | nindent 8 }}`, objName, containerName), "args")
+			err = unstructured.SetNestedField(
+				container,
+				fmt.Sprintf(`{{- toYaml .Values.%[1]s.%[2]s.args | nindent %d }}`, objName, containerName, 8+indentOffset),
+				"args",
+			)
 			if err != nil {
 				return nil, nil, err
 			}

pkg/processor/pod/pod_test.go

@@ -118,7 +118,7 @@ func Test_pod_Process(t *testing.T) {
 		var deploy appsv1.Deployment
 		obj := internal.GenerateObj(strDeployment)
 		err := runtime.DefaultUnstructuredConverter.FromUnstructured(obj.Object, &deploy)
-		specMap, tmpl, err := ProcessSpec("nginx", &metadata.Service{}, deploy.Spec.Template.Spec)
+		specMap, tmpl, err := ProcessSpec("nginx", &metadata.Service{}, deploy.Spec.Template.Spec, 0)
 		assert.NoError(t, err)
 
 		assert.Equal(t, map[string]interface{}{
@@ -162,7 +162,7 @@ func Test_pod_Process(t *testing.T) {
 		var deploy appsv1.Deployment
 		obj := internal.GenerateObj(strDeploymentWithNoArgs)
 		err := runtime.DefaultUnstructuredConverter.FromUnstructured(obj.Object, &deploy)
-		specMap, tmpl, err := ProcessSpec("nginx", &metadata.Service{}, deploy.Spec.Template.Spec)
+		specMap, tmpl, err := ProcessSpec("nginx", &metadata.Service{}, deploy.Spec.Template.Spec, 0)
 		assert.NoError(t, err)
 
 		assert.Equal(t, map[string]interface{}{
@@ -201,7 +201,7 @@ func Test_pod_Process(t *testing.T) {
 		var deploy appsv1.Deployment
 		obj := internal.GenerateObj(strDeploymentWithTagAndDigest)
 		err := runtime.DefaultUnstructuredConverter.FromUnstructured(obj.Object, &deploy)
-		specMap, tmpl, err := ProcessSpec("nginx", &metadata.Service{}, deploy.Spec.Template.Spec)
+		specMap, tmpl, err := ProcessSpec("nginx", &metadata.Service{}, deploy.Spec.Template.Spec, 0)
 		assert.NoError(t, err)
 
 		assert.Equal(t, map[string]interface{}{
@@ -240,7 +240,7 @@ func Test_pod_Process(t *testing.T) {
 		var deploy appsv1.Deployment
 		obj := internal.GenerateObj(strDeploymentWithPort)
 		err := runtime.DefaultUnstructuredConverter.FromUnstructured(obj.Object, &deploy)
-		specMap, tmpl, err := ProcessSpec("nginx", &metadata.Service{}, deploy.Spec.Template.Spec)
+		specMap, tmpl, err := ProcessSpec("nginx", &metadata.Service{}, deploy.Spec.Template.Spec, 0)
 		assert.NoError(t, err)
 
 		assert.Equal(t, map[string]interface{}{

pkg/processor/statefulset/statefulset.go

@@ -108,7 +108,7 @@ func (d statefulset) Process(appMeta helmify.AppMetadata, obj *unstructured.Unst
 	}
 
 	// process pod spec:
-	podSpecMap, podValues, err := pod.ProcessSpec(nameCamel, appMeta, ssSpec.Template.Spec)
+	podSpecMap, podValues, err := pod.ProcessSpec(nameCamel, appMeta, ssSpec.Template.Spec, 0)
 	if err != nil {
 		return true, nil, err
 	}

test_data/sample-app.yaml

@@ -287,6 +287,11 @@ spec:
                 - /bin/sh
                 - -c
                 - date; echo Hello from the Kubernetes cluster
+              args:
+              - --health-probe-bind-address=:8081
+              resources:
+                requests:
+                  storage: 1Gi
           restartPolicy: OnFailure
 ---
 apiVersion: v1