Merge branch 'main' into marc/add-priority-to-remaining-pods

marcleblanc2 · web-flow · commit b533f0e933b9 · 2025-12-07T20:27:28.000-07:00
diff --git a/charts/sourcegraph/templates/cadvisor/cadvisor.ClusterRoleBinding.yaml b/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 }}
diff --git a/charts/sourcegraph/templates/cadvisor/cadvisor.DaemonSet.yaml b/charts/sourcegraph/templates/cadvisor/cadvisor.DaemonSet.yaml
@@ -94,14 +94,14 @@ spec:
         - name: http
           containerPort: 48080
           protocol: TCP
+      {{- if .Values.cadvisor.extraContainers }}
+        {{- toYaml .Values.cadvisor.extraContainers | nindent 6 }}
+      {{- end }}
       automountServiceAccountToken: false
       {{- if or .Values.cadvisor.priorityClassName .Values.sourcegraph.priorityClassName }}
       priorityClassName: {{ coalesce .Values.cadvisor.priorityClassName .Values.sourcegraph.priorityClassName }}
       {{- end }}
       terminationGracePeriodSeconds: 30
-      {{- if .Values.cadvisor.extraContainers }}
-        {{- toYaml .Values.cadvisor.extraContainers | nindent 6 }}
-      {{- end }}
       securityContext:
         {{- toYaml .Values.cadvisor.podSecurityContext | nindent 8 }}
       {{- include "sourcegraph.nodeSelector" (list . "cadvisor" ) | trim | nindent 6 }}
diff --git a/charts/sourcegraph/templates/codeintel-db/codeintel-db.StatefulSet.yaml b/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 }}
       {{- if or .Values.codeIntelDB.priorityClassName .Values.sourcegraph.priorityClassName }}
       priorityClassName: {{ coalesce .Values.codeIntelDB.priorityClassName .Values.sourcegraph.priorityClassName }}
       {{- end }}
diff --git a/charts/sourcegraph/templates/frontend/sourcegraph-frontend.Deployment.yaml b/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 }}
@@ -154,8 +154,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 }}
diff --git a/charts/sourcegraph/templates/frontend/sourcegraph-frontend.RoleBinding.yaml b/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 }}
diff --git a/charts/sourcegraph/templates/grafana/grafana.pgsql.Secret.yaml b/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 }}
diff --git a/charts/sourcegraph/templates/jaeger/jaeger.Deployment.yaml b/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 }}
diff --git a/charts/sourcegraph/templates/node-exporter/node-exporter.ClusterRoleBinding.yaml b/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 }}
diff --git a/charts/sourcegraph/templates/node-exporter/node-exporter.DaemonSet.yaml b/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,14 +111,14 @@ spec:
           successThreshold: 1
           timeoutSeconds: 1
         terminationMessagePolicy: FallbackToLogsOnError
+      {{- if .Values.nodeExporter.extraContainers }}
+        {{- toYaml .Values.nodeExporter.extraContainers | nindent 6 }}
+      {{- end }}
       automountServiceAccountToken: false
       {{- if or .Values.nodeExporter.priorityClassName .Values.sourcegraph.priorityClassName }}
       priorityClassName: {{ coalesce .Values.nodeExporter.priorityClassName .Values.sourcegraph.priorityClassName }}
       {{- end }}
       terminationGracePeriodSeconds: 30
-      {{- if .Values.nodeExporter.extraContainers }}
-        {{- toYaml .Values.nodeExporter.extraContainers | nindent 6 }}
-      {{- end }}
       securityContext:
         {{- toYaml .Values.nodeExporter.podSecurityContext | nindent 8 }}
       {{- include "sourcegraph.nodeSelector" (list . "nodeExporter" ) | trim | nindent 6 }}
diff --git a/charts/sourcegraph/templates/otel-collector/otel-agent.ConfigMap.yaml b/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:
diff --git a/charts/sourcegraph/templates/otel-collector/otel-collector.Service.yaml b/charts/sourcegraph/templates/otel-collector/otel-collector.Service.yaml
@@ -2,7 +2,6 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: otel-collector
   annotations:
     prometheus.io/port: "8888"
     sourcegraph.prometheus/scrape: "true"
@@ -16,6 +15,7 @@ metadata:
     {{- end }}
     deploy: sourcegraph
     app.kubernetes.io/component: otel-collector
+  name: otel-collector
 spec:
   ports:
     - name: grpc-otlp
diff --git a/charts/sourcegraph/templates/pgsql/pgsql.Secret.yaml b/charts/sourcegraph/templates/pgsql/pgsql.Secret.yaml
@@ -2,11 +2,11 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ .Values.pgsql.name }}-auth
   labels:
     app: pgsql
     deploy: sourcegraph
     app.kubernetes.io/component: pgsql
+  name: {{ .Values.pgsql.name }}-auth
 type: Opaque
 data:
   database: {{ .Values.pgsql.auth.database | toString | b64enc | quote }}
