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

Support no secret for s3/ceph #1817

Merged
merged 7 commits into from
Mar 4, 2020
Merged

Support no secret for s3/ceph #1817

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
108e54c
Support no secret for s3/ceph
tirsen Feb 28, 2020
6729b99
Use the environment directly for AWS credentials for rclone
tirsen Feb 28, 2020
6d7e1cd
Fixes to backup scripts
tirsen Feb 29, 2020
723b2eb
Merge branch 'master' into jontirsen/2020-02-28/no-secret
DanielZhangQD Feb 29, 2020
68dd370
Update backup image to `pingcap/tidb-cloud-backup:20200229`
tirsen Mar 1, 2020
396af62
Merge branch 'master' into jontirsen/2020-02-28/no-secret
tirsen Mar 2, 2020
3644165
Merge branch 'master' into jontirsen/2020-02-28/no-secret
tennix Mar 4, 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
29 changes: 20 additions & 9 deletions charts/tidb-backup/templates/scripts/_start_backup.sh.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,13 +89,24 @@ uploader \
{{- end }}

{{- if .Values.s3 }}
uploader \
--cloud=aws \
--region={{ .Values.s3.region }} \
{{- if .Values.s3.prefix }}
--bucket={{ .Values.s3.bucket }}/{{ .Values.s3.prefix }} \
{{- else }}
--bucket={{ .Values.s3.bucket }} \
{{- end }}
--backup-dir=${dirname}
# Once we know there are no more credentials that will be logged we can run with -x
set -x
bucket={{ .Values.s3.bucket }}

cat <<EOF > /tmp/rclone.conf
[aws]
type = s3
provider = AWS
env_auth = true
region = us-west-2
EOF

cd "${backup_base_dir}"
{{- if .Values.s3.prefix }}
tar -cf - "${backup_name}" | pigz -p 16 \
| rclone --config /tmp/rclone.conf rcat s3:${bucket}/{{ .Values.s3.prefix }}/${backup_name}/${backup_name}.tgz
{{- else }}
tar -cf - "${backup_name}" | pigz -p 16 \
| rclone --config /tmp/rclone.conf rcat s3:${bucket}/${backup_name}/${backup_name}.tgz
{{- end }}
{{- end }}
2 changes: 1 addition & 1 deletion charts/tidb-cluster/templates/scheduled-backup-cronjob.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ spec:
- name: GOOGLE_APPLICATION_CREDENTIALS
value: /gcp/credentials.json
{{- end }}
{{- if or .Values.scheduledBackup.ceph .Values.scheduledBackup.s3 }}
{{- if or .Values.scheduledBackup.ceph.secretName .Values.scheduledBackup.s3.secretName }}
- name: AWS_ACCESS_KEY_ID
valueFrom:
secretKeyRef:
Expand Down