fix additional pod networks config creation in GKE node pool (#3134)

* fix additional pod networks config creation

* fix doc

* Replicate change in gke stage

---------

Co-authored-by: Julio Castillo <jccb@google.com>
This commit is contained in:
Jacek Jabłoński
2025-06-05 13:41:51 +02:00
committed by GitHub
parent 77244e9bd1
commit e6ec5de733
5 changed files with 9 additions and 6 deletions

View File

@@ -67,6 +67,7 @@ module "cluster-1-nodepool-1" {
}
# tftest modules=1 resources=2 inventory=create-sa.yaml
```
### Node & node pool configuration
```hcl
@@ -103,6 +104,7 @@ module "cluster-1-nodepool-1" {
}
# tftest modules=1 resources=2 inventory=config.yaml
```
### GPU Node & node pool configuration
```hcl
@@ -137,7 +139,8 @@ module "cluster-1-nodepool-gpu-1" {
# tftest modules=1 resources=2 inventory=guest-accelerator.yaml
```
### Dynamic Workload Scheduler (DWS) & node pool configuration
### Dynamic Workload Scheduler (DWS) & node pool configuration
This example uses Dynamic Workload Scheduler (DWS) to configure a GPU nodepool.
```hcl
@@ -198,7 +201,7 @@ module "cluster-1-nodepool-dws" {
| [labels](variables.tf#L41) | The resource labels to be applied each node (vm). | <code>map&#40;string&#41;</code> | | <code>&#123;&#125;</code> |
| [max_pods_per_node](variables.tf#L53) | Maximum number of pods per node. | <code>number</code> | | <code>null</code> |
| [name](variables.tf#L59) | Optional nodepool name. | <code>string</code> | | <code>null</code> |
| [network_config](variables.tf#L65) | Network configuration. | <code title="object&#40;&#123;&#10; enable_private_nodes &#61; optional&#40;bool&#41;&#10; pod_range &#61; optional&#40;object&#40;&#123;&#10; cidr &#61; optional&#40;string&#41;&#10; create &#61; optional&#40;bool, false&#41;&#10; name &#61; optional&#40;string&#41;&#10; &#125;&#41;, &#123;&#125;&#41;&#10; additional_node_network_configs &#61; optional&#40;list&#40;object&#40;&#123;&#10; network &#61; string&#10; subnetwork &#61; string&#10; &#125;&#41;&#41;, &#91;&#93;&#41;&#10; additional_pod_network_config &#61; optional&#40;list&#40;object&#40;&#123;&#10; subnetwork &#61; string&#10; secondary_pod_range &#61; string&#10; max_pods_per_node &#61; string&#10; &#125;&#41;&#41;, &#91;&#93;&#41;&#10; total_egress_bandwidth_tier &#61; optional&#40;string&#41;&#10; pod_cidr_overprovisioning_disabled &#61; optional&#40;bool, false&#41;&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> | | <code>null</code> |
| [network_config](variables.tf#L65) | Network configuration. | <code title="object&#40;&#123;&#10; enable_private_nodes &#61; optional&#40;bool&#41;&#10; pod_range &#61; optional&#40;object&#40;&#123;&#10; cidr &#61; optional&#40;string&#41;&#10; create &#61; optional&#40;bool, false&#41;&#10; name &#61; optional&#40;string&#41;&#10; &#125;&#41;, &#123;&#125;&#41;&#10; additional_node_network_configs &#61; optional&#40;list&#40;object&#40;&#123;&#10; network &#61; string&#10; subnetwork &#61; string&#10; &#125;&#41;&#41;, &#91;&#93;&#41;&#10; additional_pod_network_configs &#61; optional&#40;list&#40;object&#40;&#123;&#10; subnetwork &#61; string&#10; secondary_pod_range &#61; string&#10; max_pods_per_node &#61; string&#10; &#125;&#41;&#41;, &#91;&#93;&#41;&#10; total_egress_bandwidth_tier &#61; optional&#40;string&#41;&#10; pod_cidr_overprovisioning_disabled &#61; optional&#40;bool, false&#41;&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> | | <code>null</code> |
| [node_config](variables.tf#L89) | Node-level configuration. | <code title="object&#40;&#123;&#10; boot_disk_kms_key &#61; optional&#40;string&#41;&#10; disk_size_gb &#61; optional&#40;number&#41;&#10; disk_type &#61; optional&#40;string, &#34;pd-balanced&#34;&#41;&#10; ephemeral_ssd_count &#61; optional&#40;number&#41;&#10; gcfs &#61; optional&#40;bool, false&#41;&#10; guest_accelerator &#61; optional&#40;object&#40;&#123;&#10; count &#61; number&#10; type &#61; string&#10; gpu_driver &#61; optional&#40;object&#40;&#123;&#10; version &#61; string&#10; partition_size &#61; optional&#40;string&#41;&#10; max_shared_clients_per_gpu &#61; optional&#40;number&#41;&#10; &#125;&#41;&#41;&#10; &#125;&#41;&#41;&#10; local_nvme_ssd_count &#61; optional&#40;number&#41;&#10; gvnic &#61; optional&#40;bool, false&#41;&#10; image_type &#61; optional&#40;string&#41;&#10; kubelet_config &#61; optional&#40;object&#40;&#123;&#10; cpu_manager_policy &#61; string&#10; cpu_cfs_quota &#61; optional&#40;bool&#41;&#10; cpu_cfs_quota_period &#61; optional&#40;string&#41;&#10; pod_pids_limit &#61; optional&#40;number&#41;&#10; &#125;&#41;&#41;&#10; linux_node_config &#61; optional&#40;object&#40;&#123;&#10; sysctls &#61; optional&#40;map&#40;string&#41;&#41;&#10; cgroup_mode &#61; optional&#40;string&#41;&#10; &#125;&#41;&#41;&#10; local_ssd_count &#61; optional&#40;number&#41;&#10; machine_type &#61; optional&#40;string&#41;&#10; metadata &#61; optional&#40;map&#40;string&#41;&#41;&#10; min_cpu_platform &#61; optional&#40;string&#41;&#10; preemptible &#61; optional&#40;bool&#41;&#10; sandbox_config_gvisor &#61; optional&#40;bool&#41;&#10; shielded_instance_config &#61; optional&#40;object&#40;&#123;&#10; enable_integrity_monitoring &#61; optional&#40;bool&#41;&#10; enable_secure_boot &#61; optional&#40;bool&#41;&#10; &#125;&#41;&#41;&#10; spot &#61; optional&#40;bool&#41;&#10; workload_metadata_config_mode &#61; optional&#40;string&#41;&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> | | <code>&#123;&#125;</code> |
| [node_count](variables.tf#L154) | Number of nodes per instance group. Initial value can only be changed by recreation, current is ignored when autoscaling is used. | <code title="object&#40;&#123;&#10; current &#61; optional&#40;number&#41;&#10; initial &#61; number&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> | | <code title="&#123;&#10; initial &#61; 1&#10;&#125;">&#123;&#8230;&#125;</code> |
| [node_locations](variables.tf#L166) | Node locations. | <code>list&#40;string&#41;</code> | | <code>null</code> |

View File

@@ -132,7 +132,7 @@ resource "google_container_node_pool" "nodepool" {
dynamic "additional_pod_network_configs" {
for_each = try(var.network_config.additional_pod_network_configs, [])
content {
subnetwork = additional_pod_network_configs.value.network
subnetwork = additional_pod_network_configs.value.subnetwork
secondary_pod_range = additional_pod_network_configs.value.secondary_pod_range
max_pods_per_node = additional_pod_network_configs.value.max_pods_per_node
}

View File

@@ -75,7 +75,7 @@ variable "network_config" {
network = string
subnetwork = string
})), [])
additional_pod_network_config = optional(list(object({
additional_pod_network_configs = optional(list(object({
subnetwork = string
secondary_pod_range = string
max_pods_per_node = string