Fixed extraContainers

Author: marcleblanc2

charts/sourcegraph/templates/cadvisor/cadvisor.DaemonSet.yaml

@@ -94,11 +94,11 @@ spec:
         - name: http
           containerPort: 48080
           protocol: TCP
-      automountServiceAccountToken: false
-      terminationGracePeriodSeconds: 30
       {{- if .Values.cadvisor.extraContainers }}
         {{- toYaml .Values.cadvisor.extraContainers | nindent 6 }}
       {{- end }}
+      automountServiceAccountToken: false
+      terminationGracePeriodSeconds: 30
       securityContext:
         {{- toYaml .Values.cadvisor.podSecurityContext | nindent 8 }}
       {{- include "sourcegraph.nodeSelector" (list . "cadvisor" ) | trim | nindent 6 }}

charts/sourcegraph/templates/codeintel-db/codeintel-db.StatefulSet.yaml

@@ -58,7 +58,7 @@ spec:
           {{- toYaml .Values.alpine.resources | nindent 10 }}
         {{- end }}
       containers:
-      - name: pgsql
+      - name: pgsql # TODO: Evaluate renaming container to codeintel
         image: {{ include "sourcegraph.image" (list . "codeIntelDB") }}
         imagePullPolicy: {{ .Values.sourcegraph.image.pullPolicy }}
         {{- with .Values.codeIntelDB.args }}
@@ -108,9 +108,6 @@ spec:
         {{- if .Values.codeIntelDB.extraVolumeMounts }}
         {{- toYaml .Values.codeIntelDB.extraVolumeMounts | nindent 8 }}
         {{- end }}
-      {{- if .Values.codeIntelDB.extraContainers }}
-        {{- toYaml .Values.codeIntelDB.extraContainers | nindent 6 }}
-      {{- end }}
       - name: pgsql-exporter
         env:
         {{- include "sourcegraph.dataSource" (list . "codeIntelDB" ) | nindent 8 }}
@@ -131,6 +128,9 @@ spec:
         securityContext:
           {{- toYaml .Values.postgresExporter.containerSecurityContext | nindent 10 }}
         terminationMessagePolicy: FallbackToLogsOnError
+      {{- if .Values.codeIntelDB.extraContainers }}
+        {{- toYaml .Values.codeIntelDB.extraContainers | nindent 6 }}
+      {{- end }}
       terminationGracePeriodSeconds: 120
       securityContext:
         {{- toYaml .Values.codeIntelDB.podSecurityContext | nindent 8 }}

charts/sourcegraph/templates/node-exporter/node-exporter.DaemonSet.yaml

@@ -58,9 +58,9 @@ spec:
           - --collector.filesystem.ignored-mount-points=^/(dev|proc|sys|var/lib/docker/.+|var/lib/kubelet/pods/.+)($|/)
           - --collector.netclass.ignored-devices=^(veth.*)$
           - --collector.netdev.device-exclude=^(veth.*)$
-{{- if .Values.nodeExporter.extraArgs }}
-{{ toYaml .Values.nodeExporter.extraArgs | indent 10 }}
-{{- end }}
+          {{- if .Values.nodeExporter.extraArgs }}
+          {{ toYaml .Values.nodeExporter.extraArgs }}
+          {{- end }}
         env:
         {{- range $name, $item := .Values.nodeExporter.env}}
         - name: {{ $name }}
@@ -111,11 +111,11 @@ spec:
           successThreshold: 1
           timeoutSeconds: 1
         terminationMessagePolicy: FallbackToLogsOnError
-      automountServiceAccountToken: false
-      terminationGracePeriodSeconds: 30
       {{- if .Values.nodeExporter.extraContainers }}
         {{- toYaml .Values.nodeExporter.extraContainers | nindent 6 }}
       {{- end }}
+      automountServiceAccountToken: false
+      terminationGracePeriodSeconds: 30
       securityContext:
         {{- toYaml .Values.nodeExporter.podSecurityContext | nindent 8 }}
       {{- include "sourcegraph.nodeSelector" (list . "nodeExporter" ) | trim | nindent 6 }}

charts/sourcegraph/templates/prometheus/prometheus.Deployment.yaml

@@ -81,10 +81,10 @@ spec:
         {{- end }}
         securityContext:
           {{- toYaml .Values.prometheus.containerSecurityContext | nindent 10 }}
-      terminationGracePeriodSeconds: 120
       {{- if .Values.prometheus.extraContainers }}
         {{- toYaml .Values.prometheus.extraContainers | nindent 6 }}
       {{- end }}
+      terminationGracePeriodSeconds: 120
       securityContext:
         {{- toYaml .Values.prometheus.podSecurityContext | nindent 8 }}
       {{- include "sourcegraph.nodeSelector" (list . "prometheus" ) | trim | nindent 6 }}