diff --git a/charts/sourcegraph/templates/pgsql/pgsql.StatefulSet.yaml b/charts/sourcegraph/templates/pgsql/pgsql.StatefulSet.yaml
@@ -58,7 +58,8 @@ spec:
           {{- toYaml .Values.alpine.resources | nindent 10 }}
         {{- end }}
       containers:
-      - image: {{ include "sourcegraph.image" (list . "pgsql") }}
+      - name: pgsql
+        image: {{ include "sourcegraph.image" (list . "pgsql") }}
         imagePullPolicy: {{ .Values.sourcegraph.image.pullPolicy }}
         {{- with .Values.pgsql.args }}
         args:
@@ -80,7 +81,6 @@ spec:
               - /liveness.sh
           failureThreshold: 360
           periodSeconds: 10
-        name: pgsql
         env:
         {{- include "sourcegraph.databaseAuth" (list . "pgsql" "POSTGRES_") | nindent 8 }}
         - name: POSTGRES_DB
@@ -110,9 +110,6 @@ spec:
         {{- if .Values.pgsql.extraVolumeMounts }}
         {{- toYaml .Values.pgsql.extraVolumeMounts | nindent 8 }}
         {{- end }}
-      {{- if .Values.pgsql.extraContainers }}
-        {{- toYaml .Values.pgsql.extraContainers | nindent 6 }}
-      {{- end }}
       - name: pgsql-exporter
         env:
         {{- include "sourcegraph.dataSource" (list . "pgsql" ) | nindent 8 }}
@@ -133,6 +130,9 @@ spec:
         securityContext:
           {{- toYaml .Values.postgresExporter.containerSecurityContext | nindent 10 }}
         terminationMessagePolicy: FallbackToLogsOnError
+      {{- if .Values.pgsql.extraContainers }}
+        {{- toYaml .Values.pgsql.extraContainers | nindent 6 }}
+      {{- end }}
       {{- if or .Values.pgsql.priorityClassName .Values.sourcegraph.priorityClassName }}
       priorityClassName: {{ coalesce .Values.pgsql.priorityClassName .Values.sourcegraph.priorityClassName }}
       {{- end }}
diff --git a/charts/sourcegraph/templates/precise-code-intel/worker.Deployment.yaml b/charts/sourcegraph/templates/precise-code-intel/worker.Deployment.yaml
@@ -118,8 +118,8 @@ spec:
       {{- end }}
       {{- include "sourcegraph.renderServiceAccountName" (list . "preciseCodeIntel") | trim | nindent 6 }}
       volumes:
-      - emptyDir: {}
-        name: tmpdir
+      - name: tmpdir
+        emptyDir: {}
       {{- if .Values.preciseCodeIntel.extraVolumes }}
       {{- toYaml .Values.preciseCodeIntel.extraVolumes | nindent 6 }}
       {{- end }}
diff --git a/charts/sourcegraph/templates/prometheus/prometheus.ClusterRoleBinding.yaml b/charts/sourcegraph/templates/prometheus/prometheus.ClusterRoleBinding.yaml
@@ -12,7 +12,7 @@ roleRef:
   kind: ClusterRole
   name: {{ .Values.prometheus.name }}
 subjects:
-- kind: ServiceAccount
-  name: {{ include "sourcegraph.serviceAccountName" (list . "prometheus") }}
+- name: {{ include "sourcegraph.serviceAccountName" (list . "prometheus") }}
+  kind: ServiceAccount
   namespace: {{ .Release.Namespace }}
 {{- end }}
diff --git a/charts/sourcegraph/templates/prometheus/prometheus.ConfigMap.yaml b/charts/sourcegraph/templates/prometheus/prometheus.ConfigMap.yaml
@@ -1,5 +1,11 @@
 {{- if and .Values.prometheus.enabled (not .Values.prometheus.existingConfig) -}}
 apiVersion: v1
+kind: ConfigMap
+metadata:
+  labels:
+    deploy: sourcegraph
+    app.kubernetes.io/component: prometheus
+  name: {{ .Values.prometheus.name }}
 data:
   prometheus.yml: |
     global:
@@ -112,7 +118,9 @@ data:
         regex: (.+)
         target_label: __metrics_path__
         replacement: /api/v1/nodes/${1}/proxy/metrics
-    {{- end }} # End of privileged config
+
+      # End of privileged config
+    {{- end }}
 
     # Scrape config for service endpoints.
     #
@@ -171,7 +179,7 @@ data:
       - source_labels: [__meta_kubernetes_pod_name]
         action: replace
         target_label: instance
-      # Sourcegraph specific customization. We want to add a label to every 
+      # Sourcegraph specific customization. We want to add a label to every
       # metric that indicates the node it came from.
       - source_labels: [__meta_kubernetes_endpoint_node_name]
         action: replace
@@ -252,7 +260,7 @@ data:
       - source_labels: [__meta_kubernetes_namespace]
         action: replace
         target_label: ns
-      # Sourcegraph specific customization. We want to add a label to every 
+      # Sourcegraph specific customization. We want to add a label to every
       # metric that indicates the node it came from.
       - source_labels: [__meta_kubernetes_pod_node_name]
         action: replace
