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

KMS: configuration is change via tikv (#2334) #2351

Merged
merged 3 commits into from
Apr 30, 2020
Merged

KMS: configuration is change via tikv (#2334) #2351

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
761e97e
KMS: configuration is change via tikv
shuijing198799 Apr 29, 2020
738def9
Merge branch 'release-1.1' into release-1.1-93e6f1cf54fe
DanielZhangQD Apr 29, 2020
0fd05f6
Merge branch 'release-1.1' into release-1.1-93e6f1cf54fe
sre-bot Apr 30, 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 docs/api-references/docs.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10560,7 +10560,7 @@ TiKVTitanDBConfig
<tbody>
<tr>
<td>
<code>method</code></br>
<code>data-encryption-method</code></br>
<em>
string
</em>
Expand Down
12 changes: 6 additions & 6 deletions manifests/crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6142,6 +6142,12 @@ spec:
type: object
encryption:
properties:
data-encryption-method:
description: 'Encrypyion method, use data key encryption
raw rocksdb data Possible values: plaintext, aes128-ctr,
aes192-ctr, aes256-ctr Optional: Default to plaintext
optional'
type: string
data-key-rotation-period:
description: 'The frequency of datakey rotation, It managered
by tikv Optional: default to 7d optional'
Expand Down Expand Up @@ -6188,12 +6194,6 @@ spec:
- path
- key-id
type: object
method:
description: 'Encrypyion method, use data key encryption
raw rocksdb data Possible values: plaintext, aes128-ctr,
aes192-ctr, aes256-ctr Optional: Default to plaintext
optional'
type: string
previous-master-key:
properties:
access-key:
Expand Down
2 changes: 1 addition & 1 deletion 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.

2 changes: 1 addition & 1 deletion pkg/apis/pingcap/v1alpha1/tikv_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -751,7 +751,7 @@ type TiKVEncryptionConfig struct {
// Possible values: plaintext, aes128-ctr, aes192-ctr, aes256-ctr
// Optional: Default to plaintext
// optional
Method string `json:"method,omitempty" toml:"method,omitempty"`
Method string `json:"data-encryption-method,omitempty" toml:"data-encryption-method,omitempty"`

// The frequency of datakey rotation, It managered by tikv
// Optional: default to 7d
Expand Down