Skip to content

container: fix ignore_node_count_changes flattener permadiff #18453

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
c2thorn merged 1 commit into from
Jul 30, 2026
+11 −2
Merged

container: fix ignore_node_count_changes flattener permadiff #18453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions ...third_party/terraform/services/container/resource_container_cluster_internal_test.go.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -664,6 +664,10 @@ func TestUnitFlattenClusterNodePools(t *testing.T) {
Optional: true,
Elem: &schema.Resource{Schema: map[string]*schema.Schema{"create_pod_range": {Type: schema.TypeBool}}},
},
"ignore_node_count_changes": {
Type: schema.TypeBool,
Optional: true,
},
},
},
Optional: true,
Expand Down Expand Up @@ -701,6 +705,7 @@ func TestUnitFlattenClusterNodePools(t *testing.T) {
"managed_instance_group_urls": []string{},
"version": "",
"network_config": []map[string]interface{}{},
"ignore_node_count_changes": false,
},
{
"name": "pool-2",
Expand All @@ -713,6 +718,7 @@ func TestUnitFlattenClusterNodePools(t *testing.T) {
"managed_instance_group_urls": []string{},
"version": "",
"network_config": []map[string]interface{}{},
"ignore_node_count_changes": false,
},
},
expectError: false,
Expand Down
4 changes: 3 additions & 1 deletion mmv1/third_party/terraform/services/container/resource_container_cluster_test.go.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1992,7 +1992,9 @@ func TestAccContainerCluster_regionalWithNodePool(t *testing.T) {
ResourceName: "google_container_cluster.regional",
ImportState: true,
ImportStateVerify: true,
ImportStateVerifyIgnore: []string{"deletion_protection", "ignore_node_count_changes", "node_pool.0.ignore_node_count_changes"},
// Virtual fields like ignore_node_count_changes are not loaded on import. When import runs with default
// false for ignore_node_count_changes, managed_instance_group_urls is populated from the API, causing an import diff.
ImportStateVerifyIgnore: []string{"deletion_protection", "ignore_node_count_changes", "node_pool.0.ignore_node_count_changes", "node_pool.0.managed_instance_group_urls"},
},
},
})
Expand Down
3 changes: 2 additions & 1 deletion mmv1/third_party/terraform/services/container/resource_container_node_pool.go.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1562,7 +1562,8 @@ func flattenNodePool(d *schema.ResourceData, config *transport_tpg.Config, np *c
"instance_group_urls": igmUrls,
"managed_instance_group_urls": managedIgmUrls,
"version": np.Version,
"network_config": flattenNodeNetworkConfig(np.NetworkConfig, d, prefix),
"network_config": flattenNodeNetworkConfig(np.NetworkConfig, d, prefix),
"ignore_node_count_changes": d.Get(prefix + "ignore_node_count_changes"),
}

if np.Autoscaling != nil {
Expand Down