Merge pull request #91 from mbaldessari/fix-initcontainers

Fix initContainers variables

Author: mbaldessari

templates/plumbing/argocd.yaml

@@ -72,6 +72,9 @@ spec:
         name: trusted-hub-bundle
       - mountPath: /tmp/ca-bundles
         name: ca-bundles
+{{- if len $.Values.clusterGroup.argoCD.initContainers }}
+{{ toYaml $.Values.clusterGroup.argoCD.initContainers | indent 4 }}
+{{- end }}
     resources:
       limits:
         cpu: "1"
@@ -96,9 +99,6 @@ spec:
       name: trusted-hub-bundle
     - emptyDir: {}
       name: ca-bundles
-{{- if len $.Values.clusterGroup.argoCD.initContainers }}
-{{ $.Values.clusterGroup.argoCD.initContainers | toPrettyJson }}
-{{- end }}
 {{- if len $.Values.clusterGroup.argoCD.configManagementPlugins }}
     sidecarContainers:
 {{- range $cmp := $.Values.clusterGroup.argoCD.configManagementPlugins }}

tests/argocd_test.yaml

@@ -180,3 +180,26 @@ tests:
                 kinds:
                 - Foo
                 - Baz
+
+  - it: should render custom initContainers correctly
+    set:
+      clusterGroup:
+        argoCD:
+          initContainers:
+            - command:
+                - bash
+                - -c
+                - echo
+              image: test
+              name: test
+    documentIndex: 0
+    asserts:
+      - contains:
+          path: spec.repo.initContainers
+          content:
+            command:
+              - bash
+              - -c
+              - echo
+            image: test
+            name: test