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

pingcap · Apr 30, 2020 · e5f9077 · e5f9077
1 parent 0460780
commit e5f9077
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/docs/api-references/docs.md b/docs/api-references/docs.md
@@ -10560,7 +10560,7 @@ TiKVTitanDBConfig
 <tbody>
 <tr>
 <td>
-<code>method</code></br>
+<code>data-encryption-method</code></br>
 <em>
 string
 </em>

diff --git 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
diff --git 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
-Original file 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 @@