Skip to content
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

lightning: support lightning use IAM #1975

Merged
merged 6 commits into from
Mar 19, 2020
Merged

lightning: support lightning use IAM #1975

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fd27d23
add serviceAccount and make dataSource.remote.secretName optional
shuijing198799 Mar 18, 2020
9bb2aaf
add service account config
shuijing198799 Mar 18, 2020
6aa0695
address comment
shuijing198799 Mar 19, 2020
7a61a56
no ignore secret name
shuijing198799 Mar 19, 2020
f3679f6
Merge branch 'master' into yinliang/support-sa-iam
DanielZhangQD Mar 19, 2020
dc008af
Merge branch 'master' into yinliang/support-sa-iam
sre-bot Mar 19, 2020
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
9 changes: 7 additions & 2 deletions charts/tidb-lightning/templates/job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ spec:
{{ toYaml .Values.annotations | indent 8 }}
{{- end }}
spec:
{{- if .Values.serviceAccount }}
serviceAccountName: {{ .Values.serviceAccount }}
{{- end }}
{{ if and .Values.dataSource.local.hostPath .Values.dataSource.local.nodeName -}}
nodeName: {{ .Values.dataSource.local.nodeName }}
{{ else if not .Values.dataSource.adhoc.pvcName -}}
Expand All @@ -40,8 +43,10 @@ spec:
- |
{{ tuple "scripts/_start_data_retriever.sh.tpl" . | include "helm-toolkit.utils.template" | indent 10 }}
volumeMounts:
{{- if or .Values.dataSource.remote.rcloneConfig .Values.dataSource.remote.secretName}}
- name: credentials
mountPath: /etc/rclone
{{ end -}}
- name: data
mountPath: /data
{{ if and (ne .Values.timezone "UTC") (ne .Values.timezone "") }}
Expand Down Expand Up @@ -122,11 +127,11 @@ spec:
items:
- key: config-file
path: rclone.conf
{{ else }}
{{- else if .Values.dataSource.remote.secretName }}
- name: credentials
secret:
secretName: {{ .Values.dataSource.remote.secretName }}
{{ end -}}
{{- end }}
- name: data
persistentVolumeClaim:
claimName: {{ include "tidb-lightning.name" . }}
Expand Down
3 changes: 3 additions & 0 deletions charts/tidb-lightning/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,9 @@ affinity: {}

backend: importer # importer | tidb

# Specify a Service Account for lightning
# serviceAccount:

config: |
[lightning]
level = "info"