Fix formatting of resource names (#773)

Minor fixes to the ordering of attributes in the generated template, to
make them more consistent, thus easier to read

### Checklist

- [x] Follow the [manual testing
process](https://github.com/sourcegraph/deploy-sourcegraph-helm/blob/main/TEST.md)
- [ ] Update
[changelog](https://github.com/sourcegraph/deploy-sourcegraph-helm/blob/main/charts/sourcegraph/CHANGELOG.md)
- [ ] Update [Kubernetes update
doc](https://docs.sourcegraph.com/admin/updates/kubernetes)

### Test plan

Tested on branch
[marc-test-helm-fixes](https://github.com/sourcegraph/deploy-sourcegraph-helm/tree/marc-test-helm-fixes)
on my EKS test instance, works great, no errors

<!--
As part of SOC2/GN-104 and SOC2/GN-105 requirements, all pull requests
are REQUIRED to
provide a "test plan". A test plan is a loose explanation of what you
have done or
implemented to test this, as outlined in our Testing principles and
guidelines:

https://docs.sourcegraph.com/dev/background-information/testing_principles
  Write your test plan here after the "Test plan" header.
-->

Author: marcleblanc2

charts/sourcegraph/templates/cadvisor/cadvisor.ClusterRoleBinding.yaml

@@ -13,7 +13,7 @@ roleRef:
   kind: ClusterRole
   name: {{ .Values.cadvisor.name }}
 subjects:
-- kind: ServiceAccount
-  name: {{ include "sourcegraph.serviceAccountName" (list . "cadvisor") }}
+- name: {{ include "sourcegraph.serviceAccountName" (list . "cadvisor") }}
+  kind: ServiceAccount
   namespace: {{ .Release.Namespace }}
 {{- end }}

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/frontend/sourcegraph-frontend.Deployment.yaml

@@ -65,7 +65,7 @@ spec:
         {{- range $name, $item := .Values.migrator.env }}
         - name: {{ $name }}
           {{- $item | toYaml | nindent 10 }}
-        {{- end }}
+        {{- end }} 
         {{- if not .Values.sourcegraph.localDevMode}}
         resources:
           {{- toYaml .Values.migrator.resources | nindent 10 }}
@@ -151,8 +151,8 @@ spec:
       {{- end }}
       {{- include "sourcegraph.renderServiceAccountName" (list . "frontend") | trim | nindent 6 }}
       volumes:
-      - emptyDir: {}
-        name: home-dir
+      - name: home-dir
+        emptyDir: {}
       {{- if .Values.frontend.extraVolumes }}
       {{- toYaml .Values.frontend.extraVolumes | nindent 6 }}
       {{- end }}

charts/sourcegraph/templates/frontend/sourcegraph-frontend.RoleBinding.yaml

@@ -19,7 +19,7 @@ roleRef:
   name: view
 {{- end }}
 subjects:
-- kind: ServiceAccount
-  name: {{ include "sourcegraph.serviceAccountName" (list . "frontend") }}
+- name: {{ include "sourcegraph.serviceAccountName" (list . "frontend") }}
+  kind: ServiceAccount
   namespace: {{ .Release.Namespace }}
 {{- end }}

charts/sourcegraph/templates/grafana/grafana.pgsql.Secret.yaml

@@ -2,11 +2,11 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ .Values.grafana.name }}-auth
   labels:
     app: grafana
     deploy: sourcegraph
     app.kubernetes.io/component: grafana
+  name: {{ .Values.grafana.name }}-auth
 type: Opaque
 data:
   database: {{ .Values.grafana.auth.database | toString | b64enc | quote }}

charts/sourcegraph/templates/jaeger/jaeger.Deployment.yaml

@@ -5,7 +5,6 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ .Values.jaeger.name }}
   labels:
     {{- include "sourcegraph.jaeger.labels" . | nindent 4 }}
     {{- if .Values.jaeger.labels }}
@@ -14,6 +13,7 @@ metadata:
     deploy: sourcegraph
     app.kubernetes.io/component: all-in-one
     app: jaeger
+  name: {{ .Values.jaeger.name }}
 spec:
   replicas: {{ .Values.jaeger.replicaCount }}
   revisionHistoryLimit: {{ .Values.sourcegraph.revisionHistoryLimit }}

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

@@ -13,7 +13,7 @@ roleRef:
   kind: ClusterRole
   name: {{ .Values.nodeExporter.name }}
 subjects:
-- kind: ServiceAccount
-  name: {{ include "sourcegraph.serviceAccountName" (list . "nodeExporter") }}
+- name: {{ include "sourcegraph.serviceAccountName" (list . "nodeExporter") }}
+  kind: ServiceAccount
   namespace: {{ .Release.Namespace }}
 {{- end }}

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/otel-collector/otel-agent.ConfigMap.yaml

@@ -1,5 +1,5 @@
-# Config for the agent pods running as a DaemonSet, which forward data to the gateway pod
 {{ if .Values.openTelemetry.enabled -}}
+# Config for the agent pods running as a DaemonSet, which forward data to the gateway pod
 apiVersion: v1
 kind: ConfigMap
 metadata: