Skip to content

[Bytesafe] Add support for serviceAccountName #44

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
conclusionlogic wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[Bytesafe] Add support for serviceAccountName #44

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
61 changes: 32 additions & 29 deletions charts/bytesafe/templates/statefulSet.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,54 +4,58 @@ metadata:
name: {{ template "bytesafe.fullname" . }}
labels:
{{- include "bytesafe.labels" . | nindent 4 }}
{{- if .Values.statefulSet.labels }}
{{ toYaml .Values.statefulSet.labels | indent 4 }}
{{- end }}
{{- if .Values.statefulSet.annotations }}
{{- if .Values.statefulSet.labels }}
{{ toYaml .Values.statefulSet.labels | indent 4 }}
{{- end }}
{{- if .Values.statefulSet.annotations }}
annotations:
{{ toYaml .Values.statefulSet.annotations | indent 4 }}
{{- end }}
{{ toYaml .Values.statefulSet.annotations | indent 4 }}
{{- end }}
spec:
serviceName: {{ include "bytesafe.fullname" . }}
selector:
matchLabels:
{{- include "bytesafe.selectorLabels" . | nindent 6 }}
replicas: {{.Values.replicaCount}}
{{- include "bytesafe.selectorLabels" . | nindent 6 }}
replicas: {{ .Values.replicaCount }}
template:
metadata:
labels:
{{- include "bytesafe.selectorLabels" . | nindent 8 }}
{{- if .Values.pod.labels }}
{{ toYaml .Values.pod.labels | indent 8 }}
{{- end }}
{{- if .Values.pod.annotations }}
{{- include "bytesafe.selectorLabels" . | nindent 8 }}
{{- if .Values.pod.labels }}
{{ toYaml .Values.pod.labels | indent 8 }}
{{- end }}
{{- if .Values.pod.annotations }}
annotations:
{{ toYaml .Values.pod.annotations | indent 8 }}
{{- end }}
{{ toYaml .Values.pod.annotations | indent 8 }}
{{- end }}
spec:
{{- if .Values.serviceAccount.create }}
automountServiceAccountToken: true
serviceAccountName: {{ if .Values.serviceAccount.name }}{{ .Values.serviceAccount.name }}{{ else }}{{ include "bytesafe.fullname" . }}{{ end }}
{{- end }}
volumes:
- name: bytesafe-tmp
emptyDir: {}
{{- if and .Values.persistence.enabled .Values.persistence.existingClaim }}
{{- if and .Values.persistence.enabled .Values.persistence.existingClaim }}
- name: bytesafe-data
persistentVolumeClaim:
{{- with .Values.persistence.existingClaim }}
{{- with .Values.persistence.existingClaim }}
claimName: {{ tpl . $ }}
{{- end }}
{{- else if .Values.persistence.enabled }}
{{- end }}
{{- else if .Values.persistence.enabled }}
- name: bytesafe-data
persistentVolumeClaim:
claimName: {{ template "bytesafe.fullname" . }}-data
{{- end }}
{{- end }}
containers:
- name: bytesafe-ce
image: {{.Values.image.repository}}:{{.Values.image.tag}}
image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
env:
- name: DATA_ENCRYPTION_KEY
valueFrom:
secretKeyRef:
name: bytesafe-secrets
key: DATA_ENCRYPTION_KEY

{{- if and .Values.redis.enabled .Values.redis.auth.existingSecret }}
- name: REDIS_PASSWORD
valueFrom:
Expand All @@ -65,7 +69,7 @@ spec:
secretKeyRef:
name: bytesafe-secrets
key: REDIS_PASSWORD
{{- end}}
{{- end }}
{{- if and .Values.externalRedis.enabled .Values.externalRedis.existingSecret }}
- name: REDIS_PASSWORD
valueFrom:
Expand All @@ -79,8 +83,7 @@ spec:
secretKeyRef:
name: bytesafe-secrets
key: REDIS_PASSWORD
{{- end}}

{{- end }}
{{- if and .Values.postgresql.enabled .Values.postgresql.auth.existingSecret }}
- name: DB_ADMIN_PASSWORD
valueFrom:
Expand All @@ -104,7 +107,7 @@ spec:
secretKeyRef:
name: bytesafe-secrets
key: DB_PASSWORD
{{- end}}
{{- end }}
{{- if and .Values.externalDatabase.enabled .Values.externalDatabase.existingSecret }}
- name: DB_ADMIN_PASSWORD
valueFrom:
Expand All @@ -128,14 +131,14 @@ spec:
secretKeyRef:
name: bytesafe-secrets
key: DB_PASSWORD
{{- end}}
{{- end }}
{{- if .Values.smtp.enabled }}
- name: SMTP_PASSWORD
valueFrom:
secretKeyRef:
name: bytesafe-secrets
key: SMTP_PASSWORD
{{- end}}
{{- end }}
envFrom:
- configMapRef:
name: bytesafe-config
Expand All @@ -160,4 +163,4 @@ spec:
path: /ping
port: 8081
initialDelaySeconds: 30
periodSeconds: 10
periodSeconds: 10