Skip to content

Commit 35f689a

Browse files
feat: [container] add LocalSsdEncryptionMode in NodeConfig (#5796)
* feat: add LocalSsdEncryptionMode in NodeConfig feat: add LinuxNodeConfig in NodePoolAutoConfig feat: add DesiredEnterpriseConfig proto message feat: add desired_enterprise_config,desired_node_pool_auto_config_linux_node_config to ClusterUpdate. feat: add UpgradeInfoEvent proto message feat: add desired_tier to EnterpriseConfig. docs: Minor documentation updates PiperOrigin-RevId: 694543887 Source-Link: googleapis/googleapis@48fb029 Source-Link: googleapis/googleapis-gen@7e07562 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNvbnRhaW5lci8uT3dsQm90LnlhbWwiLCJoIjoiN2UwNzU2MmFmYWZkMzZiYTQ1NDE5ZWU2MmVhMjcwNWI2ZDM1ZGMxNyJ9 * 🦉 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 10a04fc commit 35f689a

4 files changed

Lines changed: 1413 additions & 7 deletions

File tree

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

Lines changed: 105 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -565,6 +565,9 @@ message LinuxNodeConfig {
565565
// net.ipv4.tcp_rmem
566566
// net.ipv4.tcp_wmem
567567
// net.ipv4.tcp_tw_reuse
568+
// kernel.shmmni
569+
// kernel.shmmax
570+
// kernel.shmall
568571
map<string, string> sysctls = 1;
569572

570573
// cgroup_mode specifies the cgroup mode to be used on the node.
@@ -647,6 +650,26 @@ message NodeKubeletConfig {
647650
// [AutoprovisioningNodePoolDefaults][google.container.v1.AutoprovisioningNodePoolDefaults]
648651
// instead.
649652
message NodeConfig {
653+
// LocalSsdEncryptionMode specifies the method used for encrypting the Local
654+
// SSDs attached to the node.
655+
enum LocalSsdEncryptionMode {
656+
// The given node will be encrypted using keys managed by Google
657+
// infrastructure and the keys will be deleted when the node is
658+
// deleted.
659+
LOCAL_SSD_ENCRYPTION_MODE_UNSPECIFIED = 0;
660+
661+
// The given node will be encrypted using keys managed by Google
662+
// infrastructure and the keys will be deleted when the node is
663+
// deleted.
664+
STANDARD_ENCRYPTION = 1;
665+
666+
// The given node will opt-in for using ephemeral key for
667+
// encryption of Local SSDs.
668+
// The Local SSDs will not be able to recover data in case of node
669+
// crash.
670+
EPHEMERAL_KEY_ENCRYPTION = 2;
671+
}
672+
650673
// Possible effective cgroup modes for the node.
651674
enum EffectiveCgroupMode {
652675
// EFFECTIVE_CGROUP_MODE_UNSPECIFIED means the cgroup configuration for the
@@ -887,6 +910,10 @@ message NodeConfig {
887910
optional SecondaryBootDiskUpdateStrategy secondary_boot_disk_update_strategy =
888911
50;
889912

913+
// Specifies which method should be used for encrypting the
914+
// Local SSDs attahced to the node.
915+
optional LocalSsdEncryptionMode local_ssd_encryption_mode = 54;
916+
890917
// Output only. effective_cgroup_mode is the cgroup mode actually used by the
891918
// node pool. It is determined by the cgroup mode specified in the
892919
// LinuxNodeConfig or the default cgroup mode based on the cluster creation
@@ -2358,6 +2385,10 @@ message NodePoolAutoConfig {
23582385
//
23592386
// Currently only `insecure_kubelet_readonly_port_enabled` can be set here.
23602387
NodeKubeletConfig node_kubelet_config = 3;
2388+
2389+
// Output only. Configuration options for Linux nodes.
2390+
LinuxNodeConfig linux_node_config = 4
2391+
[(google.api.field_behavior) = OUTPUT_ONLY];
23612392
}
23622393

23632394
// Subset of Nodepool message that has defaults.
@@ -2662,6 +2693,15 @@ message ClusterUpdate {
26622693
// RBACBindingConfig allows user to restrict ClusterRoleBindings an
26632694
// RoleBindings that can be created.
26642695
optional RBACBindingConfig desired_rbac_binding_config = 144;
2696+
2697+
// The desired enterprise configuration for the cluster.
2698+
DesiredEnterpriseConfig desired_enterprise_config = 147;
2699+
2700+
// The desired Linux node config for all auto-provisioned node pools
2701+
// in autopilot clusters and node auto-provisioning enabled clusters.
2702+
//
2703+
// Currently only `cgroup_mode` can be set here.
2704+
LinuxNodeConfig desired_node_pool_auto_config_linux_node_config = 150;
26652705
}
26662706

26672707
// AdditionalPodRangesConfig is the configuration for additional pod secondary
@@ -2684,6 +2724,12 @@ message RangeInfo {
26842724
double utilization = 2 [(google.api.field_behavior) = OUTPUT_ONLY];
26852725
}
26862726

2727+
// DesiredEnterpriseConfig is a wrapper used for updating enterprise_config.
2728+
message DesiredEnterpriseConfig {
2729+
// desired_tier specifies the desired tier of the cluster.
2730+
EnterpriseConfig.ClusterTier desired_tier = 1;
2731+
}
2732+
26872733
// This operation resource represents operations that may have happened or are
26882734
// happening on the cluster. All fields are output only.
26892735
message Operation {
@@ -4402,11 +4448,11 @@ message NodePoolAutoscaling {
44024448
// Is autoscaling enabled for this node pool.
44034449
bool enabled = 1;
44044450

4405-
// Minimum number of nodes for one location in the NodePool. Must be >= 1 and
4406-
// <= max_node_count.
4451+
// Minimum number of nodes for one location in the node pool. Must be greater
4452+
// than or equal to 0 and less than or equal to max_node_count.
44074453
int32 min_node_count = 2;
44084454

4409-
// Maximum number of nodes for one location in the NodePool. Must be >=
4455+
// Maximum number of nodes for one location in the node pool. Must be >=
44104456
// min_node_count. There has to be enough quota to scale up the cluster.
44114457
int32 max_node_count = 3;
44124458

@@ -4416,13 +4462,13 @@ message NodePoolAutoscaling {
44164462
// Location policy used when scaling up a nodepool.
44174463
LocationPolicy location_policy = 5;
44184464

4419-
// Minimum number of nodes in the node pool. Must be greater than 1 less than
4420-
// total_max_node_count.
4465+
// Minimum number of nodes in the node pool. Must be greater than or equal
4466+
// to 0 and less than or equal to total_max_node_count.
44214467
// The total_*_node_count fields are mutually exclusive with the *_node_count
44224468
// fields.
44234469
int32 total_min_node_count = 6;
44244470

4425-
// Maximum number of nodes in the node pool. Must be greater than
4471+
// Maximum number of nodes in the node pool. Must be greater than or equal to
44264472
// total_min_node_count. There has to be enough quota to scale up the cluster.
44274473
// The total_*_node_count fields are mutually exclusive with the *_node_count
44284474
// fields.
@@ -5451,6 +5497,56 @@ message UpgradeEvent {
54515497
string resource = 6;
54525498
}
54535499

5500+
// UpgradeInfoEvent is a notification sent to customers about the upgrade
5501+
// information of a resource.
5502+
message UpgradeInfoEvent {
5503+
// The state of the upgrade.
5504+
enum State {
5505+
// STATE_UNSPECIFIED indicates the state is unspecified.
5506+
STATE_UNSPECIFIED = 0;
5507+
5508+
// STARTED indicates the upgrade has started.
5509+
STARTED = 3;
5510+
5511+
// SUCCEEDED indicates the upgrade has completed successfully.
5512+
SUCCEEDED = 4;
5513+
5514+
// FAILED indicates the upgrade has failed.
5515+
FAILED = 5;
5516+
5517+
// CANCELED indicates the upgrade has canceled.
5518+
CANCELED = 6;
5519+
}
5520+
5521+
// The resource type associated with the upgrade.
5522+
UpgradeResourceType resource_type = 1;
5523+
5524+
// The operation associated with this upgrade.
5525+
string operation = 2;
5526+
5527+
// The time when the operation was started.
5528+
google.protobuf.Timestamp start_time = 3;
5529+
5530+
// The time when the operation ended.
5531+
google.protobuf.Timestamp end_time = 4;
5532+
5533+
// The current version before the upgrade.
5534+
string current_version = 5;
5535+
5536+
// The target version for the upgrade.
5537+
string target_version = 6;
5538+
5539+
// Optional relative path to the resource. For example in node pool upgrades,
5540+
// the relative path of the node pool.
5541+
string resource = 7;
5542+
5543+
// Output only. The state of the upgrade.
5544+
State state = 8 [(google.api.field_behavior) = OUTPUT_ONLY];
5545+
5546+
// A brief description of the event.
5547+
string description = 11;
5548+
}
5549+
54545550
// UpgradeAvailableEvent is a notification sent to customers when a new
54555551
// available version is released.
54565552
message UpgradeAvailableEvent {
@@ -5915,6 +6011,9 @@ message EnterpriseConfig {
59156011

59166012
// Output only. cluster_tier indicates the effective tier of the cluster.
59176013
ClusterTier cluster_tier = 1 [(google.api.field_behavior) = OUTPUT_ONLY];
6014+
6015+
// desired_tier specifies the desired tier of the cluster.
6016+
ClusterTier desired_tier = 2;
59186017
}
59196018

59206019
// SecretManagerConfig is config for secret manager enablement.

0 commit comments

Comments
 (0)