From 761e97e31f3ad59c7a0ec5a3ab80b58fcd891ea9 Mon Sep 17 00:00:00 2001 From: shuijing198799 Date: Wed, 29 Apr 2020 14:28:02 +0800 Subject: [PATCH] KMS: configuration is change via tikv --- docs/api-references/docs.md | 2 +- manifests/crd.yaml | 12 ++++++------ pkg/apis/pingcap/v1alpha1/openapi_generated.go | 2 +- pkg/apis/pingcap/v1alpha1/tikv_config.go | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/api-references/docs.md b/docs/api-references/docs.md index feb516e0b0f..59971466ae4 100644 --- a/docs/api-references/docs.md +++ b/docs/api-references/docs.md @@ -10560,7 +10560,7 @@ TiKVTitanDBConfig -method
+data-encryption-method
string diff --git a/manifests/crd.yaml b/manifests/crd.yaml index e6781a9032f..ae8bfd95f8a 100644 --- a/manifests/crd.yaml +++ b/manifests/crd.yaml @@ -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' @@ -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: diff --git a/pkg/apis/pingcap/v1alpha1/openapi_generated.go b/pkg/apis/pingcap/v1alpha1/openapi_generated.go index 803bb3d5e24..6ff19e0cb51 100644 --- a/pkg/apis/pingcap/v1alpha1/openapi_generated.go +++ b/pkg/apis/pingcap/v1alpha1/openapi_generated.go @@ -5433,7 +5433,7 @@ func schema_pkg_apis_pingcap_v1alpha1_TiKVEncryptionConfig(ref common.ReferenceC SchemaProps: spec.SchemaProps{ Type: []string{"object"}, Properties: map[string]spec.Schema{ - "method": { + "data-encryption-method": { SchemaProps: spec.SchemaProps{ 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{"string"}, diff --git a/pkg/apis/pingcap/v1alpha1/tikv_config.go b/pkg/apis/pingcap/v1alpha1/tikv_config.go index 0257367d877..8a870b721df 100644 --- a/pkg/apis/pingcap/v1alpha1/tikv_config.go +++ b/pkg/apis/pingcap/v1alpha1/tikv_config.go @@ -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