Skip to content

[Backport 7.6.x] Fix grafana StatefulSet rendering with extraContainers and a service account (#924) #925

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcleblanc2 merged 1 commit into from
Aug 20, 2026
+2 −1
Merged

[Backport 7.6.x] Fix grafana StatefulSet rendering with extraContainers and a service account (#924) #925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions charts/sourcegraph/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ Use `**BREAKING**:` to denote a breaking change

## Unreleased

- Fixed the grafana StatefulSet rendering invalid YAML when `grafana.extraContainers` and a service account are both set, by emitting `extraContainers` inside the `containers` list before `serviceAccountName`, matching the other templates
- Added support for ordering trace processors via `openTelemetry.gateway.config.traces.tracePipelineProcessors`, falling back to processors ordered by name when unset
- Removed the unused executor controller `/data` PersistentVolumeClaim from the Kubernetes-native executor chart (`sourcegraph-executor/k8s`), along with the now-orphaned `storageClass` and `executor.storageSize` values and the vestigial `EXECUTOR_KUBERNETES_PERSISTENCE_VOLUME_NAME` env var. Since single-job-pod became the only k8s execution mode, job pods use their own ephemeral `emptyDir` volume and the controller writes nothing to `/data`.
- Removed the non-functional `executor.replicas` value from the Kubernetes-native executor chart; the controller is a singleton (it pins Job pods to its own node), so `replicas > 1` never worked.
Expand Down
2 changes: 1 addition & 1 deletion charts/sourcegraph/templates/grafana/grafana.StatefulSet.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,10 @@ spec:
{{- end }}
securityContext:
{{- toYaml .Values.grafana.containerSecurityContext | nindent 10 }}
{{- include "sourcegraph.renderServiceAccountName" (list . "grafana") | trim | nindent 6 }}
{{- if .Values.grafana.extraContainers }}
{{- toYaml .Values.grafana.extraContainers | nindent 6 }}
{{- end }}
{{- include "sourcegraph.renderServiceAccountName" (list . "grafana") | trim | nindent 6 }}
securityContext:
{{- toYaml .Values.grafana.podSecurityContext | nindent 8 }}
{{- include "sourcegraph.nodeSelector" (list . "grafana" ) | trim | nindent 6 }}
Expand Down
Loading