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

backup: support gcp backup with br #2267

Merged
merged 11 commits into from
May 7, 2020
Merged

backup: support gcp backup with br #2267

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
51c90dd
backup: support gcp backup
shuijing198799 Apr 22, 2020
f187101
revert unused change
shuijing198799 Apr 22, 2020
c744e10
revert unused change
shuijing198799 Apr 22, 2020
7966029
no need location and objectAcl
shuijing198799 Apr 23, 2020
0fb5213
KMS: configuration is change via tikv
shuijing198799 Apr 29, 2020
97aabe2
resolve conflict
shuijing198799 May 6, 2020
cabcfb2
run update-all
shuijing198799 May 6, 2020
fbb5a56
fix check
shuijing198799 May 6, 2020
a2ada91
address comment
shuijing198799 May 7, 2020
352e728
address comment
shuijing198799 May 7, 2020
9c18ebb
Merge branch 'master' into yinlinag/support-gcp-backup
sre-bot May 7, 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
2 changes: 1 addition & 1 deletion cmd/backup-manager/app/util/remote.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ func checkS3Config(s3 *v1alpha1.S3StorageProvider, fakeRegion bool) *s3Query {
return &sqs
}

// checkS3Config constructs s3Query parameters
// checkGcsConfig constructs s3Query parameters
shuijing198799 marked this conversation as resolved.
Show resolved Hide resolved
func checkGcsConfig(gcs *v1alpha1.GcsStorageProvider, fakeRegion bool) *gcsQuery {
gqs := gcsQuery{}

Expand Down
6 changes: 3 additions & 3 deletions docs/api-references/docs.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3457,7 +3457,7 @@ string
</td>
<td>
<p>SecretName is the name of secret which stores the
gcs service account credentials JSON .</p>
gcs service account credentials JSON.</p>
</td>
</tr>
<tr>
Expand All @@ -3468,7 +3468,7 @@ string
</em>
</td>
<td>
<p>Prefix for the keys.</p>
<p>Folder of the bucket.</p>
</td>
</tr>
</tbody>
Expand Down Expand Up @@ -7357,7 +7357,7 @@ string
</em>
</td>
<td>
<p>Prefix for the keys.</p>
<p>Folder of the bucket.</p>
</td>
</tr>
<tr>
Expand Down
6 changes: 3 additions & 3 deletions pkg/apis/pingcap/v1alpha1/openapi_generated.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions pkg/apis/pingcap/v1alpha1/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -840,7 +840,7 @@ type S3StorageProvider struct {
// SecretName is the name of secret which stores
// S3 compliant storage access key and secret key.
SecretName string `json:"secretName,omitempty"`
// Prefix for the keys.
// Folder of the bucket.
shuijing198799 marked this conversation as resolved.
Show resolved Hide resolved
Prefix string `json:"prefix,omitempty"`
// SSE Sever-Side Encryption.
SSE string `json:"sse,omitempty"`
Expand All @@ -867,9 +867,9 @@ type GcsStorageProvider struct {
// BucketAcl represents the access control list for new buckets
BucketAcl string `json:"bucketAcl,omitempty"`
// SecretName is the name of secret which stores the
// gcs service account credentials JSON .
// gcs service account credentials JSON.
SecretName string `json:"secretName"`
// Prefix for the keys.
// Folder of the bucket.
shuijing198799 marked this conversation as resolved.
Show resolved Hide resolved
Prefix string `json:"prefix,omitempty"`
shuijing198799 marked this conversation as resolved.
Show resolved Hide resolved
}

Expand Down