Skip to content

Commit 632f7f4

Browse files
feat: [container] add several fields to manage state of database encryption update (#5184)
* feat: add several fields to manage state of database encryption update PiperOrigin-RevId: 619273826 Source-Link: googleapis/googleapis@cf1b61c Source-Link: googleapis/googleapis-gen@6a32e3c Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNvbnRhaW5lci8uT3dsQm90LnlhbWwiLCJoIjoiNmEzMmUzY2ViNmVkZGE0OTQxNmI3OGE3MGRlNzhjNTUzYmNhN2EzYiJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * feat: add several fields to manage state of database encryption update PiperOrigin-RevId: 619289281 Source-Link: googleapis/googleapis@3a7c334 Source-Link: googleapis/googleapis-gen@6a8c733 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNvbnRhaW5lci8uT3dsQm90LnlhbWwiLCJoIjoiNmE4YzczMzA2MmQ4MzNkMTFjNTI0NWVkYTUwZjUxMDhlMGU1NTMyNCJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
1 parent b569fbe commit 632f7f4

9 files changed

Lines changed: 1499 additions & 10 deletions

File tree

packages/google-container/protos/google/container/v1/cluster_service.proto

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4719,12 +4719,68 @@ message DatabaseEncryption {
47194719
DECRYPTED = 2;
47204720
}
47214721

4722+
// Current State of etcd encryption.
4723+
enum CurrentState {
4724+
// Should never be set
4725+
CURRENT_STATE_UNSPECIFIED = 0;
4726+
4727+
// Secrets in etcd are encrypted.
4728+
CURRENT_STATE_ENCRYPTED = 7;
4729+
4730+
// Secrets in etcd are stored in plain text (at etcd level) - this is
4731+
// unrelated to Compute Engine level full disk encryption.
4732+
CURRENT_STATE_DECRYPTED = 2;
4733+
4734+
// Encryption (or re-encryption with a different CloudKMS key)
4735+
// of Secrets is in progress.
4736+
CURRENT_STATE_ENCRYPTION_PENDING = 3;
4737+
4738+
// Encryption (or re-encryption with a different CloudKMS key) of Secrets in
4739+
// etcd encountered an error.
4740+
CURRENT_STATE_ENCRYPTION_ERROR = 4;
4741+
4742+
// De-crypting Secrets to plain text in etcd is in progress.
4743+
CURRENT_STATE_DECRYPTION_PENDING = 5;
4744+
4745+
// De-crypting Secrets to plain text in etcd encountered an error.
4746+
CURRENT_STATE_DECRYPTION_ERROR = 6;
4747+
}
4748+
4749+
// OperationError records errors seen from CloudKMS keys
4750+
// encountered during updates to DatabaseEncryption configuration.
4751+
message OperationError {
4752+
// CloudKMS key resource that had the error.
4753+
string key_name = 1;
4754+
4755+
// Description of the error seen during the operation.
4756+
string error_message = 2;
4757+
4758+
// Time when the CloudKMS error was seen.
4759+
google.protobuf.Timestamp timestamp = 3;
4760+
}
4761+
47224762
// Name of CloudKMS key to use for the encryption of secrets in etcd.
47234763
// Ex. projects/my-project/locations/global/keyRings/my-ring/cryptoKeys/my-key
47244764
string key_name = 1;
47254765

47264766
// The desired state of etcd encryption.
47274767
State state = 2;
4768+
4769+
// Output only. The current state of etcd encryption.
4770+
optional CurrentState current_state = 3
4771+
[(google.api.field_behavior) = OUTPUT_ONLY];
4772+
4773+
// Output only. Keys in use by the cluster for decrypting
4774+
// existing objects, in addition to the key in `key_name`.
4775+
//
4776+
// Each item is a CloudKMS key resource.
4777+
repeated string decryption_keys = 4
4778+
[(google.api.field_behavior) = OUTPUT_ONLY];
4779+
4780+
// Output only. Records errors seen during DatabaseEncryption update
4781+
// operations.
4782+
repeated OperationError last_operation_errors = 5
4783+
[(google.api.field_behavior) = OUTPUT_ONLY];
47284784
}
47294785

47304786
// ListUsableSubnetworksRequest requests the list of usable subnetworks

packages/google-container/protos/google/container/v1beta1/cluster_service.proto

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5265,12 +5265,68 @@ message DatabaseEncryption {
52655265
DECRYPTED = 2;
52665266
}
52675267

5268+
// Current State of etcd encryption.
5269+
enum CurrentState {
5270+
// Should never be set
5271+
CURRENT_STATE_UNSPECIFIED = 0;
5272+
5273+
// Secrets in etcd are encrypted.
5274+
CURRENT_STATE_ENCRYPTED = 7;
5275+
5276+
// Secrets in etcd are stored in plain text (at etcd level) - this is
5277+
// unrelated to Compute Engine level full disk encryption.
5278+
CURRENT_STATE_DECRYPTED = 2;
5279+
5280+
// Encryption (or re-encryption with a different CloudKMS key)
5281+
// of Secrets is in progress.
5282+
CURRENT_STATE_ENCRYPTION_PENDING = 3;
5283+
5284+
// Encryption (or re-encryption with a different CloudKMS key) of Secrets in
5285+
// etcd encountered an error.
5286+
CURRENT_STATE_ENCRYPTION_ERROR = 4;
5287+
5288+
// De-crypting Secrets to plain text in etcd is in progress.
5289+
CURRENT_STATE_DECRYPTION_PENDING = 5;
5290+
5291+
// De-crypting Secrets to plain text in etcd encountered an error.
5292+
CURRENT_STATE_DECRYPTION_ERROR = 6;
5293+
}
5294+
5295+
// OperationError records errors seen from CloudKMS keys
5296+
// encountered during updates to DatabaseEncryption configuration.
5297+
message OperationError {
5298+
// CloudKMS key resource that had the error.
5299+
string key_name = 1;
5300+
5301+
// Description of the error seen during the operation.
5302+
string error_message = 2;
5303+
5304+
// Time when the CloudKMS error was seen.
5305+
google.protobuf.Timestamp timestamp = 3;
5306+
}
5307+
52685308
// Name of CloudKMS key to use for the encryption of secrets in etcd.
52695309
// Ex. projects/my-project/locations/global/keyRings/my-ring/cryptoKeys/my-key
52705310
string key_name = 1;
52715311

52725312
// The desired state of etcd encryption.
52735313
State state = 2;
5314+
5315+
// Output only. The current state of etcd encryption.
5316+
optional CurrentState current_state = 3
5317+
[(google.api.field_behavior) = OUTPUT_ONLY];
5318+
5319+
// Output only. Keys in use by the cluster for decrypting
5320+
// existing objects, in addition to the key in `key_name`.
5321+
//
5322+
// Each item is a CloudKMS key resource.
5323+
repeated string decryption_keys = 4
5324+
[(google.api.field_behavior) = OUTPUT_ONLY];
5325+
5326+
// Output only. Records errors seen during DatabaseEncryption update
5327+
// operations.
5328+
repeated OperationError last_operation_errors = 5
5329+
[(google.api.field_behavior) = OUTPUT_ONLY];
52745330
}
52755331

52765332
// Configuration for exporting cluster resource usages.

0 commit comments

Comments
 (0)