Skip to content

backup: fix gke wif with empty credential file#6888

Merged
ti-chi-bot[bot] merged 4 commits into
pingcap:release-1.xfrom
Leavrth:fix-gke-wif-1.x
May 12, 2026
Merged

backup: fix gke wif with empty credential file#6888
ti-chi-bot[bot] merged 4 commits into
pingcap:release-1.xfrom
Leavrth:fix-gke-wif-1.x

Conversation

@Leavrth
Copy link
Copy Markdown
Contributor

@Leavrth Leavrth commented May 12, 2026

No description provided.

Signed-off-by: Jianjun Liao <jianjun.liao@outlook.com>
Signed-off-by: Jianjun Liao <jianjun.liao@outlook.com>
Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.json and set GOOGLE_APPLICATION_CREDENTIALS when GCS_SERVICE_ACCOUNT_JSON_KEY is provided.
  • Omit service_account_file from rclone.conf unless a service account JSON key is provided.
  • Unset GOOGLE_APPLICATION_CREDENTIALS when 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>
@ti-chi-bot
Copy link
Copy Markdown
Contributor

ti-chi-bot Bot commented May 12, 2026

[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

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot
Copy link
Copy Markdown
Contributor

ti-chi-bot Bot commented May 12, 2026

[LGTM Timeline notifier]

Timeline:

  • 2026-05-12 03:50:02.886210286 +0000 UTC m=+151171.418989605: ☑️ agreed by liubog2008.

@liubog2008
Copy link
Copy Markdown
Member

/hold

@Leavrth
Copy link
Copy Markdown
Contributor Author

Leavrth commented May 12, 2026

/retest

@liubog2008
Copy link
Copy Markdown
Member

retest

@liubog2008
Copy link
Copy Markdown
Member

/retest

@liubog2008
Copy link
Copy Markdown
Member

/unhold

@ti-chi-bot ti-chi-bot Bot merged commit 607d1d1 into pingcap:release-1.x May 12, 2026
15 checks passed
@Leavrth
Copy link
Copy Markdown
Contributor Author

Leavrth commented May 13, 2026

/cherry-pick release-1.6

@ti-chi-bot
Copy link
Copy Markdown
Member

@Leavrth: new pull request created to branch release-1.6: #6893.

Details

In response to this:

/cherry-pick release-1.6

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants