Skip to content

fix(dgraph): correct latent StatefulSet bugs (mount, datadir volume, exec, serviceAccountName) #148

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

Open
mlwelles wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(dgraph): correct latent StatefulSet bugs (mount, datadir volume, exec, serviceAccountName) #148

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
19 changes: 9 additions & 10 deletions charts/dgraph/templates/alpha/statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,10 @@ spec:
labels:
{{- include "dgraph.labels" (dict "ctx" . "component" .Values.alpha.name "podLabels" .Values.alpha.podLabels) | nindent 8 }}
spec:
{{- if .Values.serviceAccount.create }}
serviceAccountName: {{ .Values.serviceAccount.name }}
automountServiceAccountToken: {{ .Values.alpha.automountServiceAccountToken }}
{{- if or .Values.serviceAccount.create .Values.serviceAccount.name }}
serviceAccountName: {{ include "dgraph.serviceAccountName" . }}
{{- end }}
automountServiceAccountToken: {{ .Values.alpha.automountServiceAccountToken }}
{{- if .Values.alpha.schedulerName }}
schedulerName: {{ .Values.alpha.schedulerName }}
{{- end }}
Expand Down Expand Up @@ -210,7 +210,7 @@ spec:
{{- /* TODO: Remove awk-gsub once dgraph-io/dgraph#6837 is merged and back-ported. */}}
- |
set -ex
dgraph alpha --my=$(hostname -f | awk '{gsub(/\.$/,""); print $0}'):7080 --zero {{ template "multi_zeros" . }} {{ .Values.alpha.extraFlags }}
exec dgraph alpha --my=$(hostname -f | awk '{gsub(/\.$/,""); print $0}'):7080 --zero {{ template "multi_zeros" . }} {{ .Values.alpha.extraFlags }}
resources:
{{ toYaml .Values.alpha.resources | indent 10 }}
{{- if .Values.alpha.startupProbe.enabled }}
Expand Down Expand Up @@ -252,10 +252,8 @@ spec:
readinessProbe: {{- toYaml .Values.alpha.customReadinessProbe | nindent 10 }}
{{- end }}
volumeMounts:
{{- if .Values.alpha.persistence.enabled }}
- name: datadir
mountPath: /dgraph
{{- end }}
{{- if .Values.alpha.configFile }}
- name: config-volume
mountPath: /dgraph/config
Expand All @@ -282,11 +280,12 @@ spec:
{{- end }}
terminationGracePeriodSeconds: {{ .Values.alpha.terminationGracePeriodSeconds }}
volumes:
{{- if not .Values.alpha.persistence.enabled }}
# When persistence is enabled the volumeClaimTemplates entry below supplies
# the "datadir" volume - the StatefulSet controller injects a per-pod PVC
# (datadir-<sts>-<ordinal>). Only declare an emptyDir fallback when
# persistence is disabled.
- name: datadir
{{- if .Values.alpha.persistence.enabled }}
persistentVolumeClaim:
claimName: datadir
{{- else }}
emptyDir: {}
{{- end }}
{{- if and $backupsEnabled (or $hasS3Keys $hasMinioKeys) }}
Expand Down
6 changes: 3 additions & 3 deletions charts/dgraph/templates/zero/statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ spec:
labels:
{{- include "dgraph.labels" (dict "ctx" . "component" .Values.zero.name "podLabels" .Values.zero.podLabels) | nindent 8 }}
spec:
{{- if .Values.serviceAccount.create }}
serviceAccountName: {{ .Values.serviceAccount.name }}
automountServiceAccountToken: {{ .Values.zero.automountServiceAccountToken }}
{{- if or .Values.serviceAccount.create .Values.serviceAccount.name }}
serviceAccountName: {{ include "dgraph.serviceAccountName" . }}
{{- end }}
automountServiceAccountToken: {{ .Values.zero.automountServiceAccountToken }}
{{- if .Values.zero.schedulerName }}
schedulerName: {{ .Values.zero.schedulerName }}
{{- end }}
Expand Down