backup: fix gke wif with empty credential file#6888
Conversation
Signed-off-by: Jianjun Liao <jianjun.liao@outlook.com>
There was a problem hiding this comment.
Pull request overview
Updates the TiDB backup-manager container entrypoints to better support GKE Workload Identity Federation by avoiding creation/use of an empty GCP credentials file, allowing Google ADC to work correctly when no JSON key is provided.
Changes:
- Only create
/tmp/google-credentials.jsonand setGOOGLE_APPLICATION_CREDENTIALSwhenGCS_SERVICE_ACCOUNT_JSON_KEYis provided. - Omit
service_account_filefromrclone.confunless a service account JSON key is provided. - Unset
GOOGLE_APPLICATION_CREDENTIALSwhen no service account JSON key is provided to avoid forcing an empty credentials file.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| images/tidb-backup-manager/entrypoint.sh | Conditionalize GCS credentials file creation and rclone GCS config to avoid empty credential file behavior. |
| images/tidb-backup-manager/e2e-entrypoint.sh | Mirrors the same conditional GCS credential handling for the E2E image entrypoint. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Signed-off-by: Jianjun Liao <jianjun.liao@outlook.com>
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: liubog2008 The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
[LGTM Timeline notifier]Timeline:
|
|
/hold |
|
/retest |
|
retest |
|
/retest |
|
/unhold |
|
/cherry-pick release-1.6 |
|
@Leavrth: new pull request created to branch DetailsIn response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository. |
No description provided.