@@ -295,10 +303,4 @@ data:
           labels:
             app: alertmanager
   extra_rules.yml: ""
-kind: ConfigMap
-metadata:
-  labels:
-    deploy: sourcegraph
-    app.kubernetes.io/component: prometheus
-  name: {{ .Values.prometheus.name }}
 {{- end }}
diff --git a/charts/sourcegraph/templates/prometheus/prometheus.Deployment.yaml b/charts/sourcegraph/templates/prometheus/prometheus.Deployment.yaml
@@ -81,13 +81,13 @@ spec:
         {{- end }}
         securityContext:
           {{- toYaml .Values.prometheus.containerSecurityContext | nindent 10 }}
-      terminationGracePeriodSeconds: 120
       {{- if .Values.prometheus.extraContainers }}
         {{- toYaml .Values.prometheus.extraContainers | nindent 6 }}
       {{- end }}
       {{- if or .Values.prometheus.priorityClassName .Values.sourcegraph.priorityClassName }}
       priorityClassName: {{ coalesce .Values.prometheus.priorityClassName .Values.sourcegraph.priorityClassName }}
       {{- end }}
+      terminationGracePeriodSeconds: 120
       securityContext:
         {{- toYaml .Values.prometheus.podSecurityContext | nindent 8 }}
       {{- include "sourcegraph.nodeSelector" (list . "prometheus" ) | trim | nindent 6 }}
@@ -102,10 +102,10 @@ spec:
       - name: data
         persistentVolumeClaim:
           claimName: prometheus
-      - configMap:
+      - name: config
+        configMap:
           defaultMode: 0777
           name: {{ default .Values.prometheus.name .Values.prometheus.existingConfig }}
-        name: config
       {{- if .Values.prometheus.extraVolumes }}
       {{- toYaml .Values.prometheus.extraVolumes | nindent 6 }}
       {{- end }}
diff --git a/charts/sourcegraph/templates/prometheus/prometheus.RoleBinding.yaml b/charts/sourcegraph/templates/prometheus/prometheus.RoleBinding.yaml
@@ -12,7 +12,7 @@ roleRef:
   kind: ClusterRole
   name: view
 subjects:
-- kind: ServiceAccount
-  name: {{ include "sourcegraph.serviceAccountName" (list . "prometheus") }}
+- name: {{ include "sourcegraph.serviceAccountName" (list . "prometheus") }}
+  kind: ServiceAccount
   namespace: {{ .Release.Namespace }}
 {{- end }}
diff --git a/charts/sourcegraph/templates/redis/redis-cache.Secret.yaml b/charts/sourcegraph/templates/redis/redis-cache.Secret.yaml
@@ -2,11 +2,11 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ .Values.redisCache.name }}
   labels:
     app: redis-cache
     deploy: sourcegraph
     app.kubernetes.io/component: redis-cache
+  name: {{ .Values.redisCache.name }}
 type: Opaque
 data:
   endpoint: {{ .Values.redisCache.connection.endpoint | toString | b64enc | quote }}
diff --git a/charts/sourcegraph/templates/redis/redis-store.Secret.yaml b/charts/sourcegraph/templates/redis/redis-store.Secret.yaml
@@ -2,11 +2,11 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ .Values.redisStore.name }}
   labels:
     app: redis-store
     deploy: sourcegraph
     app.kubernetes.io/component: redis-store
+  name: {{ .Values.redisStore.name }}
 type: Opaque
 data:
   endpoint: {{ .Values.redisStore.connection.endpoint | toString | b64enc | quote }}
diff --git a/charts/sourcegraph/templates/searcher/searcher.StatefulSet.yaml b/charts/sourcegraph/templates/searcher/searcher.StatefulSet.yaml
@@ -124,10 +124,10 @@ spec:
       {{- end }}
       {{- include "sourcegraph.renderServiceAccountName" (list . "searcher") | trim | nindent 6 }}
       volumes:
-      - emptyDir: {}
-        name: cache
-      - emptyDir: {}
-        name: tmpdir
+      - name: cache
+        emptyDir: {}
+      - name: tmpdir
+        emptyDir: {}
       {{- if .Values.searcher.extraVolumes }}
       {{- toYaml .Values.searcher.extraVolumes | nindent 6 }}
       {{- end }}
diff --git a/charts/sourcegraph/templates/syntactic-code-intel/worker.Deployment.yaml b/charts/sourcegraph/templates/syntactic-code-intel/worker.Deployment.yaml
@@ -121,8 +121,8 @@ spec:
       {{- end }}
       {{- include "sourcegraph.renderServiceAccountName" (list . "syntacticCodeIntel") | trim | nindent 6 }}
       volumes:
-      - emptyDir: {}
-        name: tmpdir
+      - name: tmpdir
+        emptyDir: {}
       {{- if .Values.syntacticCodeIntel.extraVolumes }}
       {{- toYaml .Values.syntacticCodeIntel.extraVolumes | nindent 6 }}
       {{- end }}
diff --git a/charts/sourcegraph/templates/tests/test-connection.yaml b/charts/sourcegraph/templates/tests/test-connection.yaml
