Skip to content

feat: add tpu_topology and policy_name args in placement_policy #2363

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 6, 2025
Merged

feat: add tpu_topology and policy_name args in placement_policy #2363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2429650
feat: add tpu_topology and policy_name args in placement_policy
DrFaust92 Jun 6, 2025
bfd4eaf
Merge branch 'main' into placement-policy-args
apeabody Jun 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,6 +371,8 @@ The node_pools variable takes the following parameters:
| total_min_count | Total minimum number of nodes in the NodePool. Must be >=0 and <= max_count. Should be used when autoscaling is true. Cannot be used with per zone limits. | null | Optional |
| name | The name of the node pool | | Required |
| placement_policy | Placement type to set for nodes in a node pool. Can be set as [COMPACT](https://cloud.google.com/kubernetes-engine/docs/how-to/compact-placement#overview) if desired | | Optional |
| policy_name | If set, refers to the name of a custom resource policy supplied by the user. The resource policy must be in the same project and region as the node pool. | | Optional |
| tpu_topology | TPU placement topology for pod slice node pool. For detail see [documentation](https://cloud.google.com/tpu/docs/types-topologies#tpu_topologies) | | Optional |
| pod_range | The name of the secondary range for pod IPs. | | Optional |
| enable_private_nodes | Whether nodes have internal IP addresses only. | | Optional |
| node_affinity | The node affinty in the format `"{\"key\": \"compute.googleapis.com/node-group-name\", \"operator\": \"IN\", \"values\": [\"node-group-name\"]}"`. | | Optional |
Expand Down
2 changes: 2 additions & 0 deletions autogen/main/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,8 @@ The node_pools variable takes the following parameters:
| total_min_count | Total minimum number of nodes in the NodePool. Must be >=0 and <= max_count. Should be used when autoscaling is true. Cannot be used with per zone limits. | null | Optional |
| name | The name of the node pool | | Required |
| placement_policy | Placement type to set for nodes in a node pool. Can be set as [COMPACT](https://cloud.google.com/kubernetes-engine/docs/how-to/compact-placement#overview) if desired | | Optional |
| policy_name | If set, refers to the name of a custom resource policy supplied by the user. The resource policy must be in the same project and region as the node pool. | | Optional |
| tpu_topology | TPU placement topology for pod slice node pool. For detail see [documentation](https://cloud.google.com/tpu/docs/types-topologies#tpu_topologies) | | Optional |
| pod_range | The name of the secondary range for pod IPs. | | Optional |
{% if not private_cluster %}
| enable_private_nodes | Whether nodes have internal IP addresses only. | | Optional |
Expand Down
6 changes: 5 additions & 1 deletion autogen/main/cluster.tf.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -805,6 +805,8 @@ locals {
"local_ssd_ephemeral_count",
{% endif %}
"placement_policy",
"policy_name",
"tpu_topology",
"max_pods_per_node",
"min_cpu_platform",
"pod_range",
Expand Down Expand Up @@ -932,7 +934,9 @@ resource "google_container_node_pool" "windows_pools" {
dynamic "placement_policy" {
for_each = length(lookup(each.value, "placement_policy", "")) > 0 ? [each.value] : []
content {
type = lookup(placement_policy.value, "placement_policy", null)
type = lookup(placement_policy.value, "placement_policy", null)
policy_name = lookup(placement_policy.value, "policy_name", null)
tpu_topology = lookup(placement_policy.value, "tpu_topology", null)
}
}

Expand Down
8 changes: 6 additions & 2 deletions cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,7 +649,9 @@ resource "google_container_node_pool" "pools" {
dynamic "placement_policy" {
for_each = length(lookup(each.value, "placement_policy", "")) > 0 ? [each.value] : []
content {
type = lookup(placement_policy.value, "placement_policy", null)
type = lookup(placement_policy.value, "placement_policy", null)
policy_name = lookup(placement_policy.value, "policy_name", null)
tpu_topology = lookup(placement_policy.value, "tpu_topology", null)
}
}

Expand Down Expand Up @@ -1001,7 +1003,9 @@ resource "google_container_node_pool" "windows_pools" {
dynamic "placement_policy" {
for_each = length(lookup(each.value, "placement_policy", "")) > 0 ? [each.value] : []
content {
type = lookup(placement_policy.value, "placement_policy", null)
type = lookup(placement_policy.value, "placement_policy", null)
policy_name = lookup(placement_policy.value, "policy_name", null)
tpu_topology = lookup(placement_policy.value, "tpu_topology", null)
}
}

Expand Down
2 changes: 2 additions & 0 deletions modules/beta-private-cluster-update-variant/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,8 @@ The node_pools variable takes the following parameters:
| total_min_count | Total minimum number of nodes in the NodePool. Must be >=0 and <= max_count. Should be used when autoscaling is true. Cannot be used with per zone limits. | null | Optional |
| name | The name of the node pool | | Required |
| placement_policy | Placement type to set for nodes in a node pool. Can be set as [COMPACT](https://cloud.google.com/kubernetes-engine/docs/how-to/compact-placement#overview) if desired | | Optional |
| policy_name | If set, refers to the name of a custom resource policy supplied by the user. The resource policy must be in the same project and region as the node pool. | | Optional |
| tpu_topology | TPU placement topology for pod slice node pool. For detail see [documentation](https://cloud.google.com/tpu/docs/types-topologies#tpu_topologies) | | Optional |
| pod_range | The name of the secondary range for pod IPs. | | Optional |
| node_affinity | The node affinty in the format `"{\"key\": \"compute.googleapis.com/node-group-name\", \"operator\": \"IN\", \"values\": [\"node-group-name\"]}"`. | | Optional |
| node_count | The number of nodes in the nodepool when autoscaling is false. Otherwise defaults to 1. Only valid for non-autoscaling clusters | | Required |
Expand Down
10 changes: 8 additions & 2 deletions modules/beta-private-cluster-update-variant/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -689,6 +689,8 @@ locals {
"local_ssd_count",
"local_ssd_ephemeral_count",
"placement_policy",
"policy_name",
"tpu_topology",
"max_pods_per_node",
"min_cpu_platform",
"pod_range",
Expand Down Expand Up @@ -797,7 +799,9 @@ resource "google_container_node_pool" "pools" {
dynamic "placement_policy" {
for_each = length(lookup(each.value, "placement_policy", "")) > 0 ? [each.value] : []
content {
type = lookup(placement_policy.value, "placement_policy", null)
type = lookup(placement_policy.value, "placement_policy", null)
policy_name = lookup(placement_policy.value, "policy_name", null)
tpu_topology = lookup(placement_policy.value, "tpu_topology", null)
}
}

Expand Down Expand Up @@ -1163,7 +1167,9 @@ resource "google_container_node_pool" "windows_pools" {
dynamic "placement_policy" {
for_each = length(lookup(each.value, "placement_policy", "")) > 0 ? [each.value] : []
content {
type = lookup(placement_policy.value, "placement_policy", null)
type = lookup(placement_policy.value, "placement_policy", null)
policy_name = lookup(placement_policy.value, "policy_name", null)
tpu_topology = lookup(placement_policy.value, "tpu_topology", null)
}
}

Expand Down
2 changes: 2 additions & 0 deletions modules/beta-private-cluster/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,8 @@ The node_pools variable takes the following parameters:
| total_min_count | Total minimum number of nodes in the NodePool. Must be >=0 and <= max_count. Should be used when autoscaling is true. Cannot be used with per zone limits. | null | Optional |
| name | The name of the node pool | | Required |
| placement_policy | Placement type to set for nodes in a node pool. Can be set as [COMPACT](https://cloud.google.com/kubernetes-engine/docs/how-to/compact-placement#overview) if desired | | Optional |
| policy_name | If set, refers to the name of a custom resource policy supplied by the user. The resource policy must be in the same project and region as the node pool. | | Optional |
| tpu_topology | TPU placement topology for pod slice node pool. For detail see [documentation](https://cloud.google.com/tpu/docs/types-topologies#tpu_topologies) | | Optional |
| pod_range | The name of the secondary range for pod IPs. | | Optional |
| node_affinity | The node affinty in the format `"{\"key\": \"compute.googleapis.com/node-group-name\", \"operator\": \"IN\", \"values\": [\"node-group-name\"]}"`. | | Optional |
| node_count | The number of nodes in the nodepool when autoscaling is false. Otherwise defaults to 1. Only valid for non-autoscaling clusters | | Required |
Expand Down
8 changes: 6 additions & 2 deletions modules/beta-private-cluster/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -717,7 +717,9 @@ resource "google_container_node_pool" "pools" {
dynamic "placement_policy" {
for_each = length(lookup(each.value, "placement_policy", "")) > 0 ? [each.value] : []
content {
type = lookup(placement_policy.value, "placement_policy", null)
type = lookup(placement_policy.value, "placement_policy", null)
policy_name = lookup(placement_policy.value, "policy_name", null)
tpu_topology = lookup(placement_policy.value, "tpu_topology", null)
}
}

Expand Down Expand Up @@ -1082,7 +1084,9 @@ resource "google_container_node_pool" "windows_pools" {
dynamic "placement_policy" {
for_each = length(lookup(each.value, "placement_policy", "")) > 0 ? [each.value] : []
content {
type = lookup(placement_policy.value, "placement_policy", null)
type = lookup(placement_policy.value, "placement_policy", null)
policy_name = lookup(placement_policy.value, "policy_name", null)
tpu_topology = lookup(placement_policy.value, "tpu_topology", null)
}
}

Expand Down
2 changes: 2 additions & 0 deletions modules/beta-public-cluster-update-variant/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,6 +411,8 @@ The node_pools variable takes the following parameters:
| total_min_count | Total minimum number of nodes in the NodePool. Must be >=0 and <= max_count. Should be used when autoscaling is true. Cannot be used with per zone limits. | null | Optional |
| name | The name of the node pool | | Required |
| placement_policy | Placement type to set for nodes in a node pool. Can be set as [COMPACT](https://cloud.google.com/kubernetes-engine/docs/how-to/compact-placement#overview) if desired | | Optional |
| policy_name | If set, refers to the name of a custom resource policy supplied by the user. The resource policy must be in the same project and region as the node pool. | | Optional |
| tpu_topology | TPU placement topology for pod slice node pool. For detail see [documentation](https://cloud.google.com/tpu/docs/types-topologies#tpu_topologies) | | Optional |
| pod_range | The name of the secondary range for pod IPs. | | Optional |
| enable_private_nodes | Whether nodes have internal IP addresses only. | | Optional |
| node_affinity | The node affinty in the format `"{\"key\": \"compute.googleapis.com/node-group-name\", \"operator\": \"IN\", \"values\": [\"node-group-name\"]}"`. | | Optional |
Expand Down
10 changes: 8 additions & 2 deletions modules/beta-public-cluster-update-variant/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,6 +667,8 @@ locals {
"local_ssd_count",
"local_ssd_ephemeral_count",
"placement_policy",
"policy_name",
"tpu_topology",
"max_pods_per_node",
"min_cpu_platform",
"pod_range",
Expand Down Expand Up @@ -775,7 +777,9 @@ resource "google_container_node_pool" "pools" {
dynamic "placement_policy" {
for_each = length(lookup(each.value, "placement_policy", "")) > 0 ? [each.value] : []
content {
type = lookup(placement_policy.value, "placement_policy", null)
type = lookup(placement_policy.value, "placement_policy", null)
policy_name = lookup(placement_policy.value, "policy_name", null)
tpu_topology = lookup(placement_policy.value, "tpu_topology", null)
}
}

Expand Down Expand Up @@ -1141,7 +1145,9 @@ resource "google_container_node_pool" "windows_pools" {
dynamic "placement_policy" {
for_each = length(lookup(each.value, "placement_policy", "")) > 0 ? [each.value] : []
content {
type = lookup(placement_policy.value, "placement_policy", null)
type = lookup(placement_policy.value, "placement_policy", null)
policy_name = lookup(placement_policy.value, "policy_name", null)
tpu_topology = lookup(placement_policy.value, "tpu_topology", null)
}
}

Expand Down
2 changes: 2 additions & 0 deletions modules/beta-public-cluster/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,8 @@ The node_pools variable takes the following parameters:
| total_min_count | Total minimum number of nodes in the NodePool. Must be >=0 and <= max_count. Should be used when autoscaling is true. Cannot be used with per zone limits. | null | Optional |
| name | The name of the node pool | | Required |
| placement_policy | Placement type to set for nodes in a node pool. Can be set as [COMPACT](https://cloud.google.com/kubernetes-engine/docs/how-to/compact-placement#overview) if desired | | Optional |
| policy_name | If set, refers to the name of a custom resource policy supplied by the user. The resource policy must be in the same project and region as the node pool. | | Optional |
| tpu_topology | TPU placement topology for pod slice node pool. For detail see [documentation](https://cloud.google.com/tpu/docs/types-topologies#tpu_topologies) | | Optional |
| pod_range | The name of the secondary range for pod IPs. | | Optional |
| enable_private_nodes | Whether nodes have internal IP addresses only. | | Optional |
| node_affinity | The node affinty in the format `"{\"key\": \"compute.googleapis.com/node-group-name\", \"operator\": \"IN\", \"values\": [\"node-group-name\"]}"`. | | Optional |
Expand Down
8 changes: 6 additions & 2 deletions modules/beta-public-cluster/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -695,7 +695,9 @@ resource "google_container_node_pool" "pools" {
dynamic "placement_policy" {
for_each = length(lookup(each.value, "placement_policy", "")) > 0 ? [each.value] : []
content {
type = lookup(placement_policy.value, "placement_policy", null)
type = lookup(placement_policy.value, "placement_policy", null)
policy_name = lookup(placement_policy.value, "policy_name", null)
tpu_topology = lookup(placement_policy.value, "tpu_topology", null)
}
}

Expand Down Expand Up @@ -1060,7 +1062,9 @@ resource "google_container_node_pool" "windows_pools" {
dynamic "placement_policy" {
for_each = length(lookup(each.value, "placement_policy", "")) > 0 ? [each.value] : []
content {
type = lookup(placement_policy.value, "placement_policy", null)
type = lookup(placement_policy.value, "placement_policy", null)
policy_name = lookup(placement_policy.value, "policy_name", null)
tpu_topology = lookup(placement_policy.value, "tpu_topology", null)
}
}

Expand Down
2 changes: 2 additions & 0 deletions modules/private-cluster-update-variant/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,6 +407,8 @@ The node_pools variable takes the following parameters:
| total_min_count | Total minimum number of nodes in the NodePool. Must be >=0 and <= max_count. Should be used when autoscaling is true. Cannot be used with per zone limits. | null | Optional |
| name | The name of the node pool | | Required |
| placement_policy | Placement type to set for nodes in a node pool. Can be set as [COMPACT](https://cloud.google.com/kubernetes-engine/docs/how-to/compact-placement#overview) if desired | | Optional |
| policy_name | If set, refers to the name of a custom resource policy supplied by the user. The resource policy must be in the same project and region as the node pool. | | Optional |
| tpu_topology | TPU placement topology for pod slice node pool. For detail see [documentation](https://cloud.google.com/tpu/docs/types-topologies#tpu_topologies) | | Optional |
| pod_range | The name of the secondary range for pod IPs. | | Optional |
| node_affinity | The node affinty in the format `"{\"key\": \"compute.googleapis.com/node-group-name\", \"operator\": \"IN\", \"values\": [\"node-group-name\"]}"`. | | Optional |
| node_count | The number of nodes in the nodepool when autoscaling is false. Otherwise defaults to 1. Only valid for non-autoscaling clusters | | Required |
Expand Down
10 changes: 8 additions & 2 deletions modules/private-cluster-update-variant/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -642,6 +642,8 @@ locals {
"enable_integrity_monitoring",
"local_ssd_count",
"placement_policy",
"policy_name",
"tpu_topology",
"max_pods_per_node",
"min_cpu_platform",
"pod_range",
Expand Down Expand Up @@ -750,7 +752,9 @@ resource "google_container_node_pool" "pools" {
dynamic "placement_policy" {
for_each = length(lookup(each.value, "placement_policy", "")) > 0 ? [each.value] : []
content {
type = lookup(placement_policy.value, "placement_policy", null)
type = lookup(placement_policy.value, "placement_policy", null)
policy_name = lookup(placement_policy.value, "policy_name", null)
tpu_topology = lookup(placement_policy.value, "tpu_topology", null)
}
}

Expand Down Expand Up @@ -1103,7 +1107,9 @@ resource "google_container_node_pool" "windows_pools" {
dynamic "placement_policy" {
for_each = length(lookup(each.value, "placement_policy", "")) > 0 ? [each.value] : []
content {
type = lookup(placement_policy.value, "placement_policy", null)
type = lookup(placement_policy.value, "placement_policy", null)
policy_name = lookup(placement_policy.value, "policy_name", null)
tpu_topology = lookup(placement_policy.value, "tpu_topology", null)
}
}

Expand Down
2 changes: 2 additions & 0 deletions modules/private-cluster/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,8 @@ The node_pools variable takes the following parameters:
| total_min_count | Total minimum number of nodes in the NodePool. Must be >=0 and <= max_count. Should be used when autoscaling is true. Cannot be used with per zone limits. | null | Optional |
| name | The name of the node pool | | Required |
| placement_policy | Placement type to set for nodes in a node pool. Can be set as [COMPACT](https://cloud.google.com/kubernetes-engine/docs/how-to/compact-placement#overview) if desired | | Optional |
| policy_name | If set, refers to the name of a custom resource policy supplied by the user. The resource policy must be in the same project and region as the node pool. | | Optional |
| tpu_topology | TPU placement topology for pod slice node pool. For detail see [documentation](https://cloud.google.com/tpu/docs/types-topologies#tpu_topologies) | | Optional |
| pod_range | The name of the secondary range for pod IPs. | | Optional |
| node_affinity | The node affinty in the format `"{\"key\": \"compute.googleapis.com/node-group-name\", \"operator\": \"IN\", \"values\": [\"node-group-name\"]}"`. | | Optional |
| node_count | The number of nodes in the nodepool when autoscaling is false. Otherwise defaults to 1. Only valid for non-autoscaling clusters | | Required |
Expand Down
8 changes: 6 additions & 2 deletions modules/private-cluster/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -671,7 +671,9 @@ resource "google_container_node_pool" "pools" {
dynamic "placement_policy" {
for_each = length(lookup(each.value, "placement_policy", "")) > 0 ? [each.value] : []
content {
type = lookup(placement_policy.value, "placement_policy", null)
type = lookup(placement_policy.value, "placement_policy", null)
policy_name = lookup(placement_policy.value, "policy_name", null)
tpu_topology = lookup(placement_policy.value, "tpu_topology", null)
}
}

Expand Down Expand Up @@ -1023,7 +1025,9 @@ resource "google_container_node_pool" "windows_pools" {
dynamic "placement_policy" {
for_each = length(lookup(each.value, "placement_policy", "")) > 0 ? [each.value] : []
content {
type = lookup(placement_policy.value, "placement_policy", null)
type = lookup(placement_policy.value, "placement_policy", null)
policy_name = lookup(placement_policy.value, "policy_name", null)
tpu_topology = lookup(placement_policy.value, "tpu_topology", null)
}
}

Expand Down