fix(vector): Allow both extraContainers and extraVolumeMounts (#243)

* fix: extraVolumeMounts * feat(vector): Test combination of extraContainers and extraVolumeMounts in CI Signed-off-by: Spencer Gilbert <[email protected]> Signed-off-by: Spencer Gilbert <[email protected]> Co-authored-by: Spencer Gilbert <[email protected]>
vectordotdev · Sep 28, 2022 · 09a18dd · 09a18dd
1 parent 29f99d7
commit 09a18dd
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/charts/vector/ci/extraContainers-and-extraVolumeMounts-values.yaml b/charts/vector/ci/extraContainers-and-extraVolumeMounts-values.yaml
@@ -0,0 +1,19 @@
+# Including extraContainers and extraVolumes
+## Values file for testing adding extraContainers and extraVolumeMounts to Vector Pods.
+extraContainers:
+  - name: sleep
+    image: busybox
+    command: ['sh', '-c', "sleep 5"]
+extraVolumes:
+  - name: podinfo
+    downwardAPI:
+      items:
+        - path: "labels"
+          fieldRef:
+            fieldPath: metadata.labels
+        - path: "annotations"
+          fieldRef:
+            fieldPath: metadata.annotations
+extraVolumeMounts:
+  - name: podinfo
+    mountPath: "/etc/podinfo"
diff --git a/charts/vector/templates/_pod.tpl b/charts/vector/templates/_pod.tpl
@@ -145,12 +145,12 @@ containers:
         mountPath: "/host/sys"
         readOnly: true
 {{- end }}
-{{- with .Values.extraContainers }}
-{{ toYaml . | indent 2 }}
-{{- end }}
 {{- with .Values.extraVolumeMounts }}
 {{- toYaml . | nindent 6 }}
 {{- end }}
+{{- with .Values.extraContainers }}
+{{ toYaml . | indent 2 }}
+{{- end }}
 terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
 {{- with .Values.nodeSelector }}
 nodeSelector: