Skip to content

backup: fix gke wif with empty credential file (#6888) #6893

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
ti-chi-bot merged 3 commits into from
May 14, 2026
+36 −22
Merged

backup: fix gke wif with empty credential file (#6888) #6893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cf28ef5
fix gke wif credential file
Leavrth May 11, 2026
cfe5e43
fix typos
Leavrth May 12, 2026
5f26bb9
commit some suggestions
Leavrth May 12, 2026
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: 18 additions & 11 deletions images/tidb-backup-manager/e2e-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,23 @@ cleanup() {

trap cleanup EXIT

export GOOGLE_APPLICATION_CREDENTIALS=/tmp/google-credentials.json
GCS_SERVICE_ACCOUNT_FILE=/tmp/google-credentials.json
GCS_SERVICE_ACCOUNT_FILE_CONFIG=
if [ -n "${GCS_SERVICE_ACCOUNT_JSON_KEY:-}" ]; then
export GOOGLE_APPLICATION_CREDENTIALS=${GCS_SERVICE_ACCOUNT_FILE}
GCS_SERVICE_ACCOUNT_FILE_CONFIG="service_account_file = ${GOOGLE_APPLICATION_CREDENTIALS}"
echo "Create google-credentials.json file."
cat <<EOF > "${GOOGLE_APPLICATION_CREDENTIALS}"
${GCS_SERVICE_ACCOUNT_JSON_KEY}
EOF
elif [ -s "${GCS_SERVICE_ACCOUNT_FILE}" ]; then
echo "Use mounted google-credentials.json file."
export GOOGLE_APPLICATION_CREDENTIALS=${GCS_SERVICE_ACCOUNT_FILE}
GCS_SERVICE_ACCOUNT_FILE_CONFIG="service_account_file = ${GOOGLE_APPLICATION_CREDENTIALS}"
else
unset GOOGLE_APPLICATION_CREDENTIALS
fi

echo "Create rclone.conf file."
cat <<EOF > /tmp/rclone.conf
[s3]
Expand All @@ -41,26 +57,17 @@ storage_class = ${AWS_STORAGE_CLASS}
[gcs]
type = google cloud storage
project_number = ${GCS_PROJECT_ID}
service_account_file = ${GOOGLE_APPLICATION_CREDENTIALS}
object_acl = ${GCS_OBJECT_ACL}
bucket_acl = ${GCS_BUCKET_ACL}
location = ${GCS_LOCATION}
storage_class = ${GCS_STORAGE_CLASS:-"COLDLINE"}
${GCS_SERVICE_ACCOUNT_FILE_CONFIG}
[azure]
type = azureblob
account = ${AZUREBLOB_ACCOUNT}
key = ${AZUREBLOB_KEY}
EOF

if [[ -n "${GCS_SERVICE_ACCOUNT_JSON_KEY:-}" ]]; then
echo "Create google-credentials.json file."
cat <<EOF > ${GOOGLE_APPLICATION_CREDENTIALS}
${GCS_SERVICE_ACCOUNT_JSON_KEY}
EOF
else
touch ${GOOGLE_APPLICATION_CREDENTIALS}
fi

BACKUP_BIN=/tidb-backup-manager

COV_NAME="backup-manager.$(( ( RANDOM % 100000 ) + 1 ))"
Expand Down
29 changes: 18 additions & 11 deletions images/tidb-backup-manager/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,23 @@ cleanup() {

trap cleanup EXIT

export GOOGLE_APPLICATION_CREDENTIALS=/tmp/google-credentials.json
GCS_SERVICE_ACCOUNT_FILE=/tmp/google-credentials.json
GCS_SERVICE_ACCOUNT_FILE_CONFIG=
if [ -n "${GCS_SERVICE_ACCOUNT_JSON_KEY:-}" ]; then
export GOOGLE_APPLICATION_CREDENTIALS=${GCS_SERVICE_ACCOUNT_FILE}
GCS_SERVICE_ACCOUNT_FILE_CONFIG="service_account_file = ${GOOGLE_APPLICATION_CREDENTIALS}"
echo "Create google-credentials.json file."
cat <<EOF > "${GOOGLE_APPLICATION_CREDENTIALS}"
${GCS_SERVICE_ACCOUNT_JSON_KEY}
EOF
elif [ -s "${GCS_SERVICE_ACCOUNT_FILE}" ]; then
echo "Use mounted google-credentials.json file."
export GOOGLE_APPLICATION_CREDENTIALS=${GCS_SERVICE_ACCOUNT_FILE}
GCS_SERVICE_ACCOUNT_FILE_CONFIG="service_account_file = ${GOOGLE_APPLICATION_CREDENTIALS}"
else
unset GOOGLE_APPLICATION_CREDENTIALS
fi

echo "Create rclone.conf file."
cat <<EOF > /tmp/rclone.conf
[s3]
Expand All @@ -43,26 +59,17 @@ storage_class = ${AWS_STORAGE_CLASS}
[gcs]
type = google cloud storage
project_number = ${GCS_PROJECT_ID}
service_account_file = ${GOOGLE_APPLICATION_CREDENTIALS}
object_acl = ${GCS_OBJECT_ACL}
bucket_acl = ${GCS_BUCKET_ACL}
location = ${GCS_LOCATION}
storage_class = ${GCS_STORAGE_CLASS:-"COLDLINE"}
${GCS_SERVICE_ACCOUNT_FILE_CONFIG}
[azure]
type = azureblob
account = ${AZUREBLOB_ACCOUNT}
key = ${AZUREBLOB_KEY}
EOF

if [[ -n "${GCS_SERVICE_ACCOUNT_JSON_KEY:-}" ]]; then
echo "Create google-credentials.json file."
cat <<EOF > ${GOOGLE_APPLICATION_CREDENTIALS}
${GCS_SERVICE_ACCOUNT_JSON_KEY}
EOF
else
touch ${GOOGLE_APPLICATION_CREDENTIALS}
fi

BACKUP_BIN=/tidb-backup-manager
if [[ -n "${AWS_DEFAULT_REGION}" ]]; then
EXEC_COMMAND="exec"
Expand Down
Loading