Skip to content

Commit 0bccdc4

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
feat: [container] added EnterpriseConfig (#4774)
- [ ] Regenerate this pull request now. feat: add a new cluster field for the cluster tier of GKE clusters PiperOrigin-RevId: 578552799 Source-Link: https://togithub.com/googleapis/googleapis/commit/23321ee5c31ad844fde2449e7469bd932e9cd6f8 Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/88fa3a391a48bce7bc81762aad0ac6de4a8fb8be Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNvbnRhaW5lci8uT3dsQm90LnlhbWwiLCJoIjoiODhmYTNhMzkxYTQ4YmNlN2JjODE3NjJhYWQwYWM2ZGU0YThmYjhiZSJ9 BEGIN_NESTED_COMMIT feat: [container] added EnterpriseConfig feat: add a new cluster field for the cluster tier of GKE clusters PiperOrigin-RevId: 578552276 Source-Link: https://togithub.com/googleapis/googleapis/commit/c8ecf346f0e69cc7016889662ee48e24b590336d Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/dd3274c4eb14d9630fb9cfc393f933d9e4089397 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNvbnRhaW5lci8uT3dsQm90LnlhbWwiLCJoIjoiZGQzMjc0YzRlYjE0ZDk2MzBmYjljZmMzOTNmOTMzZDllNDA4OTM5NyJ9 END_NESTED_COMMIT BEGIN_NESTED_COMMIT feat: [container] add ResourceManagerTags API to attach tags on the underlying Compute Engine VMs of GKE Nodes which can be used to selectively enforce Cloud Firewall network firewall policies --- feat: add CompleteConvertToAutopilot API to commit Autopilot conversion operation --- docs: updated comments PiperOrigin-RevId: 577928708 Source-Link: https://togithub.com/googleapis/googleapis/commit/facb658ce05eba41ced16ca79bfe468494c97705 Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/b124e582611f53acc1231232a69e8e4c746b61c8 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNvbnRhaW5lci8uT3dsQm90LnlhbWwiLCJoIjoiYjEyNGU1ODI2MTFmNTNhY2MxMjMxMjMyYTY5ZThlNGM3NDZiNjFjOCJ9 END_NESTED_COMMIT BEGIN_NESTED_COMMIT feat: [container] add ResourceManagerTags API to attach tags on the underlying Compute Engine VMs of GKE Nodes which can be used to selectively enforce Cloud Firewall network firewall policies --- feat: add CompleteConvertToAutopilot API to commit Autopilot conversion operation --- feat: adding a field to allow turn the DPv2 node to node encryption feature on or off --- docs: minor comments changes PiperOrigin-RevId: 577924838 Source-Link: https://togithub.com/googleapis/googleapis/commit/3fdb61c3b0b765eb6449db887a091dca5bd6ed27 Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/ac9006319912b061d5a821de5d3cccf96f8b23d1 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNvbnRhaW5lci8uT3dsQm90LnlhbWwiLCJoIjoiYWM5MDA2MzE5OTEyYjA2MWQ1YTgyMWRlNWQzY2NjZjk2ZjhiMjNkMSJ9 END_NESTED_COMMIT
1 parent 8665efa commit 0bccdc4

11 files changed

Lines changed: 2848 additions & 30 deletions

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

Lines changed: 87 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -831,6 +831,9 @@ message NodeConfig {
831831

832832
// Parameters for node pools to be backed by shared sole tenant node groups.
833833
SoleTenantConfig sole_tenant_config = 42;
834+
835+
// A map of resource manager tag keys and values to be attached to the nodes.
836+
ResourceManagerTags resource_manager_tags = 45;
834837
}
835838

836839
// Specifies options for controlling advanced machine features.
@@ -1972,6 +1975,9 @@ message Cluster {
19721975

19731976
// Beta APIs Config
19741977
K8sBetaAPIConfig enable_k8s_beta_apis = 143;
1978+
1979+
// GKE Enterprise Configuration.
1980+
EnterpriseConfig enterprise_config = 149;
19751981
}
19761982

19771983
// K8sBetaAPIConfig , configuration for beta APIs
@@ -2022,6 +2028,10 @@ message NodePoolAutoConfig {
20222028
// the client during cluster creation. Each tag within the list
20232029
// must comply with RFC1035.
20242030
NetworkTags network_tags = 1;
2031+
2032+
// Resource manager tag keys and values to be attached to the nodes
2033+
// for managing Compute Engine firewalls using Network Firewall Policies.
2034+
ResourceManagerTags resource_manager_tags = 2;
20252035
}
20262036

20272037
// Subset of Nodepool message that has defaults.
@@ -2253,6 +2263,10 @@ message ClusterUpdate {
22532263

22542264
// Desired Beta APIs to be enabled for cluster.
22552265
K8sBetaAPIConfig desired_k8s_beta_apis = 131;
2266+
2267+
// The desired resource manager tags that apply to all auto-provisioned node
2268+
// pools in autopilot clusters and node auto-provisioning enabled clusters.
2269+
ResourceManagerTags desired_node_pool_auto_config_resource_manager_tags = 136;
22562270
}
22572271

22582272
// AdditionalPodRangesConfig is the configuration for additional pod secondary
@@ -2415,6 +2429,10 @@ message Operation {
24152429
// [documentation on
24162430
// resizes](https://cloud.google.com/kubernetes-engine/docs/concepts/maintenance-windows-and-exclusions#repairs).
24172431
RESIZE_CLUSTER = 18;
2432+
2433+
// Fleet features of GKE Enterprise are being upgraded. The cluster should
2434+
// be assumed to be blocked for other upgrades until the operation finishes.
2435+
FLEET_FEATURE_UPGRADE = 19;
24182436
}
24192437

24202438
// The server-assigned ID for the operation.
@@ -2725,6 +2743,11 @@ message UpdateNodePoolRequest {
27252743
// Initiates an upgrade operation that migrates the nodes in the
27262744
// node pool to the specified disk size.
27272745
int64 disk_size_gb = 38 [(google.api.field_behavior) = OPTIONAL];
2746+
2747+
// Desired resource manager tag keys and values to be attached to the nodes
2748+
// for managing Compute Engine firewalls using Network Firewall Policies.
2749+
// Existing tags will be replaced with new values.
2750+
ResourceManagerTags resource_manager_tags = 39;
27282751
}
27292752

27302753
// SetNodePoolAutoscalingRequest sets the autoscaler settings of a node pool.
@@ -5210,27 +5233,80 @@ enum IPv6AccessType {
52105233
}
52115234

52125235
// LocalNvmeSsdBlockConfig contains configuration for using raw-block local
5213-
// NVMe SSD.
5236+
// NVMe SSDs
52145237
message LocalNvmeSsdBlockConfig {
5215-
// The number of raw-block local NVMe SSD disks to be attached to the node.
5216-
// Each local SSD is 375 GB in size. If zero, it means no raw-block local NVMe
5217-
// SSD disks to be attached to the node.
5218-
// The limit for this value is dependent upon the maximum number of
5219-
// disks available on a machine per zone. See:
5238+
// Number of local NVMe SSDs to use. The limit for this value is dependent
5239+
// upon the maximum number of disk available on a machine per zone. See:
52205240
// https://cloud.google.com/compute/docs/disks/local-ssd
52215241
// for more information.
5242+
//
5243+
// A zero (or unset) value has different meanings depending on machine type
5244+
// being used:
5245+
// 1. For pre-Gen3 machines, which support flexible numbers of local ssds,
5246+
// zero (or unset) means to disable using local SSDs as ephemeral storage.
5247+
// 2. For Gen3 machines which dictate a specific number of local ssds, zero
5248+
// (or unset) means to use the default number of local ssds that goes with
5249+
// that machine type. For example, for a c3-standard-8-lssd machine, 2 local
5250+
// ssds would be provisioned. For c3-standard-8 (which doesn't support local
5251+
// ssds), 0 will be provisioned. See
5252+
// https://cloud.google.com/compute/docs/disks/local-ssd#choose_number_local_ssds
5253+
// for more info.
52225254
int32 local_ssd_count = 1;
52235255
}
52245256

52255257
// EphemeralStorageLocalSsdConfig contains configuration for the node ephemeral
5226-
// storage using Local SSD.
5258+
// storage using Local SSDs.
52275259
message EphemeralStorageLocalSsdConfig {
52285260
// Number of local SSDs to use to back ephemeral storage. Uses NVMe
5229-
// interfaces. Each local SSD is 375 GB in size.
5230-
// If zero, it means to disable using local SSDs as ephemeral storage.
5231-
// The limit for this value is dependent upon the maximum number of
5232-
// disks available on a machine per zone. See:
5261+
// interfaces.
5262+
//
5263+
// A zero (or unset) value has different meanings depending on machine type
5264+
// being used:
5265+
// 1. For pre-Gen3 machines, which support flexible numbers of local ssds,
5266+
// zero (or unset) means to disable using local SSDs as ephemeral storage. The
5267+
// limit for this value is dependent upon the maximum number of disk
5268+
// available on a machine per zone. See:
52335269
// https://cloud.google.com/compute/docs/disks/local-ssd
52345270
// for more information.
5271+
// 2. For Gen3 machines which dictate a specific number of local ssds, zero
5272+
// (or unset) means to use the default number of local ssds that goes with
5273+
// that machine type. For example, for a c3-standard-8-lssd machine, 2 local
5274+
// ssds would be provisioned. For c3-standard-8 (which doesn't support local
5275+
// ssds), 0 will be provisioned. See
5276+
// https://cloud.google.com/compute/docs/disks/local-ssd#choose_number_local_ssds
5277+
// for more info.
52355278
int32 local_ssd_count = 1;
52365279
}
5280+
5281+
// A map of resource manager tag keys and values to be attached to the nodes
5282+
// for managing Compute Engine firewalls using Network Firewall Policies.
5283+
// Tags must be according to specifications in
5284+
// https://cloud.google.com/vpc/docs/tags-firewalls-overview#specifications.
5285+
// A maximum of 5 tag key-value pairs can be specified.
5286+
// Existing tags will be replaced with new values.
5287+
message ResourceManagerTags {
5288+
// TagKeyValue must be in one of the following formats ([KEY]=[VALUE])
5289+
// 1. `tagKeys/{tag_key_id}=tagValues/{tag_value_id}`
5290+
// 2. `{org_id}/{tag_key_name}={tag_value_name}`
5291+
// 3. `{project_id}/{tag_key_name}={tag_value_name}`
5292+
map<string, string> tags = 1;
5293+
}
5294+
5295+
// EnterpriseConfig is the cluster enterprise configuration.
5296+
message EnterpriseConfig {
5297+
// Premium tiers for GKE Cluster.
5298+
enum ClusterTier {
5299+
// CLUSTER_TIER_UNSPECIFIED is when cluster_tier is not set.
5300+
CLUSTER_TIER_UNSPECIFIED = 0;
5301+
5302+
// STANDARD indicates a standard GKE cluster.
5303+
STANDARD = 1;
5304+
5305+
// ENTERPRISE indicates a GKE Enterprise cluster.
5306+
ENTERPRISE = 2;
5307+
}
5308+
5309+
// Output only. [Output only] cluster_tier specifies the premium tier of the
5310+
// cluster.
5311+
ClusterTier cluster_tier = 1 [(google.api.field_behavior) = OUTPUT_ONLY];
5312+
}

0 commit comments

Comments
 (0)