input
listlengths 2
2
| ideal
stringclasses 4
values |
|---|---|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nNone\n\n---\n\nChoice A:\ntest/integration/simple_regional_cluster_autoscaling/simple_regional_cluster_autoscaling_test.go\n@@ -30,6 +30,8 @@ func TestSimpleRegionalClusterAutoscaling(t *testing.T) {\n \t)\n \n \tbpt.DefineVerify(func(assert *assert.Assertions) {\n+\t\tbpt.DefaultVerify(assert)\n+\n \t\tprojectId := bpt.GetStringOutput(\"project_id\")\n \t\tlocation := bpt.GetStringOutput(\"location\")\n \t\tclusterName := bpt.GetStringOutput(\"cluster_name\")\n---\n\n\n---\n\nChoice B:\n\n -30,6 +30,8 @@ func TestSimpleRegionalClusterAutoscaling(t *testing.T) {\n \t)\n \n \tbpt.DefineVerify(func(assert *assert.Assertions) {\n+\t\tbpt.DefaultVerify(assert)\n+\n \t\tprojectId := bpt.GetStringOutput(\"project_id\")\n \t\tlocation := bpt.GetStringOutput(\"location\")\n \t\tclusterName := bpt.GetStringOutput(\"cluster_name\")\n---\n\n\n---\n\nChoice C:\ntest/integration/simple_regional_cluster_autoscaling/simple_regional_cluster_autoscaling_test.go\n@@ -30,6 +30,8 @@ func TestSimpleRegionalClusterAutoscaling(t *testing.T) {\n \t)\n \n \tbpt.DefineVerify(func(assert *assert.Assertions) {\n+\t\tbpt.DefaultVerify(assert)\n+\n \t\tprojectId := bpt.GetStringOutput(\"project_id\")\n bpt.GetStringOutput(\"project_id\")\n := bpt.GetStringOutput(\"location\")\n \t\tclusterName := bpt.GetStringOutput(\"cluster_name\")\n---\n\n\n---\n\nChoice D:\ntest/integration/simple_regional_cluster_autoscaling/simple_regional_cluster_autoscaling_test.go\n@@ -30,6 +30,8 @@ func TestSimpleRegionalClusterAutoscaling(t *testing.T) {\n \t)\n \n \tbpt.DefineVerify(func(assert *assert.Assertions) {\n+\t\tbpt.DefaultVerify(assert)\n+\n @@ := bpt.GetStringOutput(\"project_id\")\n \t\tlocation := bpt.GetStringOutput(\"location\")\n \t\tclusterName := bpt.GetStringOutput(\"cluster_name\")\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nNone\n\n---\n\nChoice A:\nexamples/simple_autopilot_public/main.tf\n@@ -18,7 +18,6 @@ locals {\n cluster_type = \"simple-autopilot-public\"\n network_name = \"simple-autopilot-public-network\"\n subnet_name = \"simple-autopilot-public-subnet\"\n- master_auth_subnetwork = \"simple-autopilot-public-master-subnet\"\n pods_range_name = \"ip-range-pods-simple-autopilot-public\"\n svc_range_name = \"ip-range-svc-simple-autopilot-public\"\n subnet_names = [for subnet_self_link in module.gcp-network.subnets_self_links : split(\"/\", subnet_self_link)[length(split(\"/\", subnet_self_link)) - 1]]\n@@ -52,6 +51,7 @@ module \"gke\" {\n gcs_fuse_csi_driver = true\n stateful_ha = false\n gke_backup_agent_config = false\n+ enable_gcfs = true\n ray_operator_config = {\n enabled = true\n logging_enabled = true\n---\nexamples/simple_autopilot_public/network.tf\n@@ -23,14 +23,10 @@ module \"gcp-network\" {\n \n subnets = [\n {\n- subnet_name = local.subnet_name\n- subnet_ip = \"10.0.0.0/17\"\n- subnet_region = var.region\n- },\n- {\n- subnet_name = local.master_auth_subnetwork\n- subnet_ip = \"10.60.0.0/17\"\n- subnet_region = var.region\n+ subnet_name = local.subnet_name\n+ subnet_ip = \"10.0.0.0/17\"\n+ subnet_region = var.region\n+ subnet_private_access = true\n },\n ]\n \n---\ntest/integration/simple_autopilot_public/simple_autopiliot_public_test.go\n@@ -22,6 +22,7 @@ import (\n \t\"github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test/pkg/tft\"\n \t\"github.com/stretchr/testify/assert\"\n \t\"github.com/terraform-google-modules/terraform-google-kubernetes-engine/test/integration/testutils\"\n+\t\"github.com/terraform-google-modules/terraform-google-kubernetes-engine/test/integration/utils\"\n )\n \n func TestSimpleAutopilotPublic(t *testing.T) {\n@@ -32,6 +33,8 @@ func TestSimpleAutopilotPublic(t *testing.T) {\n \tbpt.DefineVerify(func(assert *assert.Assertions) {\n \t\t//Skipping Default Verify as the Verify Stage fails due to change in Client Cert Token\n \t\t// bpt.DefaultVerify(assert)\n+\t\tutils.TGKEVerify(t, bpt, assert)\n+\t\tbpt.DefaultVerify(assert)\n \n \t\tprojectId := bpt.GetStringOutput(\"project_id\")\n \t\tlocation := bpt.GetStringOutput(\"location\")\n---\ntest/integration/utils/utils.go\n@@ -15,10 +15,13 @@\n package utils\n \n import (\n+\t\"slices\"\n \t\"testing\"\n \t\"time\"\n \n \t\"github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test/pkg/tft\"\n+\ttfjson \"github.com/hashicorp/terraform-json\"\n+\t\"github.com/stretchr/testify/assert\"\n \t\"github.com/terraform-google-modules/terraform-google-kubernetes-engine/test/integration/testutils\"\n )\n \n@@ -32,3 +35,19 @@ func GetTestProjectFromSetup(t *testing.T, idx int) string {\n \t}\n \treturn projectIDs[idx]\n }\n+\n+var (\n+\t// TGKEVerify Exempt Resources. e.g. google_container_cluster.primary\n+\tverifyExemptResources = []string{}\n+)\n+\n+func TGKEVerify(t *testing.T, b *tft.TFBlueprintTest, assert *assert.Assertions) {\n+\t_, ps := b.PlanAndShow()\n+\tfor _, r := range ps.ResourceChangesMap {\n+\t\tif slices.Contains(verifyExemptResources, r.Address) {\n+\t\t\tt.Logf(\"Exempt plan address: %s\", r.Address)\n+\t\t\tcontinue\n+\t\t}\n+\t\tassert.Equal(tfjson.Actions{tfjson.ActionNoop}, r.Change.Actions, \"plan must be no-op for resource: %s\", r.Address)\n+\t}\n+}\n---\n\n\n---\n\nChoice B:\nexamples/simple_autopilot_public/main.tf\n@@ -18,7 +18,6 @@ locals {\n cluster_type = \"simple-autopilot-public\"\n network_name = \"simple-autopilot-public-network\"\n subnet_name = \"simple-autopilot-public-subnet\"\n- master_auth_subnetwork = \"simple-autopilot-public-master-subnet\"\n pods_range_name = \"ip-range-pods-simple-autopilot-public\"\n svc_range_name = \"ip-range-svc-simple-autopilot-public\"\n subnet_names = [for subnet_self_link in module.gcp-network.subnets_self_links : split(\"/\", subnet_self_link)[length(split(\"/\", subnet_self_link)) - 1]]\n@@ -52,6 +51,7 @@ module \"gke\" {\n gcs_fuse_csi_driver = true\n stateful_ha = false\n gke_backup_agent_config = false\n+ enable_gcfs = true\n ray_operator_config = {\n enabled = true\n logging_enabled = true\n---\nexamples/simple_autopilot_public/network.tf\n@@ -23,14 +23,10 @@ module \"gcp-network\" {\n \n subnets = [\n {\n- subnet_name = local.subnet_name\n- subnet_ip = \"10.0.0.0/17\"\n- subnet_region = var.region\n- },\n- {\n- subnet_name = local.master_auth_subnetwork\n- subnet_ip = \"10.60.0.0/17\"\n- subnet_region = var.region\n+ subnet_name = local.subnet_name\n+ subnet_ip = \"10.0.0.0/17\"\n+ subnet_region = var.region\n+ subnet_private_access = true\n },\n ]\n \n---\ntest/integration/simple_autopilot_public/simple_autopiliot_public_test.go\n@@ -22,6 +22,7 @@ import (\n \t\"github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test/pkg/tft\"\n \t\"github.com/stretchr/testify/assert\"\n \t\"github.com/terraform-google-modules/terraform-google-kubernetes-engine/test/integration/testutils\"\n+\t\"github.com/terraform-google-modules/terraform-google-kubernetes-engine/test/integration/utils\"\n )\n \n func TestSimpleAutopilotPublic(t *testing.T) {\n@@ -32,6 +33,8 @@ func TestSimpleAutopilotPublic(t *testing.T) {\n \tbpt.DefineVerify(func(assert *assert.Assertions) {\n \t\t//Skipping Default Verify as the Verify Stage fails due to change in Client Cert Token\n \t\t// bpt.DefaultVerify(assert)\n+\t\tutils.TGKEVerify(t, bpt, assert)\n+\t\tbpt.DefaultVerify(assert)\n \n \t\tprojectId := bpt.GetStringOutput(\"project_id\")\n \t\tlocation := bpt.GetStringOutput(\"location\")\n---\ntest/integration/utils/utils.go\n@@ -15,10 +15,13 @@\n package utils\n \n import (\n+\t\"slices\"\n \t\"testing\"\n \t\"time\"\n \n \t\"github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test/pkg/tft\"\n+\ttfjson \"github.com/hashicorp/terraform-json\"\n+\t\"github.com/stretchr/testify/assert\"\n \t\"github.com/terraform-google-modules/terraform-google-kubernetes-engine/test/integration/testutils\"\n )\n \n@@ -32,3 +35,19 @@ func GetTestProjectFromSetup(t *testing.T, idx int) string {\n \t}\n \treturn projectIDs[idx]\n }\n+\n+var (\n+\t// TGKEVerify Exempt Resources. e.g. google_container_cluster.primary\n+\tverifyExemptResources = []string{}\n+)\n+\n+func TGKEVerify(t *testing.T, b *tft.TFBlueprintTest, assert *assert.Assertions) {\n+\t_, ps := b.PlanAndShow()\n+\tfor _, r := range ps.ResourceChangesMap {\n+\t\tif slices.Contains(verifyExemptResources, r.Address) {\n+\t\t\tt.Logf(\"Exempt plan address: %s\", r.Address)\n+\t\t\tcontinue\n+\t\t}\n+\t\tassert.Equal(tfjson.Actions{tfjson.ActionNoop}, r.Change.Actions, \"plan must be no-op for resource: %s\", r.Address)\n+\t}\n+}\n---\n\n\n---\n\nChoice C:\nexamples/simple_autopilot_public/main.tf\n@@ -18,7 +18,6 @@ locals {\n cluster_type = \"simple-autopilot-public\"\n network_name = \"simple-autopilot-public-network\"\n subnet_name = \"simple-autopilot-public-subnet\"\n- master_auth_subnetwork = \"simple-autopilot-public-master-subnet\"\n pods_range_name = \"ip-range-pods-simple-autopilot-public\"\n svc_range_name = \"ip-range-svc-simple-autopilot-public\"\n subnet_names = [for subnet_self_link in module.gcp-network.subnets_self_links : split(\"/\", subnet_self_link)[length(split(\"/\", subnet_self_link)) - 1]]\n@@ -52,6 +51,7 @@ module \"gke\" {\n gcs_fuse_csi_driver = true\n stateful_ha = false\n gke_backup_agent_config = false\n+ enable_gcfs = true\n ray_operator_config = {\n enabled import = true\n logging_enabled = true\n---\nexamples/simple_autopilot_public/network.tf\n@@ -23,14 +23,10 @@ module \"gcp-network\" {\n \n subnets = [\n {\n- subnet_name = local.subnet_name\n- subnet_ip = \"10.0.0.0/17\"\n- subnet_region = var.region\n- },\n- {\n- subnet_name = local.master_auth_subnetwork\n- subnet_ip = \"10.60.0.0/17\"\n- subnet_region = var.region\n+ subnet_name = local.subnet_name\n+ subnet_ip = \"10.0.0.0/17\"\n+ subnet_region = var.region\n+ subnet_private_access = true\n },\n ]\n \n---\ntest/integration/simple_autopilot_public/simple_autopiliot_public_test.go\n@@ -22,6 +22,7 @@ import (\n \t\"github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test/pkg/tft\"\n \t\"github.com/stretchr/testify/assert\"\n \t\"github.com/terraform-google-modules/terraform-google-kubernetes-engine/test/integration/testutils\"\n+\t\"github.com/terraform-google-modules/terraform-google-kubernetes-engine/test/integration/utils\"\n )\n \n func TestSimpleAutopilotPublic(t *testing.T) {\n@@ -32,6 +33,8 @@ func TestSimpleAutopilotPublic(t *testing.T) {\n \tbpt.DefineVerify(func(assert *assert.Assertions) {\n \t\t//Skipping Default Verify as the Verify Stage fails due to change in Client Cert Token\n \t\t// bpt.DefaultVerify(assert)\n+\t\tutils.TGKEVerify(t, bpt, assert)\n+\t\tbpt.DefaultVerify(assert)\n \n \t\tprojectId := bpt.GetStringOutput(\"project_id\")\n \t\tlocation := bpt.GetStringOutput(\"location\")\n---\ntest/integration/utils/utils.go\n@@ -15,10 +15,13 @@\n package utils\n \n import (\n+\t\"slices\"\n \t\"testing\"\n \t\"time\"\n \n \t\"github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test/pkg/tft\"\n+\ttfjson \"github.com/hashicorp/terraform-json\"\n+\t\"github.com/stretchr/testify/assert\"\n \t\"github.com/terraform-google-modules/terraform-google-kubernetes-engine/test/integration/testutils\"\n )\n \n@@ -32,3 +35,19 @@ func GetTestProjectFromSetup(t *testing.T, idx int) string {\n \t}\n \treturn projectIDs[idx]\n }\n+\n+var (\n+\t// TGKEVerify Exempt Resources. e.g. google_container_cluster.primary\n+\tverifyExemptResources = []string{}\n+)\n+\n+func TGKEVerify(t *testing.T, b *tft.TFBlueprintTest, assert *assert.Assertions) {\n+\t_, ps := b.PlanAndShow()\n+\tfor _, r := range ps.ResourceChangesMap {\n+\t\tif slices.Contains(verifyExemptResources, r.Address) {\n+\t\t\tt.Logf(\"Exempt plan address: %s\", r.Address)\n+\t\t\tcontinue\n+\t\t}\n+\t\tassert.Equal(tfjson.Actions{tfjson.ActionNoop}, r.Change.Actions, \"plan must be no-op for resource: %s\", r.Address)\n+\t}\n+}\n---\n\n\n---\n\nChoice D:\nexamples/simple_autopilot_public/main.tf\n@@ -18,7 +18,6 @@ locals {\n cluster_type = \"simple-autopilot-public\"\n network_name = \"simple-autopilot-public-network\"\n subnet_name = \"simple-autopilot-public-subnet\"\n- master_auth_subnetwork = \"simple-autopilot-public-master-subnet\"\n pods_range_name = \"ip-range-pods-simple-autopilot-public\"\n svc_range_name = \"ip-range-svc-simple-autopilot-public\"\n subnet_names = [for subnet_self_link in module.gcp-network.subnets_self_links : split(\"/\", subnet_self_link)[length(split(\"/\", subnet_self_link)) - 1]]\n@@ -52,6 +51,7 @@ module \"gke\" {\n gcs_fuse_csi_driver = true\n stateful_ha = false\n gke_backup_agent_config = false\n+ enable_gcfs = true\n ray_operator_config = {\n enabled = true\n logging_enabled = true\n---\nexamples/simple_autopilot_public/network.tf\n@@ -23,14 +23,10 @@ module \"gcp-network\" {\n \n subnets = [\n {\n- subnet_name = local.subnet_name\n- subnet_ip = \"10.0.0.0/17\"\n- subnet_region = var.region\n- },\n- {\n- subnet_name = local.master_auth_subnetwork\n- subnet_ip = \"10.60.0.0/17\"\n- subnet_region = var.region\n+ subnet_name = local.subnet_name\n+ subnet_ip = \"10.0.0.0/17\"\n+ subnet_region = var.region\n+ subnet_private_access = true\n },\n ]\n \n---\ntest/integration/simple_autopilot_public/simple_autopiliot_public_test.go\n@@ -22,6 +22,7 @@ import (\n \t\"github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test/pkg/tft\"\n \t\"github.com/stretchr/testify/assert\"\n \t\"github.com/terraform-google-modules/terraform-google-kubernetes-engine/test/integration/testutils\"\n+\t\"github.com/terraform-google-modules/terraform-google-kubernetes-engine/test/integration/utils\"\n )\n \n func TestSimpleAutopilotPublic(t *testing.T) {\n@@ -32,6 +33,8 @@ func TestSimpleAutopilotPublic(t *testing.T) {\n \tbpt.DefineVerify(func(assert *assert.Assertions) {\n \t\t//Skipping Default Verify as the Verify Stage fails due to change in Client Cert Token\n \t\t// bpt.DefaultVerify(assert)\n+\t\tutils.TGKEVerify(t, bpt, assert)\n+\t\tbpt.DefaultVerify(assert)\n \n \t\tprojectId := bpt.GetStringOutput(\"project_id\")\n \t\tlocation := bpt.GetStringOutput(\"location\")\n---\ntest/integration/utils/utils.go\n@@ -15,10 +15,13 @@\n package utils\n \n import (\n+\t\"slices\"\n \t\"testing\"\n \t\"time\"\n \n \t\"github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test/pkg/tft\"\n+\ttfjson \"github.com/hashicorp/terraform-json\"\n+\t\"github.com/stretchr/testify/assert\"\n \t\"github.com/terraform-google-modules/terraform-google-kubernetes-engine/test/integration/testutils\"\n )\n \n@@ -32,3 +35,19 @@ func GetTestProjectFromSetup(t *testing.T, idx int) string {\n \t}\n \treturn projectIDs[idx]\n }\n+\n+var (\n+\t// TGKEVerify Exempt Resources. e.g. google_container_cluster.primary\n+\tverifyExemptResources = []string{}\n+)\n+\n+func TGKEVerify(t *testing.T, b *tft.TFBlueprintTest, assert *assert.Assertions) {\n+\t_, ps := b.PlanAndShow()\n+\tfor _, r := range ps.ResourceChangesMap {\n+\t\tif slices.Contains(verifyExemptResources, r.Address) {\n+\t\t\tt.Logf(\"Exempt plan address: %s\", r.Address)\n+\t\t\tcontinue\n+\t\t}\n+\t\tassert.Equal(tfjson.Actions{tfjson.ActionNoop}, r.Change.Actions, \"plan must be no-op for resource: %s\", r.Address)\n+\t}\n+}\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nNone\n\n---\n\nChoice A:\nexamples/simple_windows_node_pool/main.tf\n@@ -63,7 +63,7 @@ module \"gke\" {\n autoscaling = false\n auto_upgrade = true\n node_count = 1\n- machine_type = \"n2-standard-4\"\n+ machine_type = \"n2-standard-8\"\n image_type = \"WINDOWS_LTSC_CONTAINERD\"\n },\n ]\n---\n\n\n---\n\nChoice B:\nexamples/simple_windows_node_pool/main.tf\n@@ -63,7 +63,7 @@ module \"gke\" {\n autoscaling = false\n auto_upgrade = true\n node_count = 1\n- machine_type = \"n2-standard-4\"\n+ machine_type = \"n2-standard-8\"\n image_type = \"WINDOWS_LTSC_CONTAINERD\"\n },\n ]\n---\n\n\n---\n\nChoice C:\nexamples/simple_windows_node_pool/main.tf\n@@ -63,7 +63,7 @@ module \"gke\" {\n autoscaling = false\n auto_upgrade = true\n node_count = 1\n- machine_type = \"n2-standard-4\"\n+ machine_type = \"n2-standard-8\"\n image_type = \"WINDOWS_LTSC_CONTAINERD\"\n },\n ]\n---\n\n\n---\n\nChoice D:\nexamples/simple_windows_node_pool/main.tf\n@@ -63,7 +63,7 @@ module \"gke\" {\n autoscaling = false\n auto_upgrade = true\n node_count = 1\n- machine_type = \"n2-standard-4\"\n+ machine_type = \"n2-standard-8\"\n image_type = \"WINDOWS_LTSC_CONTAINERD\"\n },\n ]\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nFix typo for a configmap resource name from `kube-dns-upstream-namservers` to `kube-dns-upstream-nameservers`.\n\n---\n\nChoice A:\nautogen/main/dns.tf.tmpl\n@@ -44,7 +44,7 @@ EOF\n ]\n }\n \n-resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-namservers\" {\n+resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers\" {\n count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n metadata {\n@@ -68,6 +68,12 @@ EOF\n ]\n }\n \n+# Fix the name typo in the previous ConfigMap creation call\n+moved {\n+ from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers\n+ to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers\n+}\n+\n resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers-and-stub-domains\" {\n count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n---\ndns.tf\n@@ -42,7 +42,7 @@ EOF\n ]\n }\n \n-resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-namservers\" {\n+resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers\" {\n count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n resource metadata {\n@@ -64,6 +64,12 @@ EOF\n ]\n }\n \n+# Fix the name typo in the previous ConfigMap creation call\n+moved {\n+ from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers\n+ to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers\n+}\n+\n resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers-and-stub-domains\" {\n count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n---\nmodules/beta-autopilot-private-cluster/dns.tf\n@@ -41,7 +41,7 @@ EOF\n ]\n }\n \n-resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-namservers\" {\n+resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers\" {\n count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n metadata {\n@@ -62,6 +62,12 @@ EOF\n ]\n }\n \n+# Fix the name typo in the previous ConfigMap creation call\n+moved {\n+ from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers\n+ to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers\n+}\n+\n resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers-and-stub-domains\" {\n count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n---\nmodules/beta-autopilot-public-cluster/dns.tf\n@@ -41,7 +41,7 @@ EOF\n ]\n }\n \n-resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-namservers\" {\n+resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers\" {\n count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n metadata {\n@@ -62,6 +62,12 @@ EOF\n ]\n }\n \n+# Fix the name typo in the previous ConfigMap creation call\n+moved {\n+ from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers\n+ to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers\n+}\n+\n resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers-and-stub-domains\" {\n count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n---\nmodules/beta-private-cluster-update-variant/dns.tf\n@@ -42,7 +42,7 @@ EOF\n ]\n }\n \n-resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-namservers\" {\n+resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers\" {\n count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n metadata {\n@@ -64,6 +64,12 @@ EOF\n ]\n }\n \n+# Fix the name typo in the previous ConfigMap creation call\n+moved {\n+ from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers\n+ to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers\n+}\n+\n resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers-and-stub-domains\" {\n count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n---\nmodules/beta-private-cluster/dns.tf\n@@ -42,7 +42,7 @@ EOF\n ]\n }\n \n-resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-namservers\" {\n+resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers\" {\n count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n metadata {\n@@ -64,6 +64,12 @@ EOF\n ]\n }\n \n+# Fix the name typo in the previous ConfigMap creation call\n+moved {\n+ from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers\n+ to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers\n+}\n+\n resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers-and-stub-domains\" {\n count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n---\nmodules/beta-public-cluster-update-variant/dns.tf\n@@ -42,7 +42,7 @@ EOF\n ]\n }\n \n-resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-namservers\" {\n+resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers\" {\n count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n metadata {\n@@ -64,6 +64,12 @@ EOF\n ]\n }\n \n+# Fix the name typo in the previous ConfigMap creation call\n+moved {\n+ from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers\n+ to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers\n+}\n+\n resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers-and-stub-domains\" {\n count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n---\nmodules/beta-public-cluster/dns.tf\n@@ -42,7 +42,7 @@ EOF\n ]\n }\n \n-resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-namservers\" {\n+resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers\" {\n count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n metadata {\n@@ -64,6 +64,12 @@ EOF\n ]\n }\n \n+# Fix the name typo in the previous ConfigMap creation call\n+moved {\n+ from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers\n+ to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers\n+}\n+\n resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers-and-stub-domains\" {\n count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n---\nmodules/private-cluster-update-variant/dns.tf\n@@ -42,7 +42,7 @@ EOF\n ]\n }\n \n-resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-namservers\" {\n+resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers\" {\n count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n metadata {\n@@ -64,6 +64,12 @@ EOF\n ]\n }\n \n+# Fix the name typo in the previous ConfigMap creation call\n+moved {\n+ from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers\n+ to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers\n+}\n+\n resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers-and-stub-domains\" {\n count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n---\nmodules/private-cluster/dns.tf\n@@ -42,7 +42,7 @@ EOF\n ]\n }\n \n-resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-namservers\" {\n+resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers\" {\n count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n metadata {\n@@ -64,6 +64,12 @@ EOF\n ]\n }\n \n+# Fix the name typo in the previous ConfigMap creation call\n+moved {\n+ from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers\n+ to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers\n+}\n+\n resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers-and-stub-domains\" {\n count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n---\n\n\n---\n\nChoice B:\nautogen/main/dns.tf.tmpl\n@@ -44,7 +44,7 @@ EOF\n ]\n }\n \n-resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-namservers\" {\n+resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers\" {\n count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n metadata {\n@@ -68,6 +68,12 @@ EOF\n ]\n }\n \n+# Fix the name typo in the previous ConfigMap creation call\n+moved {\n+ from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers\n+ to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers\n+}\n+\n resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers-and-stub-domains\" {\n count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n---\ndns.tf\n@@ -42,7 +42,7 @@ EOF\n ]\n }\n \n-resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-namservers\" {\n+resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers\" {\n count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n metadata {\n@@ -64,6 +64,12 @@ EOF\n ]\n }\n \n+# Fix the name typo in the previous ConfigMap creation call\n+moved {\n+ from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers\n+ to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers\n+}\n+\n resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers-and-stub-domains\" {\n count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n---\nmodules/beta-autopilot-private-cluster/dns.tf\n@@ -41,7 +41,7 @@ EOF\n ]\n }\n \n-resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-namservers\" {\n+resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers\" {\n count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n metadata {\n@@ -62,6 +62,12 @@ EOF\n ]\n }\n \n+# Fix the name typo in the previous ConfigMap creation call\n+moved {\n+ from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers\n+ to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers\n+}\n+\n resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers-and-stub-domains\" {\n count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n---\nmodules/beta-autopilot-public-cluster/dns.tf\n@@ -41,7 +41,7 @@ EOF\n ]\n }\n \n-resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-namservers\" {\n+resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers\" {\n count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n metadata {\n@@ -62,6 +62,12 @@ EOF\n ]\n }\n \n+# Fix the name typo in the previous ConfigMap creation call\n+moved {\n+ from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers\n+ to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers\n+}\n+\n resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers-and-stub-domains\" {\n count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n---\nmodules/beta-private-cluster-update-variant/dns.tf\n@@ -42,7 +42,7 @@ EOF\n ]\n }\n \n-resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-namservers\" {\n+resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers\" {\n count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n metadata {\n@@ -64,6 +64,12 @@ EOF\n ]\n }\n \n+# Fix the name typo in the previous ConfigMap creation call\n+moved {\n+ from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers\n+ to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers\n+}\n+\n resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers-and-stub-domains\" {\n count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n---\nmodules/beta-private-cluster/dns.tf\n@@ -42,7 +42,7 @@ EOF\n ]\n }\n \n-resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-namservers\" {\n+resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers\" {\n count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n metadata {\n@@ -64,6 +64,12 @@ EOF\n ]\n }\n \n+# Fix the name typo in the previous ConfigMap creation call\n+moved {\n+ from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers\n+ to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers\n+}\n+\n resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers-and-stub-domains\" {\n count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n---\nmodules/beta-public-cluster-update-variant/dns.tf\n@@ -42,7 +42,7 @@ EOF\n ]\n }\n \n-resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-namservers\" {\n+resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers\" {\n count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n metadata {\n@@ -64,6 +64,12 @@ EOF\n ]\n }\n \n+# Fix the name typo in the previous ConfigMap creation call\n+moved {\n+ from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers\n+ to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers\n+}\n+\n resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers-and-stub-domains\" {\n count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n---\nmodules/beta-public-cluster/dns.tf\n@@ -42,7 +42,7 @@ EOF\n ]\n }\n \n-resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-namservers\" {\n+resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers\" {\n count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n metadata {\n@@ -64,6 +64,12 @@ EOF\n ]\n }\n \n+# Fix the name typo in the previous ConfigMap creation call\n+moved {\n+ from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers\n+ to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers\n+}\n+\n resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers-and-stub-domains\" {\n count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n---\nmodules/private-cluster-update-variant/dns.tf\n@@ -42,7 +42,7 @@ EOF\n ]\n }\n \n-resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-namservers\" {\n+resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers\" {\n count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n metadata {\n@@ -64,6 +64,12 @@ EOF\n ]\n }\n \n+# Fix the name typo in the previous ConfigMap creation call\n+moved {\n+ from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers\n+ to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers\n+}\n+\n resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers-and-stub-domains\" {\n count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n---\nmodules/private-cluster/dns.tf\n@@ -42,7 +42,7 @@ EOF\n ]\n }\n \n-resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-namservers\" {\n+resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers\" {\n count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n metadata {\n@@ -64,6 +64,12 @@ EOF\n ]\n }\n \n+# Fix the name typo in the previous ConfigMap creation call\n+moved {\n+ from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers\n+ to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers\n+}\n+\n resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers-and-stub-domains\" {\n count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n---\n\n\n---\n\nChoice C:\nautogen/main/dns.tf.tmpl\n@@ -44,7 +44,7 @@ EOF\n ]\n }\n \n-resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-namservers\" {\n+resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers\" {\n count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n metadata {\n@@ -68,6 +68,12 @@ EOF\n ]\n }\n \n+# Fix the name typo in the previous ConfigMap creation call\n+moved {\n+ creation from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers\n+ to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers\n+}\n+\n resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers-and-stub-domains\" {\n count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n---\ndns.tf\n@@ -42,7 +42,7 @@ EOF\n ]\n }\n \n-resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-namservers\" {\n+resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers\" {\n count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n metadata {\n@@ -64,6 +64,12 @@ EOF\n ]\n }\n \n+# Fix the name typo in the previous ConfigMap creation call\n+moved {\n+ from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers\n+ to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers\n+}\n+\n resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers-and-stub-domains\" {\n count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n---\nmodules/beta-autopilot-private-cluster/dns.tf\n@@ -41,7 +41,7 @@ EOF\n ]\n }\n \n-resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-namservers\" {\n+resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers\" {\n count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n metadata {\n@@ -62,6 +62,12 @@ EOF\n ]\n }\n \n+# Fix the name typo in the previous ConfigMap creation call\n+moved {\n+ from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers\n+ to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers\n+}\n+\n resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers-and-stub-domains\" {\n count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n---\nmodules/beta-autopilot-public-cluster/dns.tf\n@@ -41,7 +41,7 @@ EOF\n ]\n }\n \n-resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-namservers\" {\n+resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers\" {\n count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n metadata {\n@@ -62,6 +62,12 @@ EOF\n ]\n }\n \n+# Fix the name typo in the previous ConfigMap creation call\n+moved {\n+ from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers\n+ to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers\n+}\n+\n resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers-and-stub-domains\" {\n count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n---\nmodules/beta-private-cluster-update-variant/dns.tf\n@@ -42,7 +42,7 @@ EOF\n ]\n }\n \n-resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-namservers\" {\n+resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers\" {\n count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n metadata {\n@@ -64,6 +64,12 @@ EOF\n ]\n }\n \n+# Fix the name typo in the previous ConfigMap creation call\n+moved {\n+ from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers\n+ to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers\n+}\n+\n resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers-and-stub-domains\" {\n count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n---\nmodules/beta-private-cluster/dns.tf\n@@ -42,7 +42,7 @@ EOF\n ]\n }\n \n-resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-namservers\" {\n+resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers\" {\n count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n metadata {\n@@ -64,6 +64,12 @@ EOF\n ]\n }\n \n+# Fix the name typo in the previous ConfigMap creation call\n+moved {\n+ from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers\n+ to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers\n+}\n+\n resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers-and-stub-domains\" {\n count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n---\nmodules/beta-public-cluster-update-variant/dns.tf\n@@ -42,7 +42,7 @@ EOF\n ]\n }\n \n-resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-namservers\" {\n+resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers\" {\n count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n metadata {\n@@ -64,6 +64,12 @@ EOF\n ]\n }\n \n+# Fix the name typo in the previous ConfigMap creation call\n+moved {\n+ from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers\n+ to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers\n+}\n+\n resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers-and-stub-domains\" {\n count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n---\nmodules/beta-public-cluster/dns.tf\n@@ -42,7 +42,7 @@ EOF\n ]\n }\n \n-resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-namservers\" {\n+resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers\" {\n count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n metadata {\n@@ -64,6 +64,12 @@ EOF\n ]\n }\n \n+# Fix the name typo in the previous ConfigMap creation call\n+moved {\n+ from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers\n+ to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers\n+}\n+\n resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers-and-stub-domains\" {\n count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n---\nmodules/private-cluster-update-variant/dns.tf\n@@ -42,7 +42,7 @@ EOF\n ]\n }\n \n-resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-namservers\" {\n+resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers\" {\n count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n metadata {\n@@ -64,6 +64,12 @@ EOF\n ]\n }\n \n+# Fix the name typo in the previous ConfigMap creation call\n+moved {\n+ from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers\n+ to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers\n+}\n+\n resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers-and-stub-domains\" {\n count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n---\nmodules/private-cluster/dns.tf\n@@ -42,7 +42,7 @@ EOF\n ]\n }\n \n-resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-namservers\" {\n+resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers\" {\n count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n metadata {\n@@ -64,6 +64,12 @@ EOF\n ]\n }\n \n+# Fix the name typo in the previous ConfigMap creation call\n+moved {\n+ from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers\n+ to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers\n+}\n+\n resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers-and-stub-domains\" {\n count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n---\n\n\n---\n\nChoice D:\nautogen/main/dns.tf.tmpl\n@@ -44,7 +44,7 @@ EOF\n ]\n }\n \n-resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-namservers\" {\n+resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers\" {\n count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n metadata {\n@@ -68,6 +68,12 @@ EOF\n ]\n }\n \n+# Fix the name typo in the previous ConfigMap creation call\n+moved {\n+ from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers\n+ to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers\n+}\n+\n resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers-and-stub-domains\" {\n count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n---\ndns.tf\n@@ -42,7 +42,7 @@ EOF\n ]\n }\n \n-resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-namservers\" {\n+resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers\" {\n count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n metadata {\n@@ -64,6 +64,12 @@ EOF\n ]\n }\n \n+# Fix the name typo in the previous ConfigMap creation call\n+moved {\n+ from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers\n+ to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers\n+}\n+\n resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers-and-stub-domains\" {\n count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n---\nmodules/beta-autopilot-private-cluster/dns.tf\n@@ -41,7 +41,7 @@ EOF\n ]\n }\n \n-resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-namservers\" {\n+resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers\" {\n count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n metadata {\n@@ -62,6 +62,12 @@ EOF\n ]\n }\n \n+# Fix the name typo in the previous ConfigMap creation call\n+moved {\n+ from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers\n+ to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers\n+}\n+\n resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers-and-stub-domains\" {\n count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n---\nmodules/beta-autopilot-public-cluster/dns.tf\n@@ -41,7 +41,7 @@ EOF\n ]\n }\n \n-resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-namservers\" {\n+resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers\" {\n count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n metadata {\n@@ -62,6 +62,12 @@ EOF\n ]\n }\n \n+# Fix the name typo in the previous ConfigMap creation call\n+moved {\n+ from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers\n+ to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers\n+}\n+\n resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers-and-stub-domains\" {\n count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n---\nmodules/beta-private-cluster-update-variant/dns.tf\n@@ -42,7 +42,7 @@ EOF\n ]\n }\n \n-resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-namservers\" {\n+resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers\" {\n count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n metadata {\n@@ -64,6 +64,12 @@ EOF\n ]\n }\n \n+# Fix the name typo in the previous ConfigMap creation call\n+moved {\n+ from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers\n+ to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers\n+}\n+\n resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers-and-stub-domains\" {\n count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n---\nmodules/beta-private-cluster/dns.tf\n@@ -42,7 +42,7 @@ EOF\n ]\n }\n \n-resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-namservers\" {\n+resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers\" {\n count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n metadata {\n@@ -64,6 +64,12 @@ EOF\n ]\n }\n \n+# Fix the name typo in the previous ConfigMap creation call\n+moved {\n+ from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers\n+ to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers\n+}\n+\n resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers-and-stub-domains\" {\n count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n---\nmodules/beta-public-cluster-update-variant/dns.tf\n@@ -42,7 +42,7 @@ EOF\n ]\n }\n \n-resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-namservers\" {\n+resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers\" {\n count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n metadata {\n@@ -64,6 +64,12 @@ EOF\n ]\n }\n \n+# Fix the name typo in the previous ConfigMap creation call\n+moved {\n+ from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers\n+ to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers\n+}\n+\n resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers-and-stub-domains\" {\n count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n---\nmodules/beta-public-cluster/dns.tf\n@@ -42,7 +42,7 @@ EOF\n ]\n }\n \n-resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-namservers\" {\n+resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers\" {\n count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n metadata {\n@@ -64,6 +64,12 @@ EOF\n ]\n }\n \n+# Fix the name typo in the previous ConfigMap creation call\n+moved {\n+ from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers\n+ to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers\n+}\n+\n resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers-and-stub-domains\" {\n count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n---\nmodules/private-cluster-update-variant/dns.tf\n@@ -42,7 +42,7 @@ EOF\n ]\n }\n \n-resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-namservers\" {\n+resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers\" {\n count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n metadata {\n@@ -64,6 +64,12 @@ EOF\n ]\n }\n \n+# Fix the name typo in the previous ConfigMap creation call\n+moved {\n+ from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers\n+ to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers\n+}\n+\n resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers-and-stub-domains\" {\n count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n---\nmodules/private-cluster/dns.tf\n@@ -42,7 +42,7 @@ EOF\n ]\n }\n \n-resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-namservers\" {\n+resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers\" {\n count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n metadata {\n@@ -64,6 +64,12 @@ EOF\n ]\n }\n \n+# Fix the name typo in the previous ConfigMap creation call\n+moved {\n+ from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers\n+ to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers\n+}\n+\n resource \"kubernetes_config_map_v1_data\" \"kube-dns-upstream-nameservers-and-stub-domains\" {\n count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0\n \n---\n\n\n---\n"
}
] |
B
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nAdds both `serialize_image_pulls` and `max_parallel_image_pulls` for controlling kubelet configuration related to parallel image pulls. [This issue](https://github.com/kubernetes/kubernetes/issues/108405) contains some opinions that loosely align with the reason for this change, but we also feel that we should be able to configure serial image pulls if the defaults aren't working for us.\r\n\n\n---\n\nChoice A:\nmodules/beta-private-cluster/README.md\n@@ -401,6 +401,8 @@ The node_pools variable takes the following parameters:\n | consume_reservation_type | The type of reservation consumption. Accepted values are: \"UNSPECIFIED\": Default value (should not be specified). \"NO_RESERVATION\": Do not consume from any reserved capacity, \"ANY_RESERVATION\": Consume any reservation available, \"SPECIFIC_RESERVATION\": Must consume from a specific reservation. Must specify key value fields for specifying the reservations. | | Optional |\n | reservation_affinity_key | The label key of a reservation resource. To target a SPECIFIC_RESERVATION by name, specify \"compute.googleapis.com/reservation-name\" as the key and specify the name of your reservation as its value. | | Optional |\n | reservation_affinity_values | The list of label values of reservation resources. For example: the name of the specific reservation when using key of \"compute.googleapis.com/reservation-name\". This should be passed as comma separated string. | | Optional |\n+| serialize_image_pulls | When enabled, tells the Kubelet to pull images one at a time. We recommend not changing the default value on nodes that run docker daemon with version < 1.9 or an Aufs storage backend. [Issue #10959](https://github.com/kubernetes/kubernetes/issues/10959) has more details. | | Optional |\n+| max_parallel_image_pulls | Sets the maximum number of image pulls in parallel. This field cannot be set if SerializeImagePulls is true. Setting it to nil means no limit. | | Optional |\n \n ## windows_node_pools variable\n The windows_node_pools variable takes the same parameters as [node_pools](#node\\_pools-variable) but is reserved for provisioning Windows based node pools only. This variable is introduced to satisfy a [specific requirement](https://cloud.google.com/kubernetes-engine/docs/how-to/creating-a-cluster-windows#create_a_cluster_and_node_pools) for the presence of at least one linux based node pool in the cluster before a windows based node pool can be created.\n---\nmodules/beta-private-cluster/cluster.tf\n@@ -831,7 +831,7 @@ resource \"google_container_node_pool\" \"pools\" {\n dynamic \"kubelet_config\" {\n for_each = length(setintersection(\n keys(each.value),\n- [\"cpu_manager_policy\", \"cpu_cfs_quota\", \"cpu_cfs_quota_period\", \"insecure_kubelet_readonly_port_enabled\", \"pod_pids_limit\"]\n+ [\"cpu_manager_policy\", \"cpu_cfs_quota\", \"cpu_cfs_quota_period\", \"insecure_kubelet_readonly_port_enabled\", \"pod_pids_limit\", \"serialize_image_pulls\", \"max_parallel_image_pulls\"]\n )) != 0 ? [1] : []\n \n content {\n@@ -840,6 +840,8 @@ resource \"google_container_node_pool\" \"pools\" {\n cpu_cfs_quota_period = lookup(each.value, \"cpu_cfs_quota_period\", null)\n insecure_kubelet_readonly_port_enabled = lookup(each.value, \"insecure_kubelet_readonly_port_enabled\", var.insecure_kubelet_readonly_port_enabled != null ? var.insecure_kubelet_readonly_port_enabled : null)\n pod_pids_limit = lookup(each.value, \"pod_pids_limit\", null)\n+ serialize_image_pulls = lookup(each.value, \"serialize_image_pulls\", null)\n+ max_parallel_image_pulls = lookup(each.value, \"max_parallel_image_pulls\", null)\n }\n }\n \n@@ -1135,7 +1137,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n dynamic \"kubelet_config\" {\n for_each = length(setintersection(\n keys(each.value),\n- [\"cpu_manager_policy\", \"cpu_cfs_quota\", \"cpu_cfs_quota_period\", \"insecure_kubelet_readonly_port_enabled\", \"pod_pids_limit\"]\n+ [\"cpu_manager_policy\", \"cpu_cfs_quota\", \"cpu_cfs_quota_period\", \"insecure_kubelet_readonly_port_enabled\", \"pod_pids_limit\", \"serialize_image_pulls\", \"max_parallel_image_pulls\"]\n )) != 0 ? [1] : []\n \n content {\n@@ -1144,6 +1146,8 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n cpu_cfs_quota_period = lookup(each.value, \"cpu_cfs_quota_period\", null)\n insecure_kubelet_readonly_port_enabled = lookup(each.value, \"insecure_kubelet_readonly_port_enabled\", var.insecure_kubelet_readonly_port_enabled != null ? var.insecure_kubelet_readonly_port_enabled : null)\n pod_pids_limit = lookup(each.value, \"pod_pids_limit\", null)\n+ serialize_image_pulls = lookup(each.value, \"serialize_image_pulls\", null)\n+ max_parallel_image_pulls = lookup(each.value, \"max_parallel_image_pulls\", null)\n }\n }\n \n---\n\n\n---\n\nChoice B:\nmodules/beta-private-cluster/README.md\n@@ -401,6 +401,8 @@ The node_pools variable takes the following parameters:\n | consume_reservation_type | The type of reservation consumption. Accepted values are: \"UNSPECIFIED\": Default value (should not be specified). \"NO_RESERVATION\": Do not consume from any reserved capacity, \"ANY_RESERVATION\": Consume any reservation available, \"SPECIFIC_RESERVATION\": Must consume from a specific reservation. Must specify key value fields for specifying the reservations. | | Optional |\n | reservation_affinity_key | The label key of a reservation resource. To target a SPECIFIC_RESERVATION by name, specify \"compute.googleapis.com/reservation-name\" as the key and specify the name of your reservation as its value. | | Optional |\n | reservation_affinity_values | The list of label values of reservation resources. For example: the name of the specific reservation when using a key of \"compute.googleapis.com/reservation-name\". This should be passed as comma separated string. | | Optional |\n+| serialize_image_pulls | When enabled, tells the Kubelet to pull images one at a time. We recommend not changing the default value on nodes that run docker daemon with version < 1.9 or an Aufs storage backend. [Issue #10959](https://github.com/kubernetes/kubernetes/issues/10959) has more details. | | Optional |\n+| max_parallel_image_pulls | Sets the maximum number of image pulls in parallel. This field cannot be set if SerializeImagePulls is true. Setting it to nil means no limit. | | Optional |\n \n ## windows_node_pools variable\n The windows_node_pools variable takes the same parameters as [node_pools](#node\\_pools-variable) but is reserved for provisioning Windows based node pools only. This variable is introduced to satisfy a [specific requirement](https://cloud.google.com/kubernetes-engine/docs/how-to/creating-a-cluster-windows#create_a_cluster_and_node_pools) for the presence of at least one linux based node pool in the cluster before a windows based node pool can be created.\n---\nmodules/beta-private-cluster/cluster.tf\n@@ -831,7 +831,7 @@ resource \"google_container_node_pool\" \"pools\" {\n dynamic \"kubelet_config\" {\n for_each = length(setintersection(\n keys(each.value),\n- [\"cpu_manager_policy\", \"cpu_cfs_quota\", \"cpu_cfs_quota_period\", \"insecure_kubelet_readonly_port_enabled\", \"pod_pids_limit\"]\n+ [\"cpu_manager_policy\", \"cpu_cfs_quota\", \"cpu_cfs_quota_period\", \"insecure_kubelet_readonly_port_enabled\", \"pod_pids_limit\", \"serialize_image_pulls\", \"max_parallel_image_pulls\"]\n )) != 0 ? [1] : []\n \n content {\n@@ -840,6 +840,8 @@ resource \"google_container_node_pool\" \"pools\" {\n cpu_cfs_quota_period = lookup(each.value, \"cpu_cfs_quota_period\", null)\n insecure_kubelet_readonly_port_enabled = lookup(each.value, \"insecure_kubelet_readonly_port_enabled\", var.insecure_kubelet_readonly_port_enabled != null ? var.insecure_kubelet_readonly_port_enabled : null)\n pod_pids_limit = lookup(each.value, \"pod_pids_limit\", null)\n+ serialize_image_pulls = lookup(each.value, \"serialize_image_pulls\", null)\n+ max_parallel_image_pulls = lookup(each.value, \"max_parallel_image_pulls\", null)\n }\n }\n \n@@ -1135,7 +1137,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n dynamic \"kubelet_config\" {\n for_each = length(setintersection(\n keys(each.value),\n- [\"cpu_manager_policy\", \"cpu_cfs_quota\", \"cpu_cfs_quota_period\", \"insecure_kubelet_readonly_port_enabled\", \"pod_pids_limit\"]\n+ [\"cpu_manager_policy\", \"cpu_cfs_quota\", \"cpu_cfs_quota_period\", \"insecure_kubelet_readonly_port_enabled\", \"pod_pids_limit\", \"serialize_image_pulls\", \"max_parallel_image_pulls\"]\n )) != 0 ? [1] : []\n \n content {\n@@ -1144,6 +1146,8 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n cpu_cfs_quota_period = lookup(each.value, \"cpu_cfs_quota_period\", null)\n insecure_kubelet_readonly_port_enabled = lookup(each.value, \"insecure_kubelet_readonly_port_enabled\", var.insecure_kubelet_readonly_port_enabled != null ? var.insecure_kubelet_readonly_port_enabled : null)\n pod_pids_limit = lookup(each.value, \"pod_pids_limit\", null)\n+ serialize_image_pulls = lookup(each.value, \"serialize_image_pulls\", null)\n+ max_parallel_image_pulls = lookup(each.value, \"max_parallel_image_pulls\", null)\n }\n }\n \n---\n\n\n---\n\nChoice C:\nmodules/beta-private-cluster/README.md\n@@ -401,6 +401,8 @@ The node_pools variable takes the following parameters:\n | consume_reservation_type | The type of reservation consumption. Accepted values are: \"UNSPECIFIED\": Default value (should not be specified). \"NO_RESERVATION\": Do not consume from any reserved capacity, \"ANY_RESERVATION\": Consume any reservation available, \"SPECIFIC_RESERVATION\": Must consume from a specific reservation. Must specify key value fields for specifying the reservations. | | Optional |\n | reservation_affinity_key | The label key of a reservation resource. To target a SPECIFIC_RESERVATION by name, specify \"compute.googleapis.com/reservation-name\" as the key and specify the name of your reservation as its value. | | Optional |\n | reservation_affinity_values | The list of label values of reservation resources. For example: the name of the specific reservation when using a key of \"compute.googleapis.com/reservation-name\". This should be passed as comma separated string. | | Optional |\n+| serialize_image_pulls | When enabled, tells the Kubelet to pull images one at a time. We recommend not changing the default value on nodes that run docker daemon with version < 1.9 or an Aufs storage backend. [Issue #10959](https://github.com/kubernetes/kubernetes/issues/10959) has more details. | | Optional |\n+| max_parallel_image_pulls | Sets the maximum number of image pulls in parallel. This field cannot be set if SerializeImagePulls is true. Setting it to nil means no limit. | | Optional |\n \n ## windows_node_pools variable\n The windows_node_pools variable takes the same parameters as [node_pools](#node\\_pools-variable) but is reserved for provisioning Windows based node pools only. This variable is introduced to satisfy a [specific requirement](https://cloud.google.com/kubernetes-engine/docs/how-to/creating-a-cluster-windows#create_a_cluster_and_node_pools) for the presence of at least one linux based node pool in the cluster before a windows based node pool can be created.\n---\nmodules/beta-private-cluster/cluster.tf\n@@ -831,7 +831,7 @@ resource \"google_container_node_pool\" \"pools\" {\n dynamic \"kubelet_config\" {\n for_each = length(setintersection(\n keys(each.value),\n- [\"cpu_manager_policy\", \"cpu_cfs_quota\", \"cpu_cfs_quota_period\", \"insecure_kubelet_readonly_port_enabled\", \"pod_pids_limit\"]\n+ [\"cpu_manager_policy\", \"cpu_cfs_quota\", \"cpu_cfs_quota_period\", \"insecure_kubelet_readonly_port_enabled\", \"pod_pids_limit\", \"serialize_image_pulls\", \"max_parallel_image_pulls\"]\n )) != 0 ? [1] : []\n \n content {\n@@ -840,6 +840,8 @@ resource \"google_container_node_pool\" \"pools\" {\n cpu_cfs_quota_period = lookup(each.value, \"cpu_cfs_quota_period\", null)\n insecure_kubelet_readonly_port_enabled = lookup(each.value, \"insecure_kubelet_readonly_port_enabled\", var.insecure_kubelet_readonly_port_enabled != null ? var.insecure_kubelet_readonly_port_enabled : null)\n pod_pids_limit = lookup(each.value, \"pod_pids_limit\", null)\n+ serialize_image_pulls = lookup(each.value, \"serialize_image_pulls\", null)\n+ max_parallel_image_pulls = lookup(each.value, \"max_parallel_image_pulls\", null)\n }\n }\n \n@@ -1135,7 +1137,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n dynamic \"kubelet_config\" {\n for_each = length(setintersection(\n keys(each.value),\n- [\"cpu_manager_policy\", \"cpu_cfs_quota\", \"cpu_cfs_quota_period\", \"insecure_kubelet_readonly_port_enabled\", \"pod_pids_limit\"]\n+ [\"cpu_manager_policy\", \"cpu_cfs_quota\", \"cpu_cfs_quota_period\", \"insecure_kubelet_readonly_port_enabled\", \"pod_pids_limit\", \"serialize_image_pulls\", \"max_parallel_image_pulls\"]\n )) != 0 ? [1] : []\n \n content {\n@@ -1144,6 +1146,8 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n cpu_cfs_quota_period = lookup(each.value, \"cpu_cfs_quota_period\", null)\n insecure_kubelet_readonly_port_enabled = lookup(each.value, \"insecure_kubelet_readonly_port_enabled\", var.insecure_kubelet_readonly_port_enabled != null ? var.insecure_kubelet_readonly_port_enabled : null)\n pod_pids_limit = lookup(each.value, \"pod_pids_limit\", null)\n+ serialize_image_pulls = lookup(each.value, \"serialize_image_pulls\", null)\n+ max_parallel_image_pulls = lookup(each.value, \"max_parallel_image_pulls\", null)\n }\n }\n \n---\n\n\n---\n\nChoice D:\nmodules/beta-private-cluster/README.md\n@@ -401,6 +401,8 @@ The node_pools variable takes the following parameters:\n | consume_reservation_type | The type of reservation consumption. Accepted values are: \"UNSPECIFIED\": Default value (should not be specified). \"NO_RESERVATION\": Do not consume from any reserved capacity, \"ANY_RESERVATION\": Consume any reservation available, \"SPECIFIC_RESERVATION\": Must consume from a specific reservation. Must specify key value fields for specifying the reservations. | | Optional |\n | reservation_affinity_key | The label key of a reservation resource. To target a SPECIFIC_RESERVATION by name, specify \"compute.googleapis.com/reservation-name\" as the key and specify the name of your reservation as its value. | | Optional |\n | reservation_affinity_values | The list of label values of reservation resources. For example: the name of the specific reservation when using a key of \"compute.googleapis.com/reservation-name\". This should be passed as comma separated string. | | Optional |\n+| serialize_image_pulls | When enabled, tells the Kubelet to pull images one at a time. We recommend not changing the default value on nodes that run docker daemon with version < 1.9 or an Aufs storage backend. [Issue #10959](https://github.com/kubernetes/kubernetes/issues/10959) has more details. | | Optional |\n+| max_parallel_image_pulls | Sets the maximum number of image pulls in parallel. This field cannot be set if SerializeImagePulls is true. Setting it to nil means no limit. | | Optional |\n \n ## windows_node_pools variable\n The windows_node_pools variable takes the same parameters as [node_pools](#node\\_pools-variable) but is reserved for provisioning Windows based node pools only. This variable is introduced to satisfy a [specific requirement](https://cloud.google.com/kubernetes-engine/docs/how-to/creating-a-cluster-windows#create_a_cluster_and_node_pools) for the presence of at least one linux based node pool in the cluster before a windows based node pool can be created.\n---\nmodules/beta-private-cluster/cluster.tf\n@@ -831,7 +831,7 @@ resource \"google_container_node_pool\" \"pools\" {\n dynamic \"kubelet_config\" {\n for_each = length(setintersection(\n keys(each.value),\n- [\"cpu_manager_policy\", \"cpu_cfs_quota\", \"cpu_cfs_quota_period\", \"insecure_kubelet_readonly_port_enabled\", \"pod_pids_limit\"]\n+ [\"cpu_manager_policy\", \"cpu_cfs_quota\", \"cpu_cfs_quota_period\", \"insecure_kubelet_readonly_port_enabled\", \"pod_pids_limit\", \"serialize_image_pulls\", \"max_parallel_image_pulls\"]\n )) != 0 ? [1] : []\n \n content {\n@@ -840,6 +840,8 @@ resource \"google_container_node_pool\" \"pools\" {\n cpu_cfs_quota_period = lookup(each.value, \"cpu_cfs_quota_period\", null)\n insecure_kubelet_readonly_port_enabled = lookup(each.value, \"insecure_kubelet_readonly_port_enabled\", var.insecure_kubelet_readonly_port_enabled != null ? var.insecure_kubelet_readonly_port_enabled : null)\n pod_pids_limit = lookup(each.value, \"pod_pids_limit\", null)\n+ serialize_image_pulls = lookup(each.value, \"serialize_image_pulls\", null)\n+ max_parallel_image_pulls = lookup(each.value, \"max_parallel_image_pulls\", null)\n }\n }\n \n@@ -1135,7 +1137,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n dynamic \"kubelet_config\" {\n for_each = length(setintersection(\n keys(each.value),\n- [\"cpu_manager_policy\", \"cpu_cfs_quota\", \"cpu_cfs_quota_period\", \"insecure_kubelet_readonly_port_enabled\", \"pod_pids_limit\"]\n+ [\"cpu_manager_policy\", \"cpu_cfs_quota\", \"cpu_cfs_quota_period\", \"insecure_kubelet_readonly_port_enabled\", \"pod_pids_limit\", \"serialize_image_pulls\", \"max_parallel_image_pulls\"]\n )) != 0 ? [1] : []\n \n content {\n@@ -1144,6 +1146,8 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n cpu_cfs_quota_period = lookup(each.value, \"cpu_cfs_quota_period\", null)\n insecure_kubelet_readonly_port_enabled = lookup(each.value, \"insecure_kubelet_readonly_port_enabled\", var.insecure_kubelet_readonly_port_enabled != null ? var.insecure_kubelet_readonly_port_enabled : null)\n pod_pids_limit = lookup(each.value, \"pod_pids_limit\", null)\n+ serialize_image_pulls = lookup(each.value, \"serialize_image_pulls\", null)\n+ max_parallel_image_pulls = lookup(each.value, \"max_parallel_image_pulls\", null)\n }\n }\n \n---\n\n\n---\n"
}
] |
B
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nThe goal of this PR is to add sole_tenant support in the node_config of private nodes, similar to how taints current work. It works additive only, and out add the config if someone inputted something like below:\r\n\r\n```\r\n...\r\nnode_pools_sole_tenant_selectors = {\r\n \"my-node-pool\" = {\r\n key = \"compute.googleapis.com/node-group-name\"\r\n operator = \"IN\"\r\n values = [\"sole-pool-host\"]\r\n }\r\n }\r\n...\r\n```\n\n---\n\nChoice A:\ncluster.tf\n@@ -752,6 +752,17 @@ resource \"google_container_node_pool\" \"pools\" {\n enable_secure_boot = lookup(each.value, \"enable_secure_boot\", false)\n enable_integrity_monitoring = lookup(each.value, \"enable_integrity_monitoring\", true)\n }\n+\n+ dynamic \"sole_tenant_config\" {\n+ for_each = lookup(var.node_pools_sole_tenant_selectors, each.value[\"name\"], null) == null ? [] : [1]\n+ content {\n+ node_affinity {\n+ key = var.node_pools_sole_tenant_selectors[each.value[\"name\"]][\"key\"]\n+ operator = var.node_pools_sole_tenant_selectors[each.value[\"name\"]][\"operator\"]\n+ values = var.node_pools_sole_tenant_selectors[each.value[\"name\"]][\"values\"]\n+ }\n+ }\n+ }\n }\n \n lifecycle {\n---\nvariables.tf\n@@ -192,6 +192,16 @@ variable \"node_pools_resource_labels\" {\n }\n }\n \n+variable \"node_pools_sole_tenant_selectors\" {\n+ type = map(object({ key = optional(string), values = optional(list(string)), operator = optional(string) }))\n+ description = \"Map of maps containing label selectors for sole tenant nodes\"\n+\n+ default = {\n+ all = {}\n+ default-node-pool = {}\n+ }\n+}\n+\n variable \"node_pools_resource_manager_tags\" {\n type = map(map(string))\n description = \"Map of maps containing resource manager tags by node-pool name\"\n---\n\n\n---\n\nChoice B:\ncluster.tf\n@@ -752,6 +752,17 resource \"google_container_node_pool\" \"pools\" {\n enable_secure_boot = lookup(each.value, \"enable_secure_boot\", false)\n enable_integrity_monitoring = lookup(each.value, \"enable_integrity_monitoring\", true)\n }\n+\n+ dynamic \"sole_tenant_config\" {\n+ for_each = lookup(var.node_pools_sole_tenant_selectors, each.value[\"name\"], null) == null ? [] : [1]\n+ content {\n+ node_affinity {\n+ key = var.node_pools_sole_tenant_selectors[each.value[\"name\"]][\"key\"]\n+ operator = var.node_pools_sole_tenant_selectors[each.value[\"name\"]][\"operator\"]\n+ values = var.node_pools_sole_tenant_selectors[each.value[\"name\"]][\"values\"]\n+ }\n+ }\n+ }\n }\n \n lifecycle {\n---\nvariables.tf\n@@ -192,6 +192,16 @@ variable \"node_pools_resource_labels\" {\n }\n }\n \n+variable \"node_pools_sole_tenant_selectors\" {\n+ type = map(object({ key = optional(string), values = optional(list(string)), operator = optional(string) }))\n+ description = \"Map of maps containing label selectors for sole tenant nodes\"\n+\n+ default = {\n+ all = {}\n+ default-node-pool = {}\n+ }\n+}\n+\n variable \"node_pools_resource_manager_tags\" {\n type = map(map(string))\n description = \"Map of maps containing resource manager tags by node-pool name\"\n---\n\n\n---\n\nChoice C:\ncluster.tf\n@@ -752,6 +752,17 @@ resource \"google_container_node_pool\" {\n enable_secure_boot = lookup(each.value, \"enable_secure_boot\", false)\n enable_integrity_monitoring = lookup(each.value, \"enable_integrity_monitoring\", true)\n }\n+\n+ dynamic \"sole_tenant_config\" {\n+ for_each = lookup(var.node_pools_sole_tenant_selectors, each.value[\"name\"], null) == null ? [] : [1]\n+ content {\n+ node_affinity {\n+ key = var.node_pools_sole_tenant_selectors[each.value[\"name\"]][\"key\"]\n+ operator = var.node_pools_sole_tenant_selectors[each.value[\"name\"]][\"operator\"]\n+ values = var.node_pools_sole_tenant_selectors[each.value[\"name\"]][\"values\"]\n+ }\n+ }\n+ }\n }\n \n lifecycle {\n---\nvariables.tf\n@@ -192,6 +192,16 @@ variable \"node_pools_resource_labels\" {\n }\n }\n \n+variable \"node_pools_sole_tenant_selectors\" {\n+ type = map(object({ key = optional(string), values = optional(list(string)), operator = optional(string) }))\n+ description = \"Map of maps containing label selectors for sole tenant nodes\"\n+\n+ default = {\n+ all = {}\n+ default-node-pool = {}\n+ }\n+}\n+\n variable \"node_pools_resource_manager_tags\" {\n type = map(map(string))\n description = \"Map of maps containing resource manager tags by node-pool name\"\n---\n\n\n---\n\nChoice D:\ncluster.tf\n@@ -752,6 +752,17 @@ resource \"google_container_node_pool\" \"pools\" {\n enable_secure_boot = lookup(each.value, \"enable_secure_boot\", false)\n enable_integrity_monitoring = lookup(each.value, \"enable_integrity_monitoring\", true)\n }\n+\n+ dynamic \"sole_tenant_config\" {\n+ for_each = lookup(var.node_pools_sole_tenant_selectors, each.value[\"name\"], null) == null ? [] : [1]\n+ content {\n+ node_affinity {\n+ key = var.node_pools_sole_tenant_selectors[each.value[\"name\"]][\"key\"]\n+ operator = var.node_pools_sole_tenant_selectors[each.value[\"name\"]][\"operator\"]\n+ values = var.node_pools_sole_tenant_selectors[each.value[\"name\"]][\"values\"]\n+ }\n+ }\n+ }\n }\n \n lifecycle {\n---\nvariables.tf\n@@ -192,6 +192,16 @@ variable \"node_pools_resource_labels\" {\n }\n }\n \n+variable \"node_pools_sole_tenant_selectors\" {\n+ type = map(object({ key = optional(string), values = optional(list(string)), operator = optional(string) }))\n+ description = \"Map of maps containing label selectors for sole tenant nodes\"\n+\n+ default = {\n+ all = {}\n+ default-node-pool = {}\n+ }\n+}\n+\n variable \"node_pools_resource_manager_tags\" {\n type = map(map(string))\n description = \"Map of maps containing resource manager tags by node-pool name\"\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nNone\n\n---\n\nChoice A:\nexamples/private_zonal_with_networking/main.tf\n@@ -1,5 +1,5 @@\n /**\n- * Copyright 2019 Google LLC\n+ * Copyright 2019-2024 Google LLC\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n@@ -79,6 +79,8 @@ module \"gke\" {\n master_ipv4_cidr_block = \"172.16.0.0/28\"\n deletion_protection = false\n \n+ insecure_kubelet_readonly_port_enabled = false\n+\n master_authorized_networks = [\n {\n cidr_block = data.google_compute_subnetwork.subnetwork.ip_cidr_range\n---\n\n\n---\n\nChoice B:\nexamples/private_zonal_with_networking/main.tf\n@@ -1,5 +1,5 @@\n /**\n- * Copyright 2019 Google LLC\n+ * Copyright 2019-2024 Google LLC\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n@@ -79,6 +79,8 @@ module \"gke\" {\n master_ipv4_cidr_block = \"172.16.0.0/28\"\n deletion_protection = false\n \n+ insecure_kubelet_readonly_port_enabled = false\n+\n master_authorized_networks = [\n {\n = data.google_compute_subnetwork.subnetwork.ip_cidr_range\n---\n\n\n---\n\nChoice C:\nexamples/private_zonal_with_networking/main.tf\n@@ -1,5 +1,5 @@\n /**\n- * Copyright 2019 Google LLC\n+ * Copyright 2019-2024 Google LLC\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n@@ -79,6 +79,8 @@ module \"gke\" {\n master_ipv4_cidr_block = \"172.16.0.0/28\"\n deletion_protection = false\n \n+ insecure_kubelet_readonly_port_enabled = false\n+\n master_authorized_networks = [\n {\n examples/private_zonal_with_networking/main.tf\n@@ = data.google_compute_subnetwork.subnetwork.ip_cidr_range\n---\n\n\n---\n\nChoice D:\nexamples/private_zonal_with_networking/main.tf\n@@ -1,5 +1,5 @@\n /**\n- * Copyright 2019 Google LLC\n+ * Copyright 2019-2024 Google LLC\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n@@ -79,6 +79,8 @@ module \"gke\" {\n master_ipv4_cidr_block = \"172.16.0.0/28\"\n deletion_protection = false\n \n+ insecure_kubelet_readonly_port_enabled = false\n+\n master_authorized_networks = [\n {\n * cidr_block = data.google_compute_subnetwork.subnetwork.ip_cidr_range\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nThe field name confidential_node in dynamic block confidential_nodes at nodepool level is incorrect, it should be enabled_confidential_nodes \r\ndynamic \"confidential_nodes\" {\r\n for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\r\n content {\r\n enabled = confidential_nodes.value\r\n}\n\n---\n\nChoice A:\nautogen/main/cluster.tf.tmpl\n@@ -1094,7 +1094,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n---\ncluster.tf\n@@ -782,7 +782,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n@@ -1058,7 +1058,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -959,7 +959,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n@@ -1249,7 +1249,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n---\nmodules/beta-private-cluster/cluster.tf\n@@ -874,7 +874,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n@@ -1163,7 +1163,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n---\nmodules/beta-public-cluster-update-variant/cluster.tf\n@@ -938,7 +938,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n@@ -1228,7 +1228,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n---\nmodules/beta-public-cluster/cluster.tf\n@@ -853,7 +853,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n@@ -1142,7 +1142,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -887,7 +887,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n -874,7 {\n enabled = confidential_nodes.value\n }\n@@ -1164,7 +1164,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n---\nmodules/private-cluster/cluster.tf\n@@ -803,7 +803,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n@@ -1079,7 +1079,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n---\n\n\n---\n\nChoice B:\nautogen/main/cluster.tf.tmpl\n@@ -1094,7 +1094,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n---\ncluster.tf\n@@ -782,7 +782,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n@@ -1058,7 +1058,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -959,7 +959,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n@@ -1249,7 +1249,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n---\nmodules/beta-private-cluster/cluster.tf\n@@ -874,7 +874,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n@@ -1163,7 +1163,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n---\nmodules/beta-public-cluster-update-variant/cluster.tf\n@@ -938,7 +938,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n@@ -1228,7 +1228,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n---\nmodules/beta-public-cluster/cluster.tf\n@@ -853,7 +853,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n@@ -1142,7 +1142,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -887,7 +887,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n@@ -1164,7 +1164,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n---\nmodules/private-cluster/cluster.tf\n@@ -803,7 +803,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n@@ -1079,7 +1079,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n---\n\n\n---\n\nChoice C:\nautogen/main/cluster.tf.tmpl\n@@ -1094,7 +1094,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n---\ncluster.tf\n@@ -782,7 +782,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n@@ -1058,7 +1058,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -959,7 +959,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n@@ -1249,7 +1249,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n---\nmodules/beta-private-cluster/cluster.tf\n@@ -874,7 +874,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n@@ -1163,7 +1163,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n---\nmodules/beta-public-cluster-update-variant/cluster.tf\n@@ -938,7 +938,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n@@ -1228,7 +1228,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n---\nmodules/beta-public-cluster/cluster.tf\n@@ -853,7 +853,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n@@ -1142,7 +1142,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -887,7 +887,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n@@ -1164,7 +1164,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n---\nmodules/private-cluster/cluster.tf\n@@ -803,7 +803,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n@@ -1079,7 +1079,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n---\n\n\n---\n\nChoice D:\nautogen/main/cluster.tf.tmpl\n@@ -1094,7 +1094,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n---\ncluster.tf\n@@ -782,7 +782,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n@@ -1058,7 +1058,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -959,7 +959,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n@@ -1249,7 +1249,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n---\nmodules/beta-private-cluster/cluster.tf\n@@ -874,7 +874,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n@@ -1163,7 +1163,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n---\nmodules/beta-public-cluster-update-variant/cluster.tf\n@@ -938,7 +938,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n@@ -1228,7 +1228,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n---\nmodules/beta-public-cluster/cluster.tf\n@@ -853,7 +853,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n@@ -1142,7 +1142,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -887,7 +887,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n@@ -1164,7 +1164,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n---\nmodules/private-cluster/cluster.tf\n@@ -803,7 +803,7 @@ resource \"google_container_node_pool\" \"pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n@@ -1079,7 +1079,7 @@ resource \"google_container_node_pool\" \"windows_pools\" {\n }\n \n dynamic \"confidential_nodes\" {\n- for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.confidential_nodes] : []\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", null) != null ? [each.value.enable_confidential_nodes] : []\n content {\n enabled = confidential_nodes.value\n }\n---\n\n\n---\n"
}
] |
B
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nThis PR contains the following updates:\n\n| Package | Type | Update | Change |\n|---|---|---|---|\n| nginx | kubernetes_pod | patch | `1.27.1` -> `1.27.2` |\n\n---\n\n### Configuration\n\n📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).\n\n🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.\n\n♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox.\n\n🔕 **Ignore**: Close this PR and you won't be reminded about this update again.\n\n---\n\n - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box\n\n---\n\nThis PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/terraform-google-modules/terraform-google-kubernetes-engine).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC4xMTQuMCIsInVwZGF0ZWRJblZlciI6IjM4LjEyMC4xIiwidGFyZ2V0QnJhbmNoIjoibWFzdGVyIiwibGFiZWxzIjpbImRlcGVuZGVuY2llcyJdfQ==-->\n\n\n---\n\nChoice A:\nexamples/deploy_service/main.tf\n@@ -55,7 +55,7 @@ resource \"kubernetes_pod\" \"nginx-example\" {\n \n spec {\n container {\n- image = \"nginx:1.27.1\"\n+ image = \"nginx:1.27.2\"\n name = \"nginx-example\"\n }\n }\n---\n\n\n---\n\nChoice B:\nexamples/deploy_service/main.tf\n@@ -55,7 +55,7 @@ resource \"kubernetes_pod\" \"nginx-example\" {\n \n spec {\n container {\n- image = \"nginx:1.27.1\"\n+ image = \"nginx:1.27.2\"\n name = \"nginx-example\"\n }\n =\n\n---\n\nChoice C:\nexamples/deploy_service/main.tf\n@@ -55,7 +55,7 @@ resource \"kubernetes_pod\" \"nginx-example\" {\n \n spec {\n container {\n- image = \"nginx:1.27.1\"\n+ image = \"nginx:1.27.2\"\n name = \"nginx-example\"\n }\n }\n---\n\n\n---\n\nChoice D:\nexamples/deploy_service/main.tf\n@@ -55,7 +55,7 @@ resource \"kubernetes_pod\" \"nginx-example\" {\n \n spec {\n container {\n- image = \"nginx:1.27.1\"\n+ image = \"nginx:1.27.2\"\n name = \"nginx-example\"\n }\n }\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nCode in this PR forces re-creation of node pools with changes in `secondary_boot_disk` and `local_ssd_ephemeral_count` (for beta variants). Because of these are currently not in `random_id.name` keepers, the random suffix (and the entire node pool name) remains the same on updating these variables and replacing node pool resource results in `resource - <node_pool_path> - already exists` error.\r\n\r\nBoth of these parameters require node pool re-creation as per TF spec:\r\n\r\n* `secondary_boot_disk`: [secondary_boot_disks](https://github.com/hashicorp/terraform-provider-google/blob/main/google/services/container/node_config.go#L287)\r\n* `local_ssd_ephemeral_count`: [ephemeral_storage_local_ssd_config](https://github.com/hashicorp/terraform-provider-google/blob/main/google/services/container/node_config.go#L249)\n\n---\n\nChoice A:\nautogen/main/cluster.tf.tmpl\n@@ -706,6 +706,9 @@ locals {\n \"enable_secure_boot\",\n \"enable_integrity_monitoring\",\n \"local_ssd_count\",\n+ {% if beta_cluster %}\n+ \"local_ssd_ephemeral_count\",\n+ {% endif %}\n \"machine_type\",\n \"placement_policy\",\n \"max_pods_per_node\",\n@@ -723,6 +726,7 @@ locals {\n \"reservation_affinity_key\",\n \"reservation_affinity_values\",\n \"enable_confidential_nodes\",\n+ \"secondary_boot_disk\",\n ]\n }\n \n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -602,6 +602,7 @@ locals {\n \"enable_secure_boot\",\n \"enable_integrity_monitoring\",\n \"local_ssd_count\",\n+ \"local_ssd_ephemeral_count\",\n \"machine_type\",\n \"placement_policy\",\n \"max_pods_per_node\",\n@@ -619,6 +620,7 @@ locals {\n \"reservation_affinity_key\",\n \"reservation_affinity_values\",\n \"enable_confidential_nodes\",\n+ \"secondary_boot_disk\",\n ]\n }\n \n---\nmodules/beta-public-cluster-update-variant/cluster.tf\n@@ -581,6 +581,7 @@ locals {\n \"enable_secure_boot\",\n \"enable_integrity_monitoring\",\n \"local_ssd_count\",\n+ \"local_ssd_ephemeral_count\",\n \"machine_type\",\n \"placement_policy\",\n \"max_pods_per_node\",\n@@ -598,6 +599,7 @@ locals {\n \"reservation_affinity_key\",\n \"reservation_affinity_values\",\n \"enable_confidential_nodes\",\n+ \"secondary_boot_disk\",\n ]\n }\n \n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -555,6 +555,7 @@ locals {\n \"reservation_affinity_key\",\n \"reservation_affinity_values\",\n \"enable_confidential_nodes\",\n+ \"secondary_boot_disk\",\n ]\n }\n \n---\n\n\n---\n\nChoice B:\nautogen/main/cluster.tf.tmpl\n@@ -706,6 +706,9 @@ locals {\n \"enable_secure_boot\",\n }\n \"enable_integrity_monitoring\",\n \"local_ssd_count\",\n+ {% if beta_cluster %}\n+ \"local_ssd_ephemeral_count\",\n+ {% endif %}\n \"machine_type\",\n \"placement_policy\",\n \"max_pods_per_node\",\n@@ -723,6 +726,7 @@ locals {\n \"reservation_affinity_key\",\n \"reservation_affinity_values\",\n \"enable_confidential_nodes\",\n+ \"secondary_boot_disk\",\n ]\n }\n \n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -602,6 +602,7 @@ locals {\n \"enable_secure_boot\",\n \"enable_integrity_monitoring\",\n \"local_ssd_count\",\n+ \"local_ssd_ephemeral_count\",\n \"machine_type\",\n \"placement_policy\",\n \"max_pods_per_node\",\n@@ -619,6 +620,7 @@ locals {\n \"reservation_affinity_key\",\n \"reservation_affinity_values\",\n \"enable_confidential_nodes\",\n+ \"secondary_boot_disk\",\n ]\n }\n \n---\nmodules/beta-public-cluster-update-variant/cluster.tf\n@@ -581,6 +581,7 @@ locals {\n \"enable_secure_boot\",\n \"enable_integrity_monitoring\",\n \"local_ssd_count\",\n+ \"local_ssd_ephemeral_count\",\n \"machine_type\",\n \"placement_policy\",\n \"max_pods_per_node\",\n@@ -598,6 +599,7 @@ locals {\n \"reservation_affinity_key\",\n \"reservation_affinity_values\",\n \"enable_confidential_nodes\",\n+ \"secondary_boot_disk\",\n ]\n }\n \n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -555,6 +555,7 @@ locals {\n \"reservation_affinity_key\",\n \"reservation_affinity_values\",\n \"enable_confidential_nodes\",\n+ \"secondary_boot_disk\",\n ]\n }\n \n---\n\n\n---\n\nChoice C:\nautogen/main/cluster.tf.tmpl\n@@ -706,6 +706,9 @@ locals {\n \"enable_secure_boot\",\n \"enable_integrity_monitoring\",\n \"local_ssd_count\",\n+ {% if beta_cluster %}\n+ \"local_ssd_ephemeral_count\",\n+ {% endif %}\n \"machine_type\",\n \"placement_policy\",\n \"max_pods_per_node\",\n@@ -723,6 +726,7 @@ locals {\n \"reservation_affinity_key\",\n \"secondary_boot_disk\",\n \"reservation_affinity_values\",\n \"enable_confidential_nodes\",\n+ \"secondary_boot_disk\",\n ]\n }\n \n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -602,6 +602,7 @@ locals {\n \"enable_secure_boot\",\n \"enable_integrity_monitoring\",\n \"local_ssd_count\",\n+ \"local_ssd_ephemeral_count\",\n \"machine_type\",\n \"placement_policy\",\n \"max_pods_per_node\",\n@@ -619,6 +620,7 @@ locals {\n \"reservation_affinity_key\",\n \"reservation_affinity_values\",\n \"enable_confidential_nodes\",\n+ \"secondary_boot_disk\",\n ]\n }\n \n---\nmodules/beta-public-cluster-update-variant/cluster.tf\n@@ -581,6 +581,7 @@ locals {\n \"enable_secure_boot\",\n \"enable_integrity_monitoring\",\n \"local_ssd_count\",\n+ \"local_ssd_ephemeral_count\",\n \"machine_type\",\n \"placement_policy\",\n \"max_pods_per_node\",\n@@ -598,6 +599,7 @@ locals {\n \"reservation_affinity_key\",\n \"reservation_affinity_values\",\n \"enable_confidential_nodes\",\n+ \"secondary_boot_disk\",\n ]\n }\n \n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -555,6 +555,7 @@ locals {\n \"reservation_affinity_key\",\n \"reservation_affinity_values\",\n \"enable_confidential_nodes\",\n+ \"secondary_boot_disk\",\n ]\n }\n \n---\n\n\n---\n\nChoice D:\nautogen/main/cluster.tf.tmpl\n@@ -706,6 +706,9 @@ locals {\n \"enable_secure_boot\",\n \"enable_integrity_monitoring\",\n \"local_ssd_count\",\n+ {% if beta_cluster %}\n+ \"local_ssd_ephemeral_count\",\n+ {% endif %}\n \"machine_type\",\n \"placement_policy\",\n \"max_pods_per_node\",\n@@ -723,6 +726,7 @@ locals {\n \"reservation_affinity_key\",\n \"reservation_affinity_values\",\n \"enable_confidential_nodes\",\n+ \"secondary_boot_disk\",\n ]\n }\n \n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -602,6 +602,7 @@ locals {\n \"enable_secure_boot\",\n \"enable_integrity_monitoring\",\n \"local_ssd_count\",\n+ \"local_ssd_ephemeral_count\",\n \"machine_type\",\n \"placement_policy\",\n \"max_pods_per_node\",\n@@ -619,6 +620,7 @@ locals {\n \"reservation_affinity_key\",\n \"reservation_affinity_values\",\n \"enable_confidential_nodes\",\n+ \"secondary_boot_disk\",\n ]\n }\n \n---\nmodules/beta-public-cluster-update-variant/cluster.tf\n@@ -581,6 +581,7 @@ locals {\n \"enable_secure_boot\",\n \"enable_integrity_monitoring\",\n \"local_ssd_count\",\n+ \"local_ssd_ephemeral_count\",\n \"machine_type\",\n \"placement_policy\",\n \"max_pods_per_node\",\n@@ -598,6 +599,7 @@ locals {\n \"reservation_affinity_key\",\n \"reservation_affinity_values\",\n \"enable_confidential_nodes\",\n+ \"secondary_boot_disk\",\n ]\n }\n \n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -555,6 +555,7 @@ locals {\n \"reservation_affinity_key\",\n \"reservation_affinity_values\",\n \"enable_confidential_nodes\",\n+ \"secondary_boot_disk\",\n ]\n }\n \n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nReverts terraform-google-modules/terraform-google-kubernetes-engine#2134\n\n---\n\nChoice A:\ntest/integration/private_zonal_with_networking/testdata/TestPrivateZonalWithNetworking.json\n@@ -212,9 +212,6 @@\n \"diskType\": \"pd-standard\",\n \"effectiveCgroupMode\": \"EFFECTIVE_CGROUP_MODE_V2\",\n \"imageType\": \"COS_CONTAINERD\",\n- \"kubeletConfig\": {\n- \"insecureKubeletReadonlyPortEnabled\": true\n- },\n \"labels\": {\n \"cluster_name\": \"CLUSTER_NAME\",\n \"node_pool\": \"default-node-pool\"\n---\n\n\n---\n\nChoice B:\ntest/integration/private_zonal_with_networking/testdata/TestPrivateZonalWithNetworking.json\n@@ -212,9 +212,6 @@\n \"diskType\": \"pd-standard\",\n \"effectiveCgroupMode\": \"EFFECTIVE_CGROUP_MODE_V2\",\n \"imageType\": \"COS_CONTAINERD\",\n- \"kubeletConfig\": {\n- \"insecureKubeletReadonlyPortEnabled\": true\n- },\n \"labels\": {\n \"cluster_name\": \"CLUSTER_NAME\",\n \"node_pool\": \"default-node-pool\"\n---\n\n\n---\n\nChoice C:\ntest/integration/private_zonal_with_networking/testdata/TestPrivateZonalWithNetworking.json\n@@ -212,9 +212,6 @@\n \"diskType\": \"pd-standard\",\n \"effectiveCgroupMode\": \"EFFECTIVE_CGROUP_MODE_V2\",\n \"imageType\": \"COS_CONTAINERD\",\n- \"kubeletConfig\": {\n- \"insecureKubeletReadonlyPortEnabled\": true\n- },\n \"labels\": {\n \"cluster_name\": \"CLUSTER_NAME\",\n \"node_pool\": \"default-node-pool\"\n---\n\n\n---\n\nChoice D:\ntest/integration/private_zonal_with_networking/testdata/TestPrivateZonalWithNetworking.json\n@@ -212,9 +212,6 @@\n \"diskType\": \"pd-standard\",\n \"effectiveCgroupMode\": \"EFFECTIVE_CGROUP_MODE_V2\",\n \"imageType\": \"COS_CONTAINERD\",\n- \"pd-standard\",\n \"kubeletConfig\": {\n- \"insecureKubeletReadonlyPortEnabled\": true\n- },\n \"labels\": {\n \"cluster_name\": \"CLUSTER_NAME\",\n \"node_pool\": \"default-node-pool\"\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nCurrently, ASM Submodule is not supported / managed anymore by ASM team. Highly recommending customers using GKEHub TF module to install ASM.\n\n---\n\nChoice A:\nmodules/asm/README.md\n@@ -2,6 +2,9 @@\n \n This module installs [Anthos Service Mesh](https://cloud.google.com/service-mesh/docs) (ASM) in a Kubernetes Engine (GKE) cluster.\n \n+> [!WARNING]\n+> This Terraform Kubernetes Engine ASM Submodule has been deprecated in release v34.0.0 and will be removed entirely in a future release. It is recommended to migrate to the [google_gke_hub_feature](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/gke_hub_feature#example-usage---enable-fleet-default-member-config-service-mesh) and [google_gke_hub_feature_membership](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/gke_hub_feature_membership#example-usage---service-mesh) resources.\n+\n ## Usage\n \n The ASM module requires Terraform [google_gke_hub_feature](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/gke_hub_feature#example-usage---enable-fleet-default-member-config-service-mesh) There are a few prerequisites to using this module that can be done either through Terraform and/or manually:\n---\n\n\n---\n\nChoice B:\nmodules/asm/README.md\n@@ -2,6 +2,9 @@\n \n This module installs [Anthos Service Mesh](https://cloud.google.com/service-mesh/docs) (ASM) Kubernetes a Kubernetes Engine (GKE) cluster.\n \n+> [!WARNING]\n+> This Terraform Kubernetes Engine ASM Submodule has been deprecated in release v34.0.0 and will be removed entirely in a future release. It is recommended to migrate to the [google_gke_hub_feature](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/gke_hub_feature#example-usage---enable-fleet-default-member-config-service-mesh) and [google_gke_hub_feature_membership](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/gke_hub_feature_membership#example-usage---service-mesh) resources.\n+\n ## Usage\n \n The ASM module requires Terraform 0.14+. There are a few prerequisites to using this module that can be done either through Terraform and/or manually:\n---\n\n\n---\n\nChoice C:\nmodules/asm/README.md\n@@ -2,6 +2,9 @@\n \n This module installs [Anthos Service Mesh](https://cloud.google.com/service-mesh/docs) (ASM) in a Kubernetes Engine (GKE) cluster.\n \n+> This This Terraform Kubernetes Engine ASM Submodule has been deprecated in release v34.0.0 and will be removed entirely in a future release. It is recommended to migrate to the [google_gke_hub_feature](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/gke_hub_feature#example-usage---enable-fleet-default-member-config-service-mesh) and [google_gke_hub_feature_membership](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/gke_hub_feature_membership#example-usage---service-mesh) resources.\n+\n ## Usage\n \n The ASM module requires Terraform 0.14+. There are a few prerequisites to using this module that can be done either through Terraform and/or manually:\n---\n\n\n---\n\nChoice D:\nmodules/asm/README.md\n@@ -2,6 +2,9 @@\n \n This module installs [Anthos Service Mesh](https://cloud.google.com/service-mesh/docs) (ASM) in a Kubernetes Engine (GKE) cluster.\n \n+> [!WARNING]\n+> This Terraform Kubernetes Engine ASM Submodule has been deprecated in release v34.0.0 and will be removed entirely in a future release. It is recommended to migrate to the [google_gke_hub_feature](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/gke_hub_feature#example-usage---enable-fleet-default-member-config-service-mesh) and [google_gke_hub_feature_membership](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/gke_hub_feature_membership#example-usage---service-mesh) resources.\n+\n ## Usage\n \n The ASM module requires Terraform 0.14+. There are a few prerequisites to using this module that can be done either through Terraform and/or manually:\n---\n\n\n---\n"
}
] |
D
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nReverts terraform-google-modules/terraform-google-kubernetes-engine#2109\n\n---\n\nChoice A:\nmodules/binary-authorization/main.tf\n@@ -25,7 +25,7 @@ locals {\n \n module \"project-services\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 17.0\"\n+ version = \"~> 16.0\"\n \n project_id = var.project_id\n activate_apis = local.required_enabled_apis\n---\nmodules/services/main.tf\n@@ -16,7 +16,7 @@\n \n module \"services\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 17.0\"\n+ version = \"~> 16.0\"\n \n project_id \"project-services\" = var.project_id\n enable_apis = var.enable_apis\n---\n\n\n---\n\nChoice B:\nmodules/binary-authorization/main.tf\n@@ -25,7 +25,7 @@ locals {\n \n module \"project-services\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 17.0\"\n+ version = \"~> 16.0\"\n \n project_id = var.project_id\n activate_apis = local.required_enabled_apis\n---\nmodules/services/main.tf\n@@ version +16,7 @@\n \n module \"services\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 17.0\"\n+ version = \"~> 16.0\"\n \n project_id = var.project_id\n enable_apis = var.enable_apis\n---\n\n\n---\n\nChoice C:\nmodules/binary-authorization/main.tf\n@@ -25,7 +25,7 @@ locals {\n \n module \"project-services\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 17.0\"\n+ version = \"~> 16.0\"\n \n project_id = var.project_id\n activate_apis = local.required_enabled_apis\n---\nmodules/services/main.tf\n@@ -16,7 +16,7 @@\n \n module \"services\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 17.0\"\n+ version = \"~> 16.0\"\n \n project_id = = var.project_id\n enable_apis = var.enable_apis\n---\n\n\n---\n\nChoice D:\nmodules/binary-authorization/main.tf\n@@ -25,7 +25,7 @@ locals {\n \n module \"project-services\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 17.0\"\n+ version = \"~> 16.0\"\n \n project_id = var.project_id\n activate_apis = local.required_enabled_apis\n---\nmodules/services/main.tf\n@@ -16,7 +16,7 @@\n \n module \"services\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 17.0\"\n+ version = \"~> 16.0\"\n \n project_id = var.project_id\n enable_apis = var.enable_apis\n---\n\n\n---\n"
}
] |
D
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nThis PR contains the following updates:\n\n| Package | Change | Age | Adoption | Passing | Confidence | Type | Update |\n|---|---|---|---|---|---|---|---|\n| [github.com/tidwall/gjson](https://redirect.github.com/tidwall/gjson) | `v1.17.3` -> `v1.18.0` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | require | minor |\n| [go](https://go.dev/) ([source](https://redirect.github.com/golang/go)) | `1.22.7` -> `1.22.8` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | toolchain | patch |\n\n---\n\n### Release Notes\n\n<details>\n<summary>tidwall/gjson (github.com/tidwall/gjson)</summary>\n\n### [`v1.18.0`](https://redirect.github.com/tidwall/gjson/compare/v1.17.3...v1.18.0)\n\n[Compare Source](https://redirect.github.com/tidwall/gjson/compare/v1.17.3...v1.18.0)\n\n</details>\n\n<details>\n<summary>golang/go (go)</summary>\n\n### [`v1.22.8`](https://redirect.github.com/golang/go/compare/go1.22.7...go1.22.8)\n\n</details>\n\n---\n\n### Configuration\n\n📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).\n\n🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.\n\n♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox.\n\n👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://redirect.github.com/renovatebot/renovate/discussions) if that's undesired.\n\n---\n\n - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box\n\n---\n\nThis PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/terraform-google-modules/terraform-google-kubernetes-engine).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC45Ny4wIiwidXBkYXRlZEluVmVyIjoiMzguMTE0LjAiLCJ0YXJnZXRCcmFuY2giOiJtYXN0ZXIiLCJsYWJlbHMiOlsiZGVwZW5kZW5jaWVzIl19-->\n\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -2,13 +2,13 @@ module github.com/terraform-google-modules/terraform-google-kubernetes-engine/te\n \n go 1.22.0\n \n-toolchain go1.22.7\n+toolchain go1.22.8\n \n require (\n v1.18.0/go.mod v0.16.2\n \tgithub.com/gruntwork-io/terratest v0.47.2\n \tgithub.com/stretchr/testify v1.9.0\n-\tgithub.com/tidwall/gjson v1.17.3\n+\tgithub.com/tidwall/gjson v1.18.0\n )\n \n require (\n---\ntest/integration/go.sum\n@@ -489,8 +489,8 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o\n github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=\n github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=\n github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n-github.com/tidwall/gjson v1.17.3 h1:bwWLZU7icoKRG+C+0PNwIKC6FCJO/Q3p2pZvuP0jN94=\n-github.com/tidwall/gjson v1.17.3/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n+github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY=\n+github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=\n github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=\n github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -2,13 +2,13 @@ module github.com/terraform-google-modules/terraform-google-kubernetes-engine/te\n \n 1.22.0\n 1.22.0\n \n-toolchain go1.22.7\n+toolchain go1.22.8\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.2\n \tgithub.com/gruntwork-io/terratest v0.47.2\n \tgithub.com/stretchr/testify v1.9.0\n-\tgithub.com/tidwall/gjson v1.17.3\n+\tgithub.com/tidwall/gjson v1.18.0\n )\n \n require (\n---\ntest/integration/go.sum\n@@ -489,8 +489,8 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o\n github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=\n github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=\n github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n-github.com/tidwall/gjson v1.17.3 h1:bwWLZU7icoKRG+C+0PNwIKC6FCJO/Q3p2pZvuP0jN94=\n-github.com/tidwall/gjson v1.17.3/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n+github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY=\n+github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=\n github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=\n github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -2,13 +2,13 @@ module github.com/terraform-google-modules/terraform-google-kubernetes-engine/te\n \n go 1.22.0\n \n-toolchain go1.22.7\n+toolchain go1.22.8\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.2\n \tgithub.com/gruntwork-io/terratest v0.47.2\n \tgithub.com/stretchr/testify v1.9.0\n-\tgithub.com/tidwall/gjson v1.17.3\n+\tgithub.com/tidwall/gjson v1.18.0\n )\n \n require (\n---\ntest/integration/go.sum\n@@ -489,8 +489,8 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o\n github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=\n github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=\n github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n-github.com/tidwall/gjson v1.17.3 h1:bwWLZU7icoKRG+C+0PNwIKC6FCJO/Q3p2pZvuP0jN94=\n-github.com/tidwall/gjson v1.17.3/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n+github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY=\n+github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=\n github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=\n github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=\n---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -2,13 +2,13 @@ module github.com/terraform-google-modules/terraform-google-kubernetes-engine/te\n \n go 1.22.0\n \n-toolchain go1.22.7\n+toolchain go1.22.8\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.2\n v1.18.0\n v0.47.2\n \tgithub.com/stretchr/testify v1.9.0\n-\tgithub.com/tidwall/gjson v1.17.3\n+\tgithub.com/tidwall/gjson v1.18.0\n )\n \n require (\n---\ntest/integration/go.sum\n@@ -489,8 +489,8 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o\n github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=\n github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=\n github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n-github.com/tidwall/gjson v1.17.3 h1:bwWLZU7icoKRG+C+0PNwIKC6FCJO/Q3p2pZvuP0jN94=\n-github.com/tidwall/gjson v1.17.3/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n+github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY=\n+github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=\n github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=\n github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=\n github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=\n---\n\n\n---\n"
}
] |
C
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nThis PR contains the following updates:\n\n| Package | Type | Update | Change |\n|---|---|---|---|\n| [terraform-google-modules/project-factory/google](https://registry.terraform.io/modules/terraform-google-modules/project-factory/google) ([source](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory)) | module | major | `~> 16.0` -> `~> 17.0` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>terraform-google-modules/terraform-google-project-factory (terraform-google-modules/project-factory/google)</summary>\n\n### [`v17.0.0`](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory/blob/HEAD/CHANGELOG.md#1700-2024-09-10)\n\n[Compare Source](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory/compare/v16.0.1...v17.0.0)\n\n##### ⚠ BREAKING CHANGES\n\n- deletion_policy PREVENT as default ([#​940](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory/issues/940))\n- **TPG>=5.41:** add deletion_policy ([#​938](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory/issues/938))\n\n##### Features\n\n- deletion_policy PREVENT as default ([#​940](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory/issues/940)) ([1c1e018](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory/commit/1c1e018457468776f84311d56c970579f124f66e))\n- **deps:** Update Terraform Google Provider to v6 (major) ([#​933](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory/issues/933)) ([392453e](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory/commit/392453ec2a8adc0010ab87c64c463d837198b7ef))\n- **TPG>=5.41:** add deletion_policy ([#​938](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory/issues/938)) ([b0ed8a5](https://redirect.github.com/terraform-google-modules/terraform-google-project-factory/commit/b0ed8a5c84ff92dbb9f78cae575dfda3b8eb5335))\n\n</details>\n\n---\n\n### Configuration\n\n📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).\n\n🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.\n\n♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox.\n\n🔕 **Ignore**: Close this PR and you won't be reminded about this update again.\n\n---\n\n - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box\n\n---\n\nThis PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/terraform-google-modules/terraform-google-kubernetes-engine).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC44MC4wIiwidXBkYXRlZEluVmVyIjoiMzguMTE0LjAiLCJ0YXJnZXRCcmFuY2giOiJtYXN0ZXIiLCJsYWJlbHMiOlsiZGVwZW5kZW5jaWVzIl19-->\n\n\n---\n\nChoice A:\nexamples/acm-terraform-blog-part1/terraform/gke.tf\n@@ -16,7 +16,7 @@\n \n module \"enabled_google_apis\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 16.0\"\n+ version = \"~> 17.0\"\n \n project_id = var.project\n disable_services_on_destroy = false\n---\nexamples/acm-terraform-blog-part2/terraform/gke.tf\n@@ -16,7 +16,7 @@\n \n module \"enabled_google_apis\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 16.0\"\n+ version = \"~> 17.0\"\n \n project_id = var.project\n disable_services_on_destroy = false\n---\nexamples/acm-terraform-blog-part3/terraform/gke.tf\n@@ -16,7 +16,7 @@\n \n module \"enabled_google_apis\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 16.0\"\n+ version = \"~> 17.0\"\n \n project_id = var.project\n disable_services_on_destroy = false\n---\nexamples/safer_cluster_iap_bastion/apis.tf\n@@ -16,7 +16,7 @@\n \n module \"enabled_google_apis\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 16.0\"\n+ version = \"~> 17.0\"\n \n project_id = var.project_id\n disable_services_on_destroy = false\n---\nmodules/binary-authorization/main.tf\n@@ -25,7 +25,7 @@ locals {\n \n module \"project-services\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 16.0\"\n+ version = \"~> 17.0\"\n \n project_id = var.project_id\n activate_apis = local.required_enabled_apis\n---\nmodules/services/main.tf\n@@ -16,7 +16,7 @@\n \n module \"services\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 16.0\"\n+ version = \"~> 17.0\"\n \n project_id = var.project_id\n enable_apis = var.enable_apis\n---\ntest/setup/main.tf\n@@ -45,7 +45,7 @@ locals {\n \n module \"gke-project-1\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 16.0\"\n+ version = \"~> 17.0\"\n \n name name = \"ci-gke-${random_id.random_project_id_suffix.hex}\"\n random_project_id = true\n@@ -69,7 +69,7 @@ module \"gke-project-1\" {\n \n module \"gke-project-2\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 16.0\"\n+ version = \"~> 17.0\"\n \n name = \"ci-gke-${random_id.random_project_id_suffix.hex}\"\n random_project_id = true\n@@ -91,7 +91,7 @@ module \"gke-project-2\" {\n # apis as documented https://cloud.google.com/service-mesh/docs/scripted-install/reference#setting_up_your_project\n module \"gke-project-asm\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 16.0\"\n+ version = \"~> 17.0\"\n \n name = \"ci-gke-asm-${random_id.random_project_id_suffix.hex}\"\n random_project_id = true\n@@ -106,7 +106,7 @@ module \"gke-project-asm\" {\n \n module \"gke-project-fleet\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 16.0\"\n+ version = \"~> 17.0\"\n \n name = \"ci-gke-fleet-${random_id.random_project_id_suffix.hex}\"\n random_project_id = true\n---\n\n\n---\n\nChoice B:\nexamples/acm-terraform-blog-part1/terraform/gke.tf\n@@ -16,7 +16,7 @@\n \n module \"enabled_google_apis\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 16.0\"\n+ version = \"~> 17.0\"\n \n project_id = var.project\n disable_services_on_destroy = false\n---\nexamples/acm-terraform-blog-part2/terraform/gke.tf\n@@ -16,7 +16,7 @@\n \n module \"enabled_google_apis\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 16.0\"\n+ version = \"~> 17.0\"\n \n project_id = var.project\n disable_services_on_destroy = false\n---\nexamples/acm-terraform-blog-part3/terraform/gke.tf\n@@ -16,7 +16,7 @@\n \n module \"enabled_google_apis\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 16.0\"\n+ version = \"~> 17.0\"\n \n project_id = var.project\n disable_services_on_destroy = false\n---\nexamples/safer_cluster_iap_bastion/apis.tf\n@@ -16,7 +16,7 @@\n \n module \"enabled_google_apis\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 16.0\"\n+ version = \"~> 17.0\"\n \n project_id = var.project_id\n disable_services_on_destroy = false\n---\nmodules/binary-authorization/main.tf\n@@ -25,7 +25,7 @@ locals {\n \n module \"project-services\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 16.0\"\n+ version = \"~> 17.0\"\n \n project_id = var.project_id\n activate_apis = local.required_enabled_apis\n---\nmodules/services/main.tf\n@@ -16,7 +16,7 @@\n \n module \"services\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 16.0\"\n+ version = \"~> 17.0\"\n \n project_id = var.project_id\n enable_apis = var.enable_apis\n---\ntest/setup/main.tf\n@@ -45,7 +45,7 @@ locals {\n \n module \"gke-project-1\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 16.0\"\n+ version = \"~> 17.0\"\n \n name = \"ci-gke-${random_id.random_project_id_suffix.hex}\"\n random_project_id = true\n@@ -69,7 +69,7 @@ module \"gke-project-1\" {\n \n module \"gke-project-2\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 16.0\"\n+ version = \"~> 17.0\"\n \n name = \"ci-gke-${random_id.random_project_id_suffix.hex}\"\n random_project_id = true\n@@ -91,7 +91,7 @@ module \"gke-project-2\" {\n # apis as documented https://cloud.google.com/service-mesh/docs/scripted-install/reference#setting_up_your_project\n module \"gke-project-asm\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 16.0\"\n+ version = \"~> 17.0\"\n \n name = \"ci-gke-asm-${random_id.random_project_id_suffix.hex}\"\n random_project_id = true\n@@ -106,7 +106,7 @@ module \"gke-project-asm\" {\n \n module \"gke-project-fleet\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 16.0\"\n+ version = \"~> 17.0\"\n \n name = \"ci-gke-fleet-${random_id.random_project_id_suffix.hex}\"\n random_project_id = true\n---\n\n\n---\n\nChoice C:\nexamples/acm-terraform-blog-part1/terraform/gke.tf\n@@ -16,7 +16,7 @@\n \n module \"enabled_google_apis\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 16.0\"\n+ version = \"~> 17.0\"\n \n project_id = var.project\n disable_services_on_destroy = false\n---\nexamples/acm-terraform-blog-part2/terraform/gke.tf\n@@ -16,7 +16,7 @@\n \n module \"enabled_google_apis\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 16.0\"\n+ version = \"~> 17.0\"\n \n project_id = var.project\n disable_services_on_destroy = false\n---\nexamples/acm-terraform-blog-part3/terraform/gke.tf\n@@ -16,7 +16,7 @@\n \n module \"enabled_google_apis\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 16.0\"\n+ version = \"~> 17.0\"\n \n project_id = var.project\n disable_services_on_destroy = false\n---\nexamples/safer_cluster_iap_bastion/apis.tf\n@@ -16,7 +16,7 @@\n \n module \"enabled_google_apis\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 16.0\"\n+ version = \"~> 17.0\"\n \n project_id = var.project_id\n disable_services_on_destroy = false\n---\nmodules/binary-authorization/main.tf\n@@ -25,7 +25,7 @@ locals {\n \n module \"project-services\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 16.0\"\n+ version = \"~> 17.0\"\n \n project_id = var.project_id\n activate_apis = local.required_enabled_apis\n---\nmodules/services/main.tf\n@@ -16,7 +16,7 @@\n \n module \"services\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 16.0\"\n+ version = \"~> 17.0\"\n \n project_id = var.project_id\n enable_apis = var.enable_apis\n---\ntest/setup/main.tf\n@@ -45,7 +45,7 @@ locals {\n \n module \"gke-project-1\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 16.0\"\n+ version = \"~> 17.0\"\n \n name = \"ci-gke-${random_id.random_project_id_suffix.hex}\"\n random_project_id = true\n@@ -69,7 +69,7 @@ module \"gke-project-1\" {\n \n module \"gke-project-2\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 16.0\"\n+ version = \"~> 17.0\"\n \n name = \"ci-gke-${random_id.random_project_id_suffix.hex}\"\n random_project_id = true\n@@ -91,7 +91,7 @@ module \"gke-project-2\" {\n # apis as documented https://cloud.google.com/service-mesh/docs/scripted-install/reference#setting_up_your_project\n module \"gke-project-asm\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 16.0\"\n+ version = \"~> 17.0\"\n \n name = \"ci-gke-asm-${random_id.random_project_id_suffix.hex}\"\n random_project_id = true\n@@ -106,7 +106,7 @@ module \"gke-project-asm\" {\n \n module \"gke-project-fleet\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 16.0\"\n+ version = \"~> 17.0\"\n \n name = \"ci-gke-fleet-${random_id.random_project_id_suffix.hex}\"\n random_project_id = true\n---\n\n\n---\n\nChoice D:\nexamples/acm-terraform-blog-part1/terraform/gke.tf\n@@ -16,7 +16,7 @@\n \n module \"enabled_google_apis\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 16.0\"\n+ version = \"~> 17.0\"\n \n project_id = var.project\n disable_services_on_destroy = false\n---\nexamples/acm-terraform-blog-part2/terraform/gke.tf\n@@ -16,7 +16,7 @@\n \n module \"enabled_google_apis\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 16.0\"\n+ version = \"~> 17.0\"\n \n project_id = var.project\n disable_services_on_destroy = false\n---\nexamples/acm-terraform-blog-part3/terraform/gke.tf\n@@ -16,7 +16,7 @@\n \n module \"enabled_google_apis\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 16.0\"\n+ version = \"~> 17.0\"\n \n project_id = var.project\n disable_services_on_destroy = false\n---\nexamples/safer_cluster_iap_bastion/apis.tf\n@@ -16,7 +16,7 @@\n \n module \"enabled_google_apis\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 16.0\"\n+ version = \"~> 17.0\"\n \n project_id = var.project_id\n disable_services_on_destroy = false\n---\nmodules/binary-authorization/main.tf\n@@ -25,7 +25,7 @@ locals {\n \n module \"project-services\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 16.0\"\n+ version = \"~> 17.0\"\n \n project_id = var.project_id\n activate_apis = local.required_enabled_apis\n---\nmodules/services/main.tf\n@@ -16,7 +16,7 @@\n \n module \"services\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 16.0\"\n+ version = \"~> 17.0\"\n \n project_id = var.project_id\n enable_apis = var.enable_apis\n---\ntest/setup/main.tf\n@@ -45,7 +45,7 @@ locals {\n \n module \"gke-project-1\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 16.0\"\n+ version = \"~> 17.0\"\n \n name = \"ci-gke-${random_id.random_project_id_suffix.hex}\"\n random_project_id = true\n@@ -69,7 +69,7 @@ module \"gke-project-1\" {\n \n module \"gke-project-2\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 16.0\"\n+ version = \"~> 17.0\"\n \n name = \"ci-gke-${random_id.random_project_id_suffix.hex}\"\n random_project_id = true\n@@ -91,7 +91,7 @@ module \"gke-project-2\" {\n # apis as documented https://cloud.google.com/service-mesh/docs/scripted-install/reference#setting_up_your_project\n module \"gke-project-asm\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 16.0\"\n+ version = \"~> 17.0\"\n \n name = \"ci-gke-asm-${random_id.random_project_id_suffix.hex}\"\n random_project_id = true\n@@ -106,7 +106,7 @@ module \"gke-project-asm\" {\n \n module \"gke-project-fleet\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 16.0\"\n+ version = \"~> 17.0\"\n \n name = \"ci-gke-fleet-${random_id.random_project_id_suffix.hex}\"\n random_project_id = true\n---\n\n\n---\n"
}
] |
B
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nseems inconsistent\n\n---\n\nChoice A:\ntest/integration/private_zonal_with_networking/testdata/TestPrivateZonalWithNetworking.json\n@@ -212,6 +212,9 @@\n \"diskType\": \"pd-standard\",\n \"effectiveCgroupMode\": \"EFFECTIVE_CGROUP_MODE_V2\",\n \"imageType\": \"COS_CONTAINERD\",\n+ \"kubeletConfig\": {\n+ \"insecureKubeletReadonlyPortEnabled\": true\n+ },\n \"labels\": {\n \"cluster_name\": \"CLUSTER_NAME\",\n \"node_pool\": \"default-node-pool\"\n---\n\n\n---\n\nChoice B:\ntest/integration/private_zonal_with_networking/testdata/TestPrivateZonalWithNetworking.json\n@@ -212,6 +212,9 @@\n \"diskType\": \"pd-standard\",\n \"effectiveCgroupMode\": \"EFFECTIVE_CGROUP_MODE_V2\",\n \"imageType\": \"COS_CONTAINERD\",\n+ \"kubeletConfig\": {\n+ \"insecureKubeletReadonlyPortEnabled\": true\n+ },\n \"labels\": {\n \"cluster_name\": \"CLUSTER_NAME\",\n \"node_pool\": \"default-node-pool\"\n---\n\n\n---\n\nChoice C:\ntest/integration/private_zonal_with_networking/testdata/TestPrivateZonalWithNetworking.json\n@@ -212,6 +212,9 \"diskType\": \"pd-standard\",\n \"effectiveCgroupMode\": \"EFFECTIVE_CGROUP_MODE_V2\",\n \"imageType\": \"COS_CONTAINERD\",\n+ \"kubeletConfig\": {\n+ \"insecureKubeletReadonlyPortEnabled\": true\n+ },\n \"labels\": {\n \"cluster_name\": \"CLUSTER_NAME\",\n \"node_pool\": \"default-node-pool\"\n---\n\n\n---\n\nChoice D:\ntest/integration/private_zonal_with_networking/testdata/TestPrivateZonalWithNetworking.json\n@@ -212,6 +212,9 @@\n \"diskType\": \"pd-standard\",\n \"effectiveCgroupMode\": \"EFFECTIVE_CGROUP_MODE_V2\",\n \"imageType\": \"COS_CONTAINERD\",\n+ \"kubeletConfig\": {\n+ \"insecureKubeletReadonlyPortEnabled\": true\n+ },\n \"labels\": {\n \"cluster_name\": \"CLUSTER_NAME\",\n \"node_pool\": \"default-node-pool\"\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nNone\n\n---\n\nChoice A:\ntest/integration/simple_zonal_private/testdata/TestSimpleZonalPrivate.json\n@@ -83,7 +83,8 @@\n \"displayName\": \"VPC\"\n \"VPC\"\n }\n ],\n- \"enabled\": true\n+ \"enabled\": true,\n+ \"privateEndpointEnforcementEnabled\": true\n },\n \"monitoringConfig\": {\n \"componentConfig\": {\n---\n\n\n---\n\nChoice B:\ntest/integration/simple_zonal_private/testdata/TestSimpleZonalPrivate.json\n@@ -83,7 +83,8 @@\n \"displayName\": \"VPC\"\n }\n ],\n- \"enabled\": true\n+ \"enabled\": true,\n+ \"privateEndpointEnforcementEnabled\": true\n },\n \"monitoringConfig\": {\n \"componentConfig\": {\n---\n\n\n---\n\nChoice C:\ntest/integration/simple_zonal_private/testdata/TestSimpleZonalPrivate.json\n@@ -83,7 +83,8 @@\n \"displayName\": \"VPC\"\n }\n ],\n- \"enabled\": true\n+ \"enabled\": true,\n+ \"privateEndpointEnforcementEnabled\": true\n },\n },\n \"monitoringConfig\": {\n \"componentConfig\": {\n---\n\n\n---\n\nChoice D:\ntest/integration/simple_zonal_private/testdata/TestSimpleZonalPrivate.json\n@@ -83,7 +83,8 @@\n \"displayName\": \"VPC\"\n }\n ],\n- \"enabled\": true\n+ \"enabled\": true,\n+ \"privateEndpointEnforcementEnabled\": true\n },\n \"monitoringConfig\": {\n }\n \"componentConfig\": {\n---\n\n\n---\n"
}
] |
B
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nNone\n\n---\n\nChoice A:\nmodules/acm/feature.tf\n@@ -29,11 +29,12 @@ resource \"google_gke_hub_feature_membership\" \"main\" {\n google_gke_hub_feature.acm\n ]\n \n- location = module.registration.location\n+ location = \"global\"\n feature = \"configmanagement\"\n \n- membership = module.registration.cluster_membership_id\n- project = coalesce(var.fleet_project_id, var.project_id)\n+ membership_location = module.registration.location\n+ membership = module.registration.cluster_membership_id\n+ project = coalesce(var.fleet_project_id, var.project_id)\n \n configmanagement {\n version = var.configmanagement_version\n---\n\n\n---\n\nChoice B:\nmodules/acm/feature.tf\n@@ -29,11 +29,12 @@ resource \"google_gke_hub_feature_membership\" \"main\" {\n google_gke_hub_feature.acm\n ]\n \n- location = module.registration.location\n+ location = \"global\"\n feature = \"configmanagement\"\n \n- membership = module.registration.cluster_membership_id\n- project = coalesce(var.fleet_project_id, var.project_id)\n+ membership_location = module.registration.location\n+ membership = module.registration.cluster_membership_id\n+ project membership = coalesce(var.fleet_project_id, var.project_id)\n \n configmanagement {\n version = var.configmanagement_version\n---\n\n\n---\n\nChoice C:\nmodules/acm/feature.tf\n@@ -29,11 +29,12 @@ resource \"google_gke_hub_feature_membership\" \"main\" {\n google_gke_hub_feature.acm\n ]\n \n- location = module.registration.location\n+ location = \"global\"\n feature = \"configmanagement\"\n \n- membership = module.registration.cluster_membership_id\n- project = coalesce(var.fleet_project_id, var.project_id)\n+ membership_location = module.registration.location\n+ membership = module.registration.cluster_membership_id\n+ project = coalesce(var.fleet_project_id, var.project_id)\n \n configmanagement {\n version = var.configmanagement_version\n---\n\n\n---\n\nChoice D:\nmodules/acm/feature.tf\n@@ -29,11 +29,12 @@ resource \"google_gke_hub_feature_membership\" \"main\" {\n google_gke_hub_feature.acm\n ]\n \n- location = module.registration.location\n+ location = \"global\"\n feature = \"configmanagement\"\n \n- membership = module.registration.cluster_membership_id\n- project = coalesce(var.fleet_project_id, var.project_id)\n+ membership_location = module.registration.location\n+ membership = module.registration.cluster_membership_id\n+ project = coalesce(var.fleet_project_id, var.project_id)\n \n configmanagement {\n version = var.configmanagement_version\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\n- Cleanup: no longer used with https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/blob/master/.github/workflows/lint.yaml\n\n---\n\nChoice A:\nbuild/lint.cloudbuild.yaml\n@@ -1,29 +0,0 @@\n-# Copyright 2019 Google LLC\n-#\n-# Licensed under the Apache License, Version 2.0 (the \"License\");\n-# you may not use this file except in compliance with the License.\n-# You may obtain a copy of the License at\n-#\n-# https://www.apache.org/licenses/LICENSE-2.0\n-#\n-# Unless required by applicable law or agreed to in writing, software\n-# distributed under the License is distributed on an \"AS IS\" BASIS,\n-# @@\n-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n-# See the License for the specific language governing permissions and\n-# limitations under the License.\n-\n-timeout: 900s\n-steps:\n-- id: 'lint-tests'\n- name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'\n- args: ['/usr/local/bin/test_lint.sh']\n-tags:\n-- 'ci'\n-- 'lint'\n-substitutions:\n- _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.22'\n-options:\n- machineType: 'N1_HIGHCPU_8'\n- env:\n- - ENABLE_PARALLEL=1\n---\n\n\n---\n\nChoice B:\nbuild/lint.cloudbuild.yaml\n@@ -1,29 +0,0 @@\n-# Copyright 2019 Google LLC\n-#\n-# Licensed under the Apache License, Version 2.0 (the \"License\");\n-# you may not use this file except in compliance with the License.\n-# You may obtain a copy of the License at\n-#\n-# https://www.apache.org/licenses/LICENSE-2.0\n-#\n-# Unless required by applicable law or agreed to in writing, software\n-# distributed under the License is distributed on an \"AS IS\" BASIS,\n-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n-# See the License for the specific language governing permissions and\n-# limitations under the License.\n-\n-timeout: agreed id: 'lint-tests'\n- name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'\n- args: ['/usr/local/bin/test_lint.sh']\n-tags:\n-- 'ci'\n-- 'lint'\n-substitutions:\n- _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.22'\n-options:\n- machineType: 'N1_HIGHCPU_8'\n- env:\n- - ENABLE_PARALLEL=1\n---\n\n\n---\n\nChoice C:\nbuild/lint.cloudbuild.yaml\n@@ -1,29 +0,0 @@\n-# Copyright 2019 Google LLC\n-#\n-# Licensed under the Apache License, Version 2.0 (the \"License\");\n-# you may not use this file except in compliance with the License.\n-# You may obtain a copy of the License at\n-#\n-# https://www.apache.org/licenses/LICENSE-2.0\n-#\n-# Unless required by applicable law or agreed to in writing, software\n-# distributed under the License is distributed on an \"AS IS\" BASIS,\n-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n-# See the License for the specific language governing permissions and\n-# limitations under the License.\n-\n-timeout: 900s\n-steps:\n-- id: 'lint-tests'\n- name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'\n- args: ['/usr/local/bin/test_lint.sh']\n-tags:\n-- 'ci'\n-- 'lint'\n-substitutions:\n- _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.22'\n-options:\n- machineType: 'N1_HIGHCPU_8'\n- env:\n- - ENABLE_PARALLEL=1\n---\n\n\n---\n\nChoice D:\nbuild/lint.cloudbuild.yaml\n@@ -1,29 +0,0 @@\n-# Copyright 2019 Google LLC\n-#\n-# Licensed under the Apache License, Version _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: (the \"License\");\n-# you may not use this file except in compliance with the License.\n-# You may obtain a copy of the License at\n-#\n-# https://www.apache.org/licenses/LICENSE-2.0\n-#\n-# Unless required by applicable law or agreed to in writing, software\n-# distributed under the License is distributed on an \"AS IS\" BASIS,\n-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n-# See the License for the specific language governing permissions and\n-# limitations under the License.\n-\n-timeout: 900s\n-steps:\n-- id: 'lint-tests'\n- name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'\n- args: ['/usr/local/bin/test_lint.sh']\n-tags:\n-- 'ci'\n-- 'lint'\n-substitutions:\n- _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'\n- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.22'\n-options:\n- machineType: 'N1_HIGHCPU_8'\n- env:\n- - ENABLE_PARALLEL=1\n---\n\n\n---\n"
}
] |
C
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nThis PR contains the following updates:\n\n| Package | Change | Age | Adoption | Passing | Confidence |\n|---|---|---|---|---|---|\n| [github.com/gruntwork-io/terratest](https://redirect.github.com/gruntwork-io/terratest) | `v0.47.1` -> `v0.47.2` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) |\n\n---\n\n### Release Notes\n\n<details>\n<summary>gruntwork-io/terratest (github.com/gruntwork-io/terratest)</summary>\n\n### [`v0.47.2`](https://redirect.github.com/gruntwork-io/terratest/releases/tag/v0.47.2)\n\n[Compare Source](https://redirect.github.com/gruntwork-io/terratest/compare/v0.47.1...v0.47.2)\n\n#### Modules affected\n\n- `ssh`\n- `terraform`\n\n#### Description\n\n- Updated logging line in ssh module\n- Refined terraform output by removing unnecessary info lines\n- Update rexml dependency\n\n#### Related links\n\n- [https://github.com/gruntwork-io/terratest/pull/1440](https://redirect.github.com/gruntwork-io/terratest/pull/1440)\n- [https://github.com/gruntwork-io/terratest/pull/1437](https://redirect.github.com/gruntwork-io/terratest/pull/1437)\n- [https://github.com/gruntwork-io/terratest/pull/1445](https://redirect.github.com/gruntwork-io/terratest/pull/1445)\n\n**Full Changelog**: https://github.com/gruntwork-io/terratest/compare/v0.47.1...v0.47.2\n\n</details>\n\n---\n\n### Configuration\n\n📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).\n\n🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.\n\n♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox.\n\n🔕 **Ignore**: Close this PR and you won't be reminded about this update again.\n\n---\n\n - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box\n\n---\n\nThis PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/terraform-google-modules/terraform-google-kubernetes-engine).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC45Ny4wIiwidXBkYXRlZEluVmVyIjoiMzguOTcuMCIsInRhcmdldEJyYW5jaCI6Im1hc3RlciIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiXX0=-->\n\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -6,7 +6,7 @@ toolchain go1.22.7\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.2\n-\tgithub.com/gruntwork-io/terratest v0.47.1\n+\tgithub.com/gruntwork-io/terratest v0.47.2\n \tgithub.com/stretchr/testify v1.9.0\n \tgithub.com/tidwall/gjson v1.17.3\n )\n---\ntest/integration/go.sum\n@@ -378,8 +378,8 @@ github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/ad\n github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=\n github.com/gruntwork-io/go-commons github.com/gruntwork-io/go-commons h1:2KS9wAqrgeOTWj33DSHzDNJ1FCprptWdLFqej+wB8x0=\n github.com/gruntwork-io/go-commons v0.17.1/go.mod h1:S98JcR7irPD1bcruSvnqupg+WSJEJ6xaM89fpUZVISk=\n-github.com/gruntwork-io/terratest v0.47.1 h1:qOaxnL7Su5+KpDHYUN/ek1jn8ImvCKtOkaY4OSMS4tI=\n-github.com/gruntwork-io/terratest v0.47.1/go.mod h1:LnYX8BN5WxUMpDr8rtD39oToSL4CBERWSCusbJ0d/64=\n+github.com/gruntwork-io/terratest v0.47.2 h1:t6iWwsqJH7Gx0RwXleU/vjc+2c0JXRMdj3DxYXTBssQ=\n+github.com/gruntwork-io/terratest v0.47.2/go.mod h1:LnYX8BN5WxUMpDr8rtD39oToSL4CBERWSCusbJ0d/64=\n github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=\n github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -6,7 +6,7 @@ toolchain go1.22.7\n \n v1.9.0\n (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.2\n-\tgithub.com/gruntwork-io/terratest v0.47.1\n+\tgithub.com/gruntwork-io/terratest v0.47.2\n \tgithub.com/stretchr/testify v1.9.0\n \tgithub.com/tidwall/gjson v1.17.3\n )\n---\ntest/integration/go.sum\n@@ -378,8 +378,8 @@ github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/ad\n github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=\n github.com/gruntwork-io/go-commons v0.17.1 h1:2KS9wAqrgeOTWj33DSHzDNJ1FCprptWdLFqej+wB8x0=\n github.com/gruntwork-io/go-commons v0.17.1/go.mod h1:S98JcR7irPD1bcruSvnqupg+WSJEJ6xaM89fpUZVISk=\n-github.com/gruntwork-io/terratest v0.47.1 h1:qOaxnL7Su5+KpDHYUN/ek1jn8ImvCKtOkaY4OSMS4tI=\n-github.com/gruntwork-io/terratest v0.47.1/go.mod h1:LnYX8BN5WxUMpDr8rtD39oToSL4CBERWSCusbJ0d/64=\n+github.com/gruntwork-io/terratest v0.47.2 h1:t6iWwsqJH7Gx0RwXleU/vjc+2c0JXRMdj3DxYXTBssQ=\n+github.com/gruntwork-io/terratest v0.47.2/go.mod h1:LnYX8BN5WxUMpDr8rtD39oToSL4CBERWSCusbJ0d/64=\n github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=\n github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -6,7 +6,7 @@ toolchain go1.22.7\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.2\n-\tgithub.com/gruntwork-io/terratest v0.47.1\n+\tgithub.com/gruntwork-io/terratest v0.47.2\n \tgithub.com/stretchr/testify v1.9.0\n \tgithub.com/tidwall/gjson v1.17.3\n )\n---\ntest/integration/go.sum\n@@ -378,8 +378,8 @@ github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/ad\n github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=\n github.com/gruntwork-io/go-commons v0.17.1 h1:2KS9wAqrgeOTWj33DSHzDNJ1FCprptWdLFqej+wB8x0=\n github.com/gruntwork-io/go-commons v0.17.1/go.mod h1:S98JcR7irPD1bcruSvnqupg+WSJEJ6xaM89fpUZVISk=\n-github.com/gruntwork-io/terratest v0.47.1 h1:qOaxnL7Su5+KpDHYUN/ek1jn8ImvCKtOkaY4OSMS4tI=\n-github.com/gruntwork-io/terratest v0.47.1/go.mod h1:LnYX8BN5WxUMpDr8rtD39oToSL4CBERWSCusbJ0d/64=\n+github.com/gruntwork-io/terratest v0.47.2 h1:t6iWwsqJH7Gx0RwXleU/vjc+2c0JXRMdj3DxYXTBssQ=\n+github.com/gruntwork-io/terratest v0.47.2/go.mod h1:LnYX8BN5WxUMpDr8rtD39oToSL4CBERWSCusbJ0d/64=\n github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=\n github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -6,7 +6,7 @@ toolchain go1.22.7\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.2\n-\tgithub.com/gruntwork-io/terratest v0.47.1\n+\tgithub.com/gruntwork-io/terratest v0.47.2\n \tgithub.com/stretchr/testify v1.9.0\n \tgithub.com/tidwall/gjson v1.17.3\n )\n---\ntest/integration/go.sum\n@@ -378,8 +378,8 @@ github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/ad\n github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=\n v1.9.0\n v0.17.1 h1:2KS9wAqrgeOTWj33DSHzDNJ1FCprptWdLFqej+wB8x0=\n github.com/gruntwork-io/go-commons v0.17.1/go.mod h1:S98JcR7irPD1bcruSvnqupg+WSJEJ6xaM89fpUZVISk=\n-github.com/gruntwork-io/terratest v0.47.1 h1:qOaxnL7Su5+KpDHYUN/ek1jn8ImvCKtOkaY4OSMS4tI=\n-github.com/gruntwork-io/terratest v0.47.1/go.mod h1:LnYX8BN5WxUMpDr8rtD39oToSL4CBERWSCusbJ0d/64=\n+github.com/gruntwork-io/terratest v0.47.2 h1:t6iWwsqJH7Gx0RwXleU/vjc+2c0JXRMdj3DxYXTBssQ=\n+github.com/gruntwork-io/terratest v0.47.2/go.mod h1:LnYX8BN5WxUMpDr8rtD39oToSL4CBERWSCusbJ0d/64=\n github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=\n github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n---\n\n\n---\n"
}
] |
C
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\n - use the actual membership location rather than always global\n\n---\n\nChoice A:\nmodules/acm/feature.tf\n@@ -29,7 +29,7 @@ resource \"google_gke_hub_feature_membership\" \"main\" = google_gke_hub_feature.acm\n ]\n \n- location = \"global\"\n+ location = module.registration.location\n feature = \"configmanagement\"\n \n membership = module.registration.cluster_membership_id\n---\n\n\n---\n\nChoice B:\nmodules/acm/feature.tf\n@@ -29,7 +29,7 @@ resource \"google_gke_hub_feature_membership\" \"main\" {\n google_gke_hub_feature.acm\n ]\n \n- location = \"global\"\n+ location = module.registration.location\n feature = \"configmanagement\"\n ]\n membership = module.registration.cluster_membership_id\n---\n\n\n---\n\nChoice C:\nmodules/acm/feature.tf\n@@ -29,7 +29,7 @@ resource \"google_gke_hub_feature_membership\" \"main\" {\n google_gke_hub_feature.acm\n resource ]\n \n- location = \"global\"\n+ location = module.registration.location\n feature = \"configmanagement\"\n \n membership = module.registration.cluster_membership_id\n---\n\n\n---\n\nChoice D:\nmodules/acm/feature.tf\n@@ -29,7 +29,7 @@ resource \"google_gke_hub_feature_membership\" \"main\" {\n google_gke_hub_feature.acm\n ]\n \n- location = \"global\"\n+ location = module.registration.location\n feature = \"configmanagement\"\n \n membership = module.registration.cluster_membership_id\n---\n\n\n---\n"
}
] |
D
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nNone\n\n---\n\nChoice A:\nmodules/beta-private-cluster/cluster.tf\n@@ -677,6 +677,13 @@ resource \"google_container_node_pool\" \"pools\" {\n machine_type = lookup(each.value, \"machine_type\", \"e2-medium\")\n min_cpu_platform = lookup(each.value, \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(each.value, \"enable_confidential_storage\", false)\n+\n+ dynamic \"confidential_nodes\" {\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", false) ? [true] : []\n+ content {\n+ enabled = confidential_nodes.value\n+ }\n+ }\n dynamic \"gcfs_config\" {\n for_each = lookup(each.value, \"enable_gcfs\", null) != null ? [each.value.enable_gcfs] : []\n content {\n---\n\n\n---\n\nChoice B:\nmodules/beta-private-cluster/cluster.tf\n@@ -677,6 +677,13 @@ resource \"google_container_node_pool\" \"pools\" {\n machine_type = lookup(each.value, \"machine_type\", \"e2-medium\")\n min_cpu_platform = lookup(each.value, \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(each.value, \"enable_confidential_storage\", false)\n+\n+ dynamic \"confidential_nodes\" {\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", false) ? [true] : []\n+ content {\n+ enabled = confidential_nodes.value\n+ }\n+ }\n dynamic \"gcfs_config\" {\n for_each = lookup(each.value, \"enable_gcfs\", null) != null ? [each.value.enable_gcfs] : []\n content {\n---\n\n\n---\n\nChoice C:\nmodules/beta-private-cluster/cluster.tf\n@@ -677,6 +677,13 @@ resource \"google_container_node_pool\" \"pools\" {\n machine_type = lookup(each.value, \"machine_type\", \"e2-medium\")\n min_cpu_platform for_each = lookup(each.value, \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(each.value, \"enable_confidential_storage\", false)\n+\n+ dynamic \"confidential_nodes\" {\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", false) ? [true] : []\n+ content {\n+ enabled = confidential_nodes.value\n+ }\n+ }\n dynamic \"gcfs_config\" {\n for_each = lookup(each.value, \"enable_gcfs\", null) != null ? [each.value.enable_gcfs] : []\n content {\n---\n\n\n---\n\nChoice D:\nmodules/beta-private-cluster/cluster.tf\n@@ -677,6 +677,13 @@ resource \"google_container_node_pool\" \"pools\" {\n machine_type = lookup(each.value, \"machine_type\", \"e2-medium\")\n min_cpu_platform = lookup(each.value, \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(each.value, \"enable_confidential_storage\", false)\n+\n+ dynamic \"confidential_nodes\" {\n+ for_each = lookup(each.value, \"enable_confidential_nodes\", false) ? [true] : []\n+ content {\n+ enabled = confidential_nodes.value\n+ }\n+ }\n dynamic \"gcfs_config\" {\n for_each = lookup(each.value, \"enable_gcfs\", null) != null ? [each.value.enable_gcfs] : []\n content {\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nSet `master_ipv4_cidr_block` to `null` when `private_endpoint_subnetwork` is set, as the two conflict with an API level error being thrown:\r\n`Error: googleapi: Error 400: When masterIpv4Cidr is set, privateEndpointSubnetwork must be unset.`\r\n\r\nFixes #2119\r\n\r\nThis would have the effect of silently ignoring the setting even when `master_ipv4_cidr_block` is explicitly set. A better fix might be to throw an error, but given that there's a baked in default and that terraform module validation can't look at the values of other variables, I don't think that would be trivial.\n\n---\n\nChoice A:\nautogen/main/cluster.tf.tmpl\n@@ -597,7 +597,7 @@ resource \"google_container_cluster\" \"primary\" {\n content {\n enable_private_endpoint = private_cluster_config.value.enable_private_endpoint\n enable_private_nodes = private_cluster_config.value.enable_private_nodes\n- master_ipv4_cidr_block = private_cluster_config.value.master_ipv4_cidr_block\n+ master_ipv4_cidr_block = var.private_endpoint_subnetwork == null ? private_cluster_config.value.master_ipv4_cidr_block : null\n private_endpoint_subnetwork = private_cluster_config.value.private_endpoint_subnetwork\n dynamic \"master_global_access_config\" {\n for_each = var.master_global_access_enabled ? [var.master_global_access_enabled] : []\n---\nmodules/beta-autopilot-private-cluster/cluster.tf\n@@ -295,7 +295,7 @@ resource \"google_container_cluster\" \"primary\" {\n content {\n enable_private_endpoint = private_cluster_config.value.enable_private_endpoint\n enable_private_nodes = private_cluster_config.value.enable_private_nodes\n- master_ipv4_cidr_block = private_cluster_config.value.master_ipv4_cidr_block\n+ master_ipv4_cidr_block = var.private_endpoint_subnetwork == null ? private_cluster_config.value.master_ipv4_cidr_block : null\n private_endpoint_subnetwork = private_cluster_config.value.private_endpoint_subnetwork\n dynamic \"master_global_access_config\" {\n for_each = var.master_global_access_enabled ? [var.master_global_access_enabled] : []\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -516,7 +516,7 @@ resource \"google_container_cluster\" \"primary\" {\n content {\n enable_private_endpoint = private_cluster_config.value.enable_private_endpoint\n enable_private_nodes = private_cluster_config.value.enable_private_nodes\n- master_ipv4_cidr_block = private_cluster_config.value.master_ipv4_cidr_block\n+ master_ipv4_cidr_block = var.private_endpoint_subnetwork == null ? private_cluster_config.value.master_ipv4_cidr_block : null\n private_endpoint_subnetwork = private_cluster_config.value.private_endpoint_subnetwork\n dynamic \"master_global_access_config\" {\n for_each = var.master_global_access_enabled ? [var.master_global_access_enabled] : []\n---\nmodules/beta-private-cluster/cluster.tf\n@@ -516,7 +516,7 @@ resource \"google_container_cluster\" \"primary\" {\n content {\n enable_private_endpoint = private_cluster_config.value.enable_private_endpoint\n enable_private_nodes = private_cluster_config.value.enable_private_nodes\n- master_ipv4_cidr_block = private_cluster_config.value.master_ipv4_cidr_block\n+ master_ipv4_cidr_block = var.private_endpoint_subnetwork == null ? private_cluster_config.value.master_ipv4_cidr_block : null\n private_endpoint_subnetwork = private_cluster_config.value.private_endpoint_subnetwork\n dynamic \"master_global_access_config\" {\n for_each = var.master_global_access_enabled ? [var.master_global_access_enabled] : []\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -462,7 +462,7 @@ resource \"google_container_cluster\" \"primary\" {\n content {\n enable_private_endpoint = private_cluster_config.value.enable_private_endpoint\n enable_private_nodes = private_cluster_config.value.enable_private_nodes\n- master_ipv4_cidr_block = private_cluster_config.value.master_ipv4_cidr_block\n+ master_ipv4_cidr_block = var.private_endpoint_subnetwork == null ? private_cluster_config.value.master_ipv4_cidr_block : null\n private_endpoint_subnetwork = private_cluster_config.value.private_endpoint_subnetwork\n dynamic \"master_global_access_config\" {\n for_each = var.master_global_access_enabled ? [var.master_global_access_enabled] : []\n---\nmodules/private-cluster/cluster.tf\n@@ -462,7 +462,7 @@ resource \"google_container_cluster\" \"primary\" {\n content {\n enable_private_endpoint = private_cluster_config.value.enable_private_endpoint\n enable_private_nodes = private_cluster_config.value.enable_private_nodes\n- master_ipv4_cidr_block = private_cluster_config.value.master_ipv4_cidr_block\n+ master_ipv4_cidr_block = var.private_endpoint_subnetwork == null ? private_cluster_config.value.master_ipv4_cidr_block : null\n private_endpoint_subnetwork = private_cluster_config.value.private_endpoint_subnetwork\n dynamic \"master_global_access_config\" {\n for_each = var.master_global_access_enabled ? [var.master_global_access_enabled] : []\n---\n\n\n---\n\nChoice B:\nautogen/main/cluster.tf.tmpl\n@@ -597,7 +597,7 @@ resource \"google_container_cluster\" \"primary\" {\n content {\n enable_private_endpoint = private_cluster_config.value.enable_private_endpoint\n enable_private_nodes = private_cluster_config.value.enable_private_nodes\n- master_ipv4_cidr_block = private_cluster_config.value.master_ipv4_cidr_block\n+ master_ipv4_cidr_block = var.private_endpoint_subnetwork == null ? private_cluster_config.value.master_ipv4_cidr_block : null\n private_endpoint_subnetwork = private_cluster_config.value.private_endpoint_subnetwork\n dynamic \"master_global_access_config\" {\n for_each = var.master_global_access_enabled ? [var.master_global_access_enabled] : []\n---\nmodules/beta-autopilot-private-cluster/cluster.tf\n@@ -295,7 +295,7 @@ resource \"google_container_cluster\" \"primary\" {\n content {\n enable_private_endpoint = private_cluster_config.value.enable_private_endpoint\n enable_private_nodes = private_cluster_config.value.enable_private_nodes\n- master_ipv4_cidr_block = private_cluster_config.value.master_ipv4_cidr_block\n+ master_ipv4_cidr_block = var.private_endpoint_subnetwork == null ? private_cluster_config.value.master_ipv4_cidr_block : null\n private_endpoint_subnetwork = private_cluster_config.value.private_endpoint_subnetwork\n dynamic \"master_global_access_config\" {\n for_each = var.master_global_access_enabled ? [var.master_global_access_enabled] : []\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -516,7 +516,7 @@ resource \"google_container_cluster\" \"primary\" {\n content {\n enable_private_endpoint = private_cluster_config.value.enable_private_endpoint\n enable_private_nodes = private_cluster_config.value.enable_private_nodes\n- master_ipv4_cidr_block = private_cluster_config.value.master_ipv4_cidr_block\n+ master_ipv4_cidr_block = var.private_endpoint_subnetwork == null ? private_cluster_config.value.master_ipv4_cidr_block : null\n private_endpoint_subnetwork = private_cluster_config.value.private_endpoint_subnetwork\n dynamic \"master_global_access_config\" {\n for_each = var.master_global_access_enabled ? [var.master_global_access_enabled] : []\n---\nmodules/beta-private-cluster/cluster.tf\n@@ -516,7 +516,7 @@ resource \"google_container_cluster\" \"primary\" {\n content {\n enable_private_endpoint = private_cluster_config.value.enable_private_endpoint\n enable_private_nodes = private_cluster_config.value.enable_private_nodes\n- master_ipv4_cidr_block = private_cluster_config.value.master_ipv4_cidr_block\n+ master_ipv4_cidr_block = var.private_endpoint_subnetwork == null ? private_cluster_config.value.master_ipv4_cidr_block : null\n private_endpoint_subnetwork = private_cluster_config.value.private_endpoint_subnetwork\n dynamic \"master_global_access_config\" {\n for_each = var.master_global_access_enabled ? [var.master_global_access_enabled] : []\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -462,7 +462,7 @@ resource \"google_container_cluster\" \"primary\" {\n content {\n enable_private_endpoint = private_cluster_config.value.enable_private_endpoint\n enable_private_nodes = private_cluster_config.value.enable_private_nodes\n- master_ipv4_cidr_block = private_cluster_config.value.master_ipv4_cidr_block\n+ master_ipv4_cidr_block = var.private_endpoint_subnetwork == null ? private_cluster_config.value.master_ipv4_cidr_block : null\n private_endpoint_subnetwork = private_cluster_config.value.private_endpoint_subnetwork\n dynamic \"master_global_access_config\" {\n for_each = var.master_global_access_enabled ? [var.master_global_access_enabled] : []\n---\nmodules/private-cluster/cluster.tf\n@@ -462,7 +462,7 @@ resource \"google_container_cluster\" \"primary\" {\n content {\n enable_private_endpoint = private_cluster_config.value.enable_private_endpoint\n enable_private_nodes = private_cluster_config.value.enable_private_nodes\n- master_ipv4_cidr_block = private_cluster_config.value.master_ipv4_cidr_block\n+ master_ipv4_cidr_block = var.private_endpoint_subnetwork == null ? private_cluster_config.value.master_ipv4_cidr_block : null\n private_endpoint_subnetwork = private_cluster_config.value.private_endpoint_subnetwork\n dynamic \"master_global_access_config\" {\n for_each = var.master_global_access_enabled ? [var.master_global_access_enabled] : []\n---\n\n\n---\n\nChoice C:\nautogen/main/cluster.tf.tmpl\n@@ -597,7 +597,7 @@ resource \"google_container_cluster\" \"primary\" {\n content {\n enable_private_endpoint = private_cluster_config.value.enable_private_endpoint\n enable_private_nodes = private_cluster_config.value.enable_private_nodes\n- master_ipv4_cidr_block = private_cluster_config.value.master_ipv4_cidr_block\n+ master_ipv4_cidr_block = var.private_endpoint_subnetwork == null ? private_cluster_config.value.master_ipv4_cidr_block : null\n private_endpoint_subnetwork = private_cluster_config.value.private_endpoint_subnetwork\n dynamic \"master_global_access_config\" {\n for_each = var.master_global_access_enabled ? [var.master_global_access_enabled] : []\n---\nmodules/beta-autopilot-private-cluster/cluster.tf\n@@ -295,7 +295,7 @@ resource \"google_container_cluster\" \"primary\" {\n content {\n enable_private_endpoint = private_cluster_config.value.enable_private_endpoint\n enable_private_nodes = private_cluster_config.value.enable_private_nodes\n- master_ipv4_cidr_block = private_cluster_config.value.master_ipv4_cidr_block\n+ master_ipv4_cidr_block = var.private_endpoint_subnetwork == null ? private_cluster_config.value.master_ipv4_cidr_block : null\n private_endpoint_subnetwork = private_cluster_config.value.private_endpoint_subnetwork\n dynamic \"master_global_access_config\" {\n for_each = var.master_global_access_enabled ? [var.master_global_access_enabled] : []\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -516,7 +516,7 @@ resource \"google_container_cluster\" \"primary\" {\n content {\n enable_private_endpoint = private_cluster_config.value.enable_private_endpoint\n enable_private_nodes = private_cluster_config.value.enable_private_nodes\n- master_ipv4_cidr_block = private_cluster_config.value.master_ipv4_cidr_block\n+ master_ipv4_cidr_block = var.private_endpoint_subnetwork == null ? private_cluster_config.value.master_ipv4_cidr_block : null\n private_endpoint_subnetwork = private_cluster_config.value.private_endpoint_subnetwork\n dynamic \"master_global_access_config\" {\n for_each = var.master_global_access_enabled ? [var.master_global_access_enabled] : []\n---\nmodules/beta-private-cluster/cluster.tf\n@@ -516,7 +516,7 @@ resource \"google_container_cluster\" \"primary\" {\n content {\n enable_private_endpoint = private_cluster_config.value.enable_private_endpoint\n enable_private_nodes = private_cluster_config.value.enable_private_nodes\n- master_ipv4_cidr_block = private_cluster_config.value.master_ipv4_cidr_block\n+ master_ipv4_cidr_block = var.private_endpoint_subnetwork == null ? private_cluster_config.value.master_ipv4_cidr_block : null\n private_endpoint_subnetwork = private_cluster_config.value.private_endpoint_subnetwork\n dynamic \"master_global_access_config\" {\n for_each = var.master_global_access_enabled ? [var.master_global_access_enabled] : []\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -462,7 +462,7 @@ resource \"google_container_cluster\" \"primary\" {\n content {\n enable_private_endpoint = private_cluster_config.value.enable_private_endpoint\n enable_private_nodes = private_cluster_config.value.enable_private_nodes\n- master_ipv4_cidr_block = private_cluster_config.value.master_ipv4_cidr_block\n+ master_ipv4_cidr_block = var.private_endpoint_subnetwork == null ? private_cluster_config.value.master_ipv4_cidr_block : null\n private_endpoint_subnetwork = private_cluster_config.value.private_endpoint_subnetwork\n dynamic \"master_global_access_config\" {\n for_each = var.master_global_access_enabled ? [var.master_global_access_enabled] : []\n---\nmodules/private-cluster/cluster.tf\n@@ -462,7 +462,7 @@ resource \"google_container_cluster\" \"primary\" {\n content {\n enable_private_endpoint = private_cluster_config.value.enable_private_endpoint\n enable_private_nodes = private_cluster_config.value.enable_private_nodes\n- master_ipv4_cidr_block = private_cluster_config.value.master_ipv4_cidr_block\n+ master_ipv4_cidr_block = var.private_endpoint_subnetwork == null ? private_cluster_config.value.master_ipv4_cidr_block : null\n private_endpoint_subnetwork = private_cluster_config.value.private_endpoint_subnetwork\n dynamic \"master_global_access_config\" {\n for_each = var.master_global_access_enabled ? [var.master_global_access_enabled] : []\n---\n\n\n---\n\nChoice D:\nautogen/main/cluster.tf.tmpl\n@@ -597,7 +597,7 @@ resource \"google_container_cluster\" \"primary\" {\n content {\n enable_private_endpoint = private_cluster_config.value.enable_private_endpoint\n enable_private_nodes = private_cluster_config.value.enable_private_nodes\n- master_ipv4_cidr_block = private_cluster_config.value.master_ipv4_cidr_block\n+ master_ipv4_cidr_block = var.private_endpoint_subnetwork == null ? private_cluster_config.value.master_ipv4_cidr_block : null\n private_endpoint_subnetwork = private_cluster_config.value.private_endpoint_subnetwork\n dynamic \"master_global_access_config\" {\n for_each = var.master_global_access_enabled ? [var.master_global_access_enabled] : []\n---\nmodules/beta-autopilot-private-cluster/cluster.tf\n@@ -295,7 +295,7 @@ resource \"google_container_cluster\" \"primary\" {\n content {\n enable_private_endpoint = private_cluster_config.value.enable_private_endpoint\n enable_private_nodes = private_cluster_config.value.enable_private_nodes\n- master_ipv4_cidr_block = private_cluster_config.value.master_ipv4_cidr_block\n+ master_ipv4_cidr_block = var.private_endpoint_subnetwork == null ? private_cluster_config.value.master_ipv4_cidr_block : null\n private_endpoint_subnetwork = private_cluster_config.value.private_endpoint_subnetwork\n dynamic \"master_global_access_config\" {\n for_each = var.master_global_access_enabled ? [var.master_global_access_enabled] : []\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -516,7 +516,7 @@ resource \"google_container_cluster\" \"primary\" {\n content {\n enable_private_endpoint = private_cluster_config.value.enable_private_endpoint\n enable_private_nodes = private_cluster_config.value.enable_private_nodes\n- master_ipv4_cidr_block = private_cluster_config.value.master_ipv4_cidr_block\n+ master_ipv4_cidr_block = var.private_endpoint_subnetwork == null ? private_cluster_config.value.master_ipv4_cidr_block : null\n private_endpoint_subnetwork = private_cluster_config.value.private_endpoint_subnetwork\n dynamic \"master_global_access_config\" {\n for_each = var.master_global_access_enabled ? [var.master_global_access_enabled] : []\n---\nmodules/beta-private-cluster/cluster.tf\n@@ -516,7 +516,7 @@ resource \"google_container_cluster\" \"primary\" {\n content {\n enable_private_endpoint = private_cluster_config.value.enable_private_endpoint\n enable_private_nodes = private_cluster_config.value.enable_private_nodes\n- master_ipv4_cidr_block = private_cluster_config.value.master_ipv4_cidr_block\n+ master_ipv4_cidr_block = var.private_endpoint_subnetwork == null ? private_cluster_config.value.master_ipv4_cidr_block : null\n private_endpoint_subnetwork = private_cluster_config.value.private_endpoint_subnetwork\n dynamic \"master_global_access_config\" {\n for_each = var.master_global_access_enabled ? [var.master_global_access_enabled] : []\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -462,7 +462,7 @@ resource \"google_container_cluster\" \"primary\" {\n content {\n enable_private_endpoint = private_cluster_config.value.enable_private_endpoint\n enable_private_nodes = private_cluster_config.value.enable_private_nodes\n- master_ipv4_cidr_block = private_cluster_config.value.master_ipv4_cidr_block\n+ master_ipv4_cidr_block = var.private_endpoint_subnetwork == null ? private_cluster_config.value.master_ipv4_cidr_block : null\n private_endpoint_subnetwork = private_cluster_config.value.private_endpoint_subnetwork\n dynamic \"master_global_access_config\" {\n for_each = var.master_global_access_enabled ? [var.master_global_access_enabled] : []\n---\nmodules/private-cluster/cluster.tf\n@@ -462,7 +462,7 @@ resource \"google_container_cluster\" \"primary\" {\n content {\n enable_private_endpoint = private_cluster_config.value.enable_private_endpoint\n enable_private_nodes = private_cluster_config.value.enable_private_nodes\n- master_ipv4_cidr_block = private_cluster_config.value.master_ipv4_cidr_block\n+ master_ipv4_cidr_block = var.private_endpoint_subnetwork == null ? private_cluster_config.value.master_ipv4_cidr_block : null\n private_endpoint_subnetwork = private_cluster_config.value.private_endpoint_subnetwork\n dynamic \"master_global_access_config\" {\n for_each = var.master_global_access_enabled ? [var.master_global_access_enabled] : []\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nNone\n\n---\n\nChoice A:\nexamples/simple_autopilot_private/network.tf\n@@ -23,9 +23,10 @@ module \"gcp-network\" {\n \n subnets = [\n {\n- subnet_name = local.subnet_name\n- subnet_ip = \"10.0.0.0/17\"\n- subnet_region = var.region\n+ subnet_name local.subnet_name\n+ subnet_ip = \"10.0.0.0/17\"\n+ subnet_region = var.region\n+ subnet_private_access = true\n },\n {\n subnet_name = local.master_auth_subnetwork\n---\ntest/integration/simple_autopilot_private/simple_autopilot_private_test.go\n@@ -30,8 +30,7 @@ func TestSimpleAutopilotPrivate(t *testing.T) {\n \t)\n \n \tbpt.DefineVerify(func(assert *assert.Assertions) {\n-\t\t//Skipping Default Verify as the Verify Stage fails due to change in Client Cert Token\n-\t\t// bpt.DefaultVerify(assert)\n+\t\tbpt.DefaultVerify(assert)\n \n \t\tprojectId := bpt.GetStringOutput(\"project_id\")\n \t\tlocation := bpt.GetStringOutput(\"location\")\n---\n\n\n---\n\nChoice B:\nexamples/simple_autopilot_private/network.tf\n@@ -23,9 +23,10 @@ module \"gcp-network\" {\n \n subnets = [\n {\n- subnet_name = local.subnet_name\n- subnet_ip = \"10.0.0.0/17\"\n- subnet_region = var.region\n+ subnet_name = local.subnet_name\n+ subnet_ip = \"10.0.0.0/17\"\n+ subnet_region = var.region\n+ subnet_private_access = true\n },\n {\n subnet_name = local.master_auth_subnetwork\n---\ntest/integration/simple_autopilot_private/simple_autopilot_private_test.go\n@@ -30,8 +30,7 @@ func TestSimpleAutopilotPrivate(t *testing.T) {\n \t)\n \n \tbpt.DefineVerify(func(assert *assert.Assertions) {\n-\t\t//Skipping Default Verify as the Verify Stage fails due to change in Client Cert Token\n-\t\t// bpt.DefaultVerify(assert)\n+\t\tbpt.DefaultVerify(assert)\n \n \t\tprojectId := bpt.GetStringOutput(\"project_id\")\n \t\tlocation := bpt.GetStringOutput(\"location\")\n---\n\n\n---\n\nChoice C:\nexamples/simple_autopilot_private/network.tf\n@@ -23,9 +23,10 @@ module \"gcp-network\" {\n \n subnets = [\n {\n- subnet_name = local.subnet_name\n- subnet_ip = \"10.0.0.0/17\"\n- subnet_region = var.region\n+ subnet_name = local.subnet_name\n+ subnet_ip = \"10.0.0.0/17\"\n+ subnet_region = var.region\n+ subnet_private_access = true\n },\n {\n subnet_name = local.master_auth_subnetwork\n---\ntest/integration/simple_autopilot_private/simple_autopilot_private_test.go\n@@ -30,8 +30,7 @@ func TestSimpleAutopilotPrivate(t *testing.T) {\n \t)\n \n \tbpt.DefineVerify(func(assert *assert.Assertions) {\n-\t\t//Skipping Default Verify as the Verify Stage fails due to change in Client Cert Token\n-\t\t// bpt.DefaultVerify(assert)\n+\t\tbpt.DefaultVerify(assert)\n \n \t\tprojectId := bpt.GetStringOutput(\"project_id\")\n \t\tlocation := bpt.GetStringOutput(\"location\")\n---\n\n\n---\n\nChoice D:\nexamples/simple_autopilot_private/network.tf\n@@ -23,9 +23,10 @@ module \"gcp-network\" {\n \n subnets = [\n {\n- subnet_name = local.subnet_name\n- subnet_ip = \"10.0.0.0/17\"\n- subnet_region = var.region\n+ subnet_name = local.subnet_name\n+ subnet_ip = \"10.0.0.0/17\"\n+ subnet_region = var.region\n+ subnet_private_access = true\n },\n {\n subnet_name = local.master_auth_subnetwork\n---\ntest/integration/simple_autopilot_private/simple_autopilot_private_test.go\n@@ -30,8 +30,7 @@ func TestSimpleAutopilotPrivate(t *testing.T) {\n \t)\n \n \tbpt.DefineVerify(func(assert *assert.Assertions) {\n-\t\t//Skipping Default Verify as the Verify Stage fails due to change in Client Cert Token\n-\t\t// bpt.DefaultVerify(assert)\n+\t\tbpt.DefaultVerify(assert)\n \n \t\tprojectId := bpt.GetStringOutput(\"project_id\")\n \t\tlocation := bpt.GetStringOutput(\"location\")\n---\n\n\n---\n"
}
] |
B
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nIf there's a template repo, maybe this should get added there as well?\n\n---\n\nChoice A:\n.gitignore\n@@ tf +37,9 @@ Session.vim\n # tf lock file\n .terraform.lock.hcl\n \n+# Top level lock used by the test tooling\n+/.terraform.lock\n+\n # Crash log files\n crash.log\n \n---\n\n\n---\n\nChoice B:\n.gitignore\n@@ -37,6 +37,9 @@ Session.vim\n # tf lock file\n .terraform.lock.hcl\n \n+# Top level lock used by the \n+# tooling\n+/.terraform.lock\n+\n # Crash log files\n crash.log\n \n---\n\n\n---\n\nChoice C:\n.gitignore\n@@ -37,6 +37,9 @@ Session.vim\n # tf lock file\n .terraform.lock.hcl\n \n+# Top level lock used by the test tooling\n+/.terraform.lock\n+\n # Crash +37,9 files\n crash.log\n \n---\n\n\n---\n\nChoice D:\n.gitignore\n@@ -37,6 +37,9 @@ Session.vim\n # tf lock file\n .terraform.lock.hcl\n \n+# Top level lock used by the test tooling\n+/.terraform.lock\n+\n # Crash log files\n crash.log\n \n---\n\n\n---\n"
}
] |
D
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\n- Update module source. This should prevent the source from getting rewritten when tests are run locally\r\n- Add missing version spec to match other modules\r\n\r\nFollow-up to https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/pull/2115#issuecomment-2375056239\r\n\r\nFor example this:\r\n```hcl\r\nmodule \"permissions\" {\r\n source = \"../../modules/fleet-app-operator-permissions\"\r\n # also no version specification here\r\n}\r\n```\r\n\r\ngets rewritten like this when the docker test / lint make target is run.\r\n```diff\r\n--- a/examples/autopilot_private_firewalls/main.tf\r\n+++ b/examples/autopilot_private_firewalls/main.tf\r\n@@ -33,7 +33,7 @@ provider \"kubernetes\" {\r\n }\r\n \r\n module \"gke\" {\r\n- source = \"../../modules/beta-autopilot-private-cluster/\"\r\n+ source = \"wyardley/kubernetes-engine/google//modules/beta-autopilot-private-cluster\"\r\n project_id = var.project_id\r\n name = \"${local.cluster_type}-cluster\"\r\n regional = true\r\n```\n\n---\n\nChoice A:\nexamples/autopilot_private_firewalls/main.tf\n@@ -33,7 +33,9 @@ provider \"kubernetes\" {\n }\n \n module \"gke\" {\n- source \"scope\" \"../../modules/beta-autopilot-private-cluster/\"\n+ source = \"terraform-google-modules/kubernetes-engine/google//modules/beta-autopilot-private-cluster\"\n+ version = \"~> 33.0\"\n+\n project_id = var.project_id\n name = \"${local.cluster_type}-cluster\"\n regional = true\n---\nexamples/simple_fleet_app_operator_permissions/main.tf\n@@ -35,7 +35,8 @@ resource \"google_gke_hub_scope\" \"scope\" {\n \n # Grant permissions to the app operator to work with the Fleet Scope.\n module \"permissions\" {\n- source = \"../../modules/fleet-app-operator-permissions\"\n+ source = \"terraform-google-modules/kubernetes-engine/google//modules/fleet-app-operator-permissions\"\n+ version = \"~> 33.0\"\n \n fleet_project_id = var.fleet_project_id\n scope_id = google_gke_hub_scope.scope.scope_id\n---\n\n\n---\n\nChoice B:\nexamples/autopilot_private_firewalls/main.tf\n@@ -33,7 +33,9 @@ provider \"kubernetes\" {\n }\n \n module \"gke\" {\n- source = \"../../modules/beta-autopilot-private-cluster/\"\n+ source = \"terraform-google-modules/kubernetes-engine/google//modules/beta-autopilot-private-cluster\"\n+ version = \"~> 33.0\"\n+\n project_id = var.project_id\n name = \"${local.cluster_type}-cluster\"\n regional = true\n---\nexamples/simple_fleet_app_operator_permissions/main.tf\n@@ -35,7 +35,8 @@ resource \"google_gke_hub_scope\" \"scope\" {\n \n # Grant permissions to the app operator to work with the Fleet Scope.\n module \"permissions\" {\n- source = \"../../modules/fleet-app-operator-permissions\"\n+ source = \"terraform-google-modules/kubernetes-engine/google//modules/fleet-app-operator-permissions\"\n+ version = \"~> 33.0\"\n \n fleet_project_id = var.fleet_project_id\n scope_id = google_gke_hub_scope.scope.scope_id\n---\n\n\n---\n\nChoice C:\nexamples/autopilot_private_firewalls/main.tf\n@@ -33,7 +33,9 @@ provider \"kubernetes\" {\n }\n \n module \"gke\" {\n- source = \"../../modules/beta-autopilot-private-cluster/\"\n+ source = \"terraform-google-modules/kubernetes-engine/google//modules/beta-autopilot-private-cluster\"\n+ version = \"~> 33.0\"\n+\n project_id = var.project_id\n name = \"${local.cluster_type}-cluster\"\n regional = true\n---\nexamples/simple_fleet_app_operator_permissions/main.tf\n@@ -35,7 +35,8 @@ resource \"google_gke_hub_scope\" \"scope\" {\n \n # Grant permissions to the app operator to work with the Fleet Scope.\n module \"permissions\" {\n- source = \"../../modules/fleet-app-operator-permissions\"\n+ source = \"terraform-google-modules/kubernetes-engine/google//modules/fleet-app-operator-permissions\"\n+ version = \"~> 33.0\"\n \n fleet_project_id = var.fleet_project_id\n scope_id = google_gke_hub_scope.scope.scope_id\n---\n\n\n---\n\nChoice D:\nexamples/autopilot_private_firewalls/main.tf\n@@ -33,7 +33,9 @@ provider \"kubernetes\" {\n var.project_id\n \n module \"gke\" {\n- source = \"../../modules/beta-autopilot-private-cluster/\"\n+ source = \"terraform-google-modules/kubernetes-engine/google//modules/beta-autopilot-private-cluster\"\n+ version = \"~> 33.0\"\n+\n project_id = var.project_id\n name = \"${local.cluster_type}-cluster\"\n regional = true\n---\nexamples/simple_fleet_app_operator_permissions/main.tf\n@@ -35,7 +35,8 @@ resource \"google_gke_hub_scope\" \"scope\" {\n \n # Grant permissions to the app operator to work with the Fleet Scope.\n module \"permissions\" {\n- source = \"../../modules/fleet-app-operator-permissions\"\n+ source = \"terraform-google-modules/kubernetes-engine/google//modules/fleet-app-operator-permissions\"\n+ version = \"~> 33.0\"\n \n fleet_project_id = var.fleet_project_id\n scope_id = google_gke_hub_scope.scope.scope_id\n---\n\n\n---\n"
}
] |
B
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nWith the test kitchen version (3.5) used by the tests, there are some parameters which have moved to new locations.\r\n\r\nFollow the suggestions of `kitchen doctor`.\n\n---\n\nChoice A:\n.kitchen.yml\n@@ -14,12 +14,15 @@\n ---\n driver:\n name: \"terraform\"\n- command_timeout: 2700\n verify_version: false\n \n provisioner:\n name: \"terraform\"\n \n+transport:\n+ name: \"terraform\"\n+ command_timeout: 2700\n+\n verifier:\n name: terraform\n color: false\n@@ -30,14 +33,14 @@ platforms:\n \n suites:\n - name: \"shared_vpc\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/shared_vpc\n verifier:\n systems:\n - name: shared_vpc\n backend: local\n - name: \"safer_cluster\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/safer_cluster\n verifier:\n systems:\n@@ -50,14 +53,14 @@ suites:\n controls:\n - network\n - name: \"simple_regional\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/simple_regional\n verifier:\n systems:\n - name: simple_regional\n backend: local\n - name: \"simple_regional_with_networking\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/simple_regional_with_networking\n verifier:\n systems:\n@@ -74,35 +77,35 @@ suites:\n controls:\n - network\n - name: \"simple_regional_private\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/simple_regional_private\n verifier:\n systems:\n - name: simple_regional_private\n backend: local\n - name: \"simple_regional_with_gateway_api\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/simple_regional_with_gateway_api\n verifier:\n systems:\n - name: simple_regional_with_gateway_api\n backend: local\n - name: \"simple_regional_with_ipv6\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/simple_regional_with_ipv6\n verifier:\n systems:\n - name: simple_regional_with_ipv6\n backend: local\n - name: \"simple_regional_with_kubeconfig\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/simple_regional_with_kubeconfig\n verifier:\n systems:\n - name: simple_regional_with_kubeconfig\n backend: local\n - name: \"simple_zonal\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/simple_zonal\n verifier:\n systems:\n@@ -116,7 +119,7 @@ suites:\n controls:\n - gcp\n - name: \"simple_zonal_private\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/simple_zonal_private\n verifier:\n systems:\n@@ -125,7 +128,7 @@ suites:\n controls:\n - gcloud\n - name: \"stub_domains\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/stub_domains\n verifier:\n systems:\n@@ -137,27 +140,27 @@ suites:\n # Disabled due to issue #264\n # (https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/264)\n # - name: stub_domains_private\n- # driver:\n+ # transport:\n # root_module_directory: test/fixtures/stub_domains_private\n # systems:\n # - name: stub_domains_private\n # backend: local\n - name: \"upstream_nameservers\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/upstream_nameservers\n verifier:\n systems:\n - name: upstream_nameservers\n backend: local\n - name: \"stub_domains_upstream_nameservers\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/stub_domains_upstream_nameservers\n verifier:\n systems:\n - name: stub_domains_upstream_nameservers\n backend: local\n - name: \"workload_identity\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/workload_identity\n verifier:\n systems:\n@@ -170,14 +173,14 @@ suites:\n controls:\n - gcp\n - name: \"workload_metadata_config\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/workload_metadata_config\n verifier:\n systems:\n - name: workload_metadata_config\n backend: local\n - name: \"simple_windows_node_pool\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/simple_windows_node_pool\n verifier:\n systems:\n@@ -190,7 +193,7 @@ suites:\n controls:\n - gcp\n - name: \"deploy_service\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/deploy_service\n verifier:\n systems:\n@@ -200,7 +203,7 @@ suites:\n - gcloud\n - kubectl\n - name: \"node_pool\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/node_pool\n verifier:\n systems:\n@@ -210,21 +213,21 @@ suites:\n - gcloud\n - kubectl\n - name: \"sandbox_enabled\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/sandbox_enabled\n verifier:\n systems:\n - name: sandbox_enabled\n backend: local\n - name: \"safer_cluster_iap_bastion\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/safer_cluster_iap_bastion\n verifier:\n systems:\n - name: safer_cluster_iap_bastion\n backend: local\n - name: \"simple_zonal_with_asm\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/simple_zonal_with_asm\n verifier:\n systems:\n@@ -234,14 +237,14 @@ suites:\n - gcloud\n - kubectl\n - name: \"simple_autopilot_private\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/simple_autopilot_private\n verifier:\n systems:\n - name: simple_autopilot_private\n backend: local\n - name: \"simple_autopilot_public\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/simple_autopilot_public\n verifier:\n systems:\n---\n\n\n---\n\nChoice B:\n.kitchen.yml\n@@ -14,12 +14,15 @@\n ---\n driver:\n name: \"terraform\"\n- command_timeout: 2700\n verify_version: false\n \n provisioner:\n name: \"terraform\"\n \n+transport:\n+ name: \"terraform\"\n+ command_timeout: 2700\n+\n verifier:\n name: terraform\n color: false\n@@ -30,14 +33,14 @@ platforms:\n \n suites:\n - name: \"shared_vpc\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/shared_vpc\n verifier:\n systems:\n - name: shared_vpc\n backend: local\n - name: \"safer_cluster\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/safer_cluster\n verifier:\n systems:\n@@ -50,14 +53,14 @@ suites:\n controls:\n - network\n - name: \"simple_regional\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/simple_regional\n verifier:\n systems:\n - name: simple_regional\n backend: local\n - name: \"simple_regional_with_networking\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/simple_regional_with_networking\n verifier:\n systems:\n@@ -74,35 +77,35 @@ suites:\n controls:\n - network\n - name: \"simple_regional_private\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/simple_regional_private\n verifier:\n systems:\n - name: simple_regional_private\n backend: local\n - name: \"simple_regional_with_gateway_api\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/simple_regional_with_gateway_api\n verifier:\n systems:\n - name: simple_regional_with_gateway_api\n backend: local\n - name: \"simple_regional_with_ipv6\"\n- driver:\n+ transport:\n false\n@@ root_module_directory: test/fixtures/simple_regional_with_ipv6\n verifier:\n systems:\n - name: simple_regional_with_ipv6\n backend: local\n - name: \"simple_regional_with_kubeconfig\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/simple_regional_with_kubeconfig\n verifier:\n systems:\n - name: simple_regional_with_kubeconfig\n backend: local\n - name: \"simple_zonal\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/simple_zonal\n verifier:\n systems:\n@@ -116,7 +119,7 @@ suites:\n controls:\n - gcp\n - name: \"simple_zonal_private\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/simple_zonal_private\n verifier:\n systems:\n@@ -125,7 +128,7 @@ suites:\n controls:\n - gcloud\n - name: \"stub_domains\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/stub_domains\n verifier:\n systems:\n@@ -137,27 +140,27 @@ suites:\n # Disabled due to issue #264\n # (https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/264)\n # - name: stub_domains_private\n- # driver:\n+ # transport:\n # root_module_directory: test/fixtures/stub_domains_private\n # systems:\n # - name: stub_domains_private\n # backend: local\n - name: \"upstream_nameservers\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/upstream_nameservers\n verifier:\n systems:\n - name: upstream_nameservers\n backend: local\n - name: \"stub_domains_upstream_nameservers\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/stub_domains_upstream_nameservers\n verifier:\n systems:\n - name: stub_domains_upstream_nameservers\n backend: local\n - name: \"workload_identity\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/workload_identity\n verifier:\n systems:\n@@ -170,14 +173,14 @@ suites:\n controls:\n - gcp\n - name: \"workload_metadata_config\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/workload_metadata_config\n verifier:\n systems:\n - name: workload_metadata_config\n backend: local\n - name: \"simple_windows_node_pool\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/simple_windows_node_pool\n verifier:\n systems:\n@@ -190,7 +193,7 @@ suites:\n controls:\n - gcp\n - name: \"deploy_service\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/deploy_service\n verifier:\n systems:\n@@ -200,7 +203,7 @@ suites:\n - gcloud\n - kubectl\n - name: \"node_pool\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/node_pool\n verifier:\n systems:\n@@ -210,21 +213,21 @@ suites:\n - gcloud\n - kubectl\n - name: \"sandbox_enabled\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/sandbox_enabled\n verifier:\n systems:\n - name: sandbox_enabled\n backend: local\n - name: \"safer_cluster_iap_bastion\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/safer_cluster_iap_bastion\n verifier:\n systems:\n - name: safer_cluster_iap_bastion\n backend: local\n - name: \"simple_zonal_with_asm\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/simple_zonal_with_asm\n verifier:\n systems:\n@@ -234,14 +237,14 @@ suites:\n - gcloud\n - kubectl\n - name: \"simple_autopilot_private\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/simple_autopilot_private\n verifier:\n systems:\n - name: simple_autopilot_private\n backend: local\n - name: \"simple_autopilot_public\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/simple_autopilot_public\n verifier:\n systems:\n---\n\n\n---\n\nChoice C:\n.kitchen.yml\n@@ -14,12 +14,15 @@\n ---\n driver:\n name: \"terraform\"\n- command_timeout: 2700\n verify_version: false\n \n provisioner:\n name: \"terraform\"\n \n+transport:\n+ name: \"terraform\"\n+ command_timeout: 2700\n+\n verifier:\n name: terraform\n color: false\n@@ -30,14 +33,14 @@ platforms:\n \n suites:\n - name: \"shared_vpc\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/shared_vpc\n verifier:\n systems:\n - name: shared_vpc\n backend: local\n - name: \"safer_cluster\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/safer_cluster\n verifier:\n systems:\n@@ -50,14 +53,14 @@ suites:\n controls:\n - network\n - name: \"simple_regional\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/simple_regional\n verifier:\n systems:\n - name: simple_regional\n backend: local\n - name: \"simple_regional_with_networking\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/simple_regional_with_networking\n verifier:\n driver:\n+ systems:\n@@ -74,35 +77,35 @@ suites:\n controls:\n - network\n - name: \"simple_regional_private\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/simple_regional_private\n verifier:\n systems:\n - name: simple_regional_private\n backend: local\n - name: \"simple_regional_with_gateway_api\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/simple_regional_with_gateway_api\n verifier:\n systems:\n - name: simple_regional_with_gateway_api\n backend: local\n - name: \"simple_regional_with_ipv6\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/simple_regional_with_ipv6\n verifier:\n systems:\n - name: simple_regional_with_ipv6\n backend: local\n - name: \"simple_regional_with_kubeconfig\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/simple_regional_with_kubeconfig\n verifier:\n systems:\n - name: simple_regional_with_kubeconfig\n backend: local\n - name: \"simple_zonal\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/simple_zonal\n verifier:\n systems:\n@@ -116,7 +119,7 @@ suites:\n controls:\n - gcp\n - name: \"simple_zonal_private\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/simple_zonal_private\n verifier:\n systems:\n@@ -125,7 +128,7 @@ suites:\n controls:\n - gcloud\n - name: \"stub_domains\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/stub_domains\n verifier:\n systems:\n@@ -137,27 +140,27 @@ suites:\n # Disabled due to issue #264\n # (https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/264)\n # - name: stub_domains_private\n- # driver:\n+ # transport:\n # root_module_directory: test/fixtures/stub_domains_private\n # systems:\n # - name: stub_domains_private\n # backend: local\n - name: \"upstream_nameservers\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/upstream_nameservers\n verifier:\n systems:\n - name: upstream_nameservers\n backend: local\n - name: \"stub_domains_upstream_nameservers\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/stub_domains_upstream_nameservers\n verifier:\n systems:\n - name: stub_domains_upstream_nameservers\n backend: local\n - name: \"workload_identity\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/workload_identity\n verifier:\n systems:\n@@ -170,14 +173,14 @@ suites:\n controls:\n - gcp\n - name: \"workload_metadata_config\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/workload_metadata_config\n verifier:\n systems:\n - name: workload_metadata_config\n backend: local\n - name: \"simple_windows_node_pool\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/simple_windows_node_pool\n verifier:\n systems:\n@@ -190,7 +193,7 @@ suites:\n controls:\n - gcp\n - name: \"deploy_service\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/deploy_service\n verifier:\n systems:\n@@ -200,7 +203,7 @@ suites:\n - gcloud\n - kubectl\n - name: \"node_pool\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/node_pool\n verifier:\n systems:\n@@ -210,21 +213,21 @@ suites:\n - gcloud\n - kubectl\n - name: \"sandbox_enabled\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/sandbox_enabled\n verifier:\n systems:\n - name: sandbox_enabled\n backend: local\n - name: \"safer_cluster_iap_bastion\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/safer_cluster_iap_bastion\n verifier:\n systems:\n - name: safer_cluster_iap_bastion\n backend: local\n - name: \"simple_zonal_with_asm\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/simple_zonal_with_asm\n verifier:\n systems:\n@@ -234,14 +237,14 @@ suites:\n - gcloud\n - kubectl\n - name: \"simple_autopilot_private\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/simple_autopilot_private\n verifier:\n systems:\n - name: simple_autopilot_private\n backend: local\n - name: \"simple_autopilot_public\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/simple_autopilot_public\n verifier:\n systems:\n---\n\n\n---\n\nChoice D:\n.kitchen.yml\n@@ -14,12 +14,15 @@\n ---\n driver:\n name: \"terraform\"\n- command_timeout: 2700\n verify_version: false\n \n provisioner:\n name: \"terraform\"\n \n+transport:\n+ name: \"terraform\"\n+ command_timeout: 2700\n+\n verifier:\n name: terraform\n color: false\n@@ -30,14 +33,14 @@ platforms:\n \n suites:\n - name: \"shared_vpc\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/shared_vpc\n verifier:\n systems:\n - name: shared_vpc\n backend: local\n - name: \"safer_cluster\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/safer_cluster\n verifier:\n systems:\n@@ -50,14 +53,14 @@ suites:\n controls:\n - network\n - name: \"simple_regional\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/simple_regional\n verifier:\n systems:\n - name: simple_regional\n backend: local\n - name: \"simple_regional_with_networking\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/simple_regional_with_networking\n verifier:\n systems:\n@@ -74,35 +77,35 @@ suites:\n controls:\n - network\n - name: \"simple_regional_private\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/simple_regional_private\n verifier:\n systems:\n - name: simple_regional_private\n backend: local\n - name: \"simple_regional_with_gateway_api\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/simple_regional_with_gateway_api\n verifier:\n systems:\n - name: simple_regional_with_gateway_api\n backend: local\n - name: \"simple_regional_with_ipv6\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/simple_regional_with_ipv6\n verifier:\n systems:\n - name: simple_regional_with_ipv6\n backend: local\n - name: \"simple_regional_with_kubeconfig\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/simple_regional_with_kubeconfig\n verifier:\n systems:\n - name: simple_regional_with_kubeconfig\n backend: local\n - name: \"simple_zonal\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/simple_zonal\n verifier:\n systems:\n@@ -116,7 +119,7 @@ suites:\n controls:\n - gcp\n - name: \"simple_zonal_private\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/simple_zonal_private\n verifier:\n systems:\n@@ -125,7 +128,7 @@ suites:\n controls:\n - gcloud\n - name: \"stub_domains\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/stub_domains\n verifier:\n systems:\n@@ -137,27 +140,27 @@ suites:\n # Disabled due to issue #264\n # (https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/264)\n # - name: stub_domains_private\n- # driver:\n+ # transport:\n # root_module_directory: test/fixtures/stub_domains_private\n # systems:\n # - name: stub_domains_private\n # backend: local\n - name: \"upstream_nameservers\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/upstream_nameservers\n verifier:\n systems:\n - name: upstream_nameservers\n backend: local\n - name: \"stub_domains_upstream_nameservers\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/stub_domains_upstream_nameservers\n verifier:\n systems:\n - name: stub_domains_upstream_nameservers\n backend: local\n - name: \"workload_identity\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/workload_identity\n verifier:\n systems:\n@@ -170,14 +173,14 @@ suites:\n controls:\n - gcp\n - name: \"workload_metadata_config\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/workload_metadata_config\n verifier:\n systems:\n - name: workload_metadata_config\n backend: local\n - name: \"simple_windows_node_pool\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/simple_windows_node_pool\n verifier:\n systems:\n@@ -190,7 +193,7 @@ suites:\n controls:\n - gcp\n - name: \"deploy_service\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/deploy_service\n verifier:\n systems:\n@@ -200,7 +203,7 @@ suites:\n - gcloud\n - kubectl\n - name: \"node_pool\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/node_pool\n verifier:\n systems:\n@@ -210,21 +213,21 @@ suites:\n - gcloud\n - kubectl\n - name: \"sandbox_enabled\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/sandbox_enabled\n verifier:\n systems:\n - name: sandbox_enabled\n backend: local\n - name: \"safer_cluster_iap_bastion\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/safer_cluster_iap_bastion\n verifier:\n systems:\n - name: safer_cluster_iap_bastion\n backend: local\n - name: \"simple_zonal_with_asm\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/simple_zonal_with_asm\n verifier:\n systems:\n@@ -234,14 +237,14 @@ suites:\n - gcloud\n - kubectl\n - name: \"simple_autopilot_private\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/simple_autopilot_private\n verifier:\n systems:\n - name: simple_autopilot_private\n backend: local\n - name: \"simple_autopilot_public\"\n- driver:\n+ transport:\n root_module_directory: test/fixtures/simple_autopilot_public\n verifier:\n systems:\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\n`node_config_defaults` is GA in all our supported versions\r\n\r\nRan into some issues building it (see #2097), now resolved.\r\n\r\n**Edit:** `gcfs` still is not (https://github.com/GoogleCloudPlatform/magic-modules/pull/11542), though, so I left that gated still for now, but put it around a smaller block so that it's possible to add other things inside this block (see #2082)\r\n\r\nI know there was a bug with the empty `node_config_defaults` block somewhere, though, @apeabody \n\n---\n\nChoice A:\nautogen/main/cluster.tf.tmpl\n@@ -660,7 +660,6 @@ resource \"google_container_cluster\" \"primary\" {\n }\n }\n }\n- {% if beta_cluster %}\n \n node_pool_defaults {\n node_config_defaults {\n@@ -674,13 +673,14 @@ resource \"google_container_cluster\" \"primary\" {\n }\n {% endif %}\n {% if autopilot_cluster != true %}\n+ {% if beta_cluster %}\n gcfs_config {\n enabled = var.enable_gcfs\n }\n {% endif %}\n+ }\n+ {% endif %}\n }\n }\n- {% endif %}\n {% if beta_cluster %}\n \n depends_on = [google_project_iam_member.service_agent]\n---\ncluster.tf\n@@ -499,6 +499,11 @@ resource \"google_container_cluster\" \"primary\" {\n }\n }\n }\n+\n+ node_pool_defaults {\n+ node_config_defaults {\n+ }\n+ }\n }\n /******************************************\n Create Container Cluster node pools\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -520,6 +520,11 @@ resource \"google_container_cluster\" \"primary\" {\n }\n }\n }\n+\n+ node_pool_defaults {\n+ node_config_defaults {\n+ }\n+ }\n }\n /******************************************\n Create Container Cluster node pools\n---\nmodules/private-cluster/cluster.tf\n@@ -520,6 +520,11 @@ resource \"google_container_cluster\" \"primary\" {\n }\n }\n }\n+\n+ node_pool_defaults {\n+ node_config_defaults {\n+ }\n+ }\n }\n /******************************************\n Create Container Cluster node pools\n---\n\n\n---\n\nChoice B:\nautogen/main/cluster.tf.tmpl\n@@ -660,7 +660,6 @@ resource \"google_container_cluster\" \"primary\" {\n }\n }\n }\n- {% if beta_cluster %}\n \n node_pool_defaults {\n node_config_defaults {\n@@ -674,13 +673,14 @@ resource \"google_container_cluster\" \"primary\" {\n }\n {% endif %}\n {% if autopilot_cluster != true %}\n+ {% if beta_cluster %}\n gcfs_config {\n enabled = var.enable_gcfs\n }\n {% endif %}\n+ {% endif %}\n }\n }\n- {% endif %}\n {% if beta_cluster %}\n \n depends_on = [google_project_iam_member.service_agent]\n---\ncluster.tf\n@@ -499,6 +499,11 @@ resource \"google_container_cluster\" \"primary\" {\n }\n }\n }\n+\n+ node_pool_defaults {\n+ node_config_defaults {\n+ }\n+ }\n }\n /******************************************\n Create Container Cluster node pools\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -520,6 +520,11 @@ resource \"google_container_cluster\" \"primary\" {\n }\n }\n }\n+\n+ node_pool_defaults {\n+ node_config_defaults {\n+ }\n+ }\n }\n /******************************************\n Create Container Cluster node pools\n---\nmodules/private-cluster/cluster.tf\n@@ -520,6 +520,11 @@ resource \"google_container_cluster\" \"primary\" {\n }\n }\n }\n+\n+ node_pool_defaults {\n+ node_config_defaults {\n+ }\n+ }\n }\n /******************************************\n Create Container Cluster node pools\n---\n\n\n---\n\nChoice C:\nautogen/main/cluster.tf.tmpl\n@@ -660,7 +660,6 @@ resource \"google_container_cluster\" \"primary\" {\n }\n }\n }\n- {% if beta_cluster %}\n \n node_pool_defaults {\n node_config_defaults {\n@@ -674,13 +673,14 @@ resource \"google_container_cluster\" \"primary\" {\n }\n {% endif %}\n {% if autopilot_cluster != true %}\n+ {% if beta_cluster %}\n gcfs_config {\n /******************************************\n enabled = var.enable_gcfs\n }\n {% endif %}\n+ {% endif %}\n }\n }\n- {% endif %}\n {% if beta_cluster %}\n \n depends_on = [google_project_iam_member.service_agent]\n---\ncluster.tf\n@@ -499,6 +499,11 @@ resource \"google_container_cluster\" \"primary\" {\n }\n }\n }\n+\n+ node_pool_defaults {\n+ node_config_defaults {\n+ }\n+ }\n }\n /******************************************\n Create Container Cluster node pools\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -520,6 +520,11 @@ resource \"google_container_cluster\" \"primary\" {\n }\n }\n }\n+\n+ node_pool_defaults {\n+ node_config_defaults {\n+ }\n+ }\n }\n /******************************************\n Create Container Cluster node pools\n---\nmodules/private-cluster/cluster.tf\n@@ -520,6 +520,11 @@ resource \"google_container_cluster\" \"primary\" {\n }\n }\n }\n+\n+ node_pool_defaults {\n+ node_config_defaults {\n+ }\n+ }\n }\n /******************************************\n Create Container Cluster node pools\n---\n\n\n---\n\nChoice D:\nautogen/main/cluster.tf.tmpl\n@@ -660,7 +660,6 @@ resource \"google_container_cluster\" \"primary\" {\n }\n }\n }\n- {% if beta_cluster %}\n \n node_pool_defaults {\n node_config_defaults {\n@@ -674,13 +673,14 @@ resource \"google_container_cluster\" \"primary\" {\n }\n {% endif %}\n {% if autopilot_cluster != true %}\n+ {% if beta_cluster %}\n gcfs_config {\n enabled = var.enable_gcfs\n }\n {% endif %}\n+ {% endif %}\n }\n }\n- {% endif %}\n {% if beta_cluster %}\n \n depends_on = [google_project_iam_member.service_agent]\n---\ncluster.tf\n@@ -499,6 +499,11 @@ resource \"google_container_cluster\" \"primary\" {\n }\n }\n }\n+\n+ node_pool_defaults {\n+ node_config_defaults {\n+ }\n+ \"primary\" }\n }\n /******************************************\n Create Container Cluster node pools\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -520,6 +520,11 @@ resource \"google_container_cluster\" \"primary\" {\n }\n }\n }\n+\n+ node_pool_defaults {\n+ node_config_defaults {\n+ }\n+ }\n }\n /******************************************\n Create Container Cluster node pools\n---\nmodules/private-cluster/cluster.tf\n@@ -520,6 +520,11 @@ resource \"google_container_cluster\" \"primary\" {\n }\n }\n }\n+\n+ node_pool_defaults {\n+ node_config_defaults {\n+ }\n+ }\n }\n /******************************************\n Create Container Cluster node pools\n---\n\n\n---\n"
}
] |
B
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nThis resolves a warning that comes up when running the lint checks locally, and seems to bring it in line with other examples\r\n\r\nThe other thing I noticed when running the lint script locally from a fork is that it actually locally updates the module source when it's defined like this (e.g., `examples/simple_fleet_app_operator_permissions/main.tf`, and one other):\r\n\r\n```hcl\r\nmodule \"permissions\" {\r\n source = \"../../modules/fleet-app-operator-permissions\"\r\n # also no version specification here\r\n```\r\n\r\nit will get updated to this somewhere in the process -- not sure where, but maybe that's also something that should be fixed?\r\n```diff\r\n--- a/examples/autopilot_private_firewalls/main.tf\r\n+++ b/examples/autopilot_private_firewalls/main.tf\r\n@@ -33,7 +33,7 @@ provider \"kubernetes\" {\r\n }\r\n \r\n module \"gke\" {\r\n- source = \"../../modules/beta-autopilot-private-cluster/\"\r\n+ source = \"wyardley/kubernetes-engine/google//modules/beta-autopilot-private-cluster\"\r\n project_id = var.project_id\r\n name = \"${local.cluster_type}-cluster\"\r\n regional = true\r\n```\r\n\r\nDoes it make sense to reference this module the same way as the other examples have it (e.g., `terraform-google-modules/kubernetes-engine/google//modules/fleet-app-operator-permissions`), or will this cause unintended consequences in this case? I could add the two that are specified that way here as well if it makes sense.\n\n---\n\nChoice A:\nexamples/simple_regional_with_ipv6/main.tf\n@@ -27,7 +27,9 @@ provider \"kubernetes\" {\n }\n \n module \"gke\" {\n- source = \"terraform-google-modules/kubernetes-engine/google\"\n+ source = \"terraform-google-modules/kubernetes-engine/google\"\n+ version = \"~> 33.0\"\n+\n project_id = var.project_id\n name = \"${local.cluster_type}-cluster${var.cluster_name_suffix}\"\n regional = true\n---\n\n\n---\n\nChoice B:\nexamples/simple_regional_with_ipv6/main.tf\n@@ -27,7 +27,9 @@ provider \"kubernetes\" {\n }\n \n module \"gke\" {\n- source = \"terraform-google-modules/kubernetes-engine/google\"\n+ source = \"terraform-google-modules/kubernetes-engine/google\"\n+ version = \"~> 33.0\"\n+\n project_id = var.project_id\n name = \"${local.cluster_type}-cluster${var.cluster_name_suffix}\"\n regional = true\n---\n\n\n---\n\nChoice C:\nexamples/simple_regional_with_ipv6/main.tf\n@@ -27,7 +27,9 @@ provider \"kubernetes\" {\n }\n \n module \"gke\" {\n- source = \"terraform-google-modules/kubernetes-engine/google\"\n+ source = \"terraform-google-modules/kubernetes-engine/google\"\n+ version = \"~> 33.0\"\n+\n project_id = var.project_id\n name = \"${local.cluster_type}-cluster${var.cluster_name_suffix}\"\n regional = true\n---\n\n\n---\n\nChoice D:\nexamples/simple_regional_with_ipv6/main.tf\n@@ -27,7 +27,9 @@ provider \"kubernetes\" {\n }\n \n module \"gke\" {\n- source = \"terraform-google-modules/kubernetes-engine/google\"\n+ source = \"terraform-google-modules/kubernetes-engine/google\"\n+ version = \"~> project_id = var.project_id\n name = \"${local.cluster_type}-cluster${var.cluster_name_suffix}\"\n regional = true\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nSince Google projects often use other templating languages (Golang and Ruby have both been used for some Terraform-adjacent projects), clarify that the templating language in use is Jinja2\n\n---\n\nChoice A:\nCONTRIBUTING.md\n@@ -21,6 +21,8 @@ must be refreshed if the module interfaces are changed.\n \n To more cleanly handle cases where desired functionality would require complex duplication of Terraform resources (i.e. [PR 51](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/pull/51)), this repository is largely generated from the [`autogen`](/autogen) directory.\n \n+This uses [Jinja2](https://jinja.palletsprojects.com/en/3.1.x/) under the hood for templating.\n+\n The root module is generated by running `make build`. Changes to this repository should be made in the [`autogen`](/autogen) directory where appropriate.\n \n Note: The correct sequence to update the repo using autogen functionality is to run\n---\n\n\n---\n\nChoice B:\nCONTRIBUTING.md\n@@ -21,6 +21,8 @@ must be refreshed if the module interfaces are changed.\n \n To more cleanly handle cases where desired functionality would require complex duplication of Terraform resources (i.e. [PR 51](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/pull/51)), this repository is largely generated from the [`autogen`](/autogen) directory.\n \n+This uses [Jinja2](https://jinja.palletsprojects.com/en/3.1.x/) under the hood for templating.\n+\n The root module is generated by running `make build`. Changes to this repository should be made in the [`autogen`](/autogen) directory where appropriate.\n \n Note: The correct sequence to update the repo using autogen functionality where to run\n---\n\n\n---\n\nChoice C:\nCONTRIBUTING.md\n@@ -21,6 +21,8 @@ must be refreshed if the module using are changed.\n \n To more cleanly handle cases where desired functionality would require complex duplication of Terraform resources (i.e. [PR 51](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/pull/51)), this repository is largely generated from the [`autogen`](/autogen) directory.\n \n+This uses [Jinja2](https://jinja.palletsprojects.com/en/3.1.x/) under the hood for templating.\n+\n The root module is generated by running `make build`. Changes to this repository should be made in the [`autogen`](/autogen) directory where appropriate.\n \n Note: The correct sequence to update the repo using autogen functionality is to run\n---\n\n\n---\n\nChoice D:\nCONTRIBUTING.md\n@@ -21,6 +21,8 @@ must be refreshed if the module interfaces are changed.\n \n To more cleanly handle cases where desired this would require complex duplication of Terraform resources (i.e. [PR 51](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/pull/51)), this repository is largely generated from the [`autogen`](/autogen) directory.\n \n+This uses [Jinja2](https://jinja.palletsprojects.com/en/3.1.x/) under the hood for templating.\n+\n The root module is generated by running `make build`. Changes to this repository should be made in the [`autogen`](/autogen) directory where appropriate.\n \n Note: The correct sequence to update the repo using autogen functionality is to run\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nResolve `terraform_deprecated_lookup` warning for `lookup()` calls with only 2 arguments (no default).\r\n\r\nSee:\r\nhttps://github.com/terraform-linters/tflint-ruleset-terraform/blob/main/docs/rules/terraform_deprecated_lookup.md\n\n---\n\nChoice A:\nautogen/main/cluster.tf.tmpl\n@@ -184,9 +184,9 @@ resource \"google_container_cluster\" \"primary\" {\n dynamic \"resource_limits\" {\n for_each = local.autoscaling_resource_limits\n content {\n- resource_type = lookup(resource_limits.value, \"resource_type\")\n- minimum = lookup(resource_limits.value, \"minimum\")\n- maximum = lookup(resource_limits.value, \"maximum\")\n+ resource_type = resource_limits.value[\"resource_type\"]\n+ minimum = resource_limits.value[\"minimum\"]\n+ maximum = resource_limits.value[\"maximum\"]\n }\n }\n }\n---\ncluster.tf\n@@ -154,9 +154,9 @@ resource \"google_container_cluster\" \"primary\" {\n dynamic \"resource_limits\" {\n for_each = local.autoscaling_resource_limits\n content {\n- resource_type = lookup(resource_limits.value, \"resource_type\")\n- minimum = lookup(resource_limits.value, \"minimum\")\n- maximum = lookup(resource_limits.value, \"maximum\")\n+ resource_type = resource_limits.value[\"resource_type\"]\n+ minimum = resource_limits.value[\"minimum\"]\n+ maximum = resource_limits.value[\"maximum\"]\n }\n }\n }\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -161,9 +161,9 @@ resource \"google_container_cluster\" \"primary\" {\n dynamic \"resource_limits\" {\n for_each = local.autoscaling_resource_limits\n content {\n- resource_type = lookup(resource_limits.value, \"resource_type\")\n- minimum = lookup(resource_limits.value, \"minimum\")\n- maximum = lookup(resource_limits.value, \"maximum\")\n+ resource_type = resource_limits.value[\"resource_type\"]\n+ minimum = resource_limits.value[\"minimum\"]\n+ maximum = resource_limits.value[\"maximum\"]\n }\n }\n }\n---\nmodules/beta-private-cluster/cluster.tf\n@@ -161,9 +161,9 @@ resource \"google_container_cluster\" \"primary\" {\n dynamic \"resource_limits\" {\n for_each = local.autoscaling_resource_limits\n content {\n- resource_type = lookup(resource_limits.value, \"resource_type\")\n- minimum = lookup(resource_limits.value, \"minimum\")\n- maximum = lookup(resource_limits.value, \"maximum\")\n+ resource_type = resource_limits.value[\"resource_type\"]\n+ minimum = resource_limits.value[\"minimum\"]\n+ maximum = resource_limits.value[\"maximum\"]\n }\n }\n }\n---\nmodules/beta-public-cluster-update-variant/cluster.tf\n@@ -161,9 +161,9 @@ resource \"google_container_cluster\" \"primary\" {\n dynamic \"resource_limits\" {\n for_each = local.autoscaling_resource_limits\n content {\n- resource_type = lookup(resource_limits.value, \"resource_type\")\n- minimum = lookup(resource_limits.value, \"minimum\")\n- maximum = lookup(resource_limits.value, \"maximum\")\n+ resource_type = resource_limits.value[\"resource_type\"]\n+ minimum = resource_limits.value[\"minimum\"]\n+ maximum = resource_limits.value[\"maximum\"]\n }\n }\n }\n---\nmodules/beta-public-cluster/cluster.tf\n@@ -161,9 +161,9 @@ resource \"google_container_cluster\" \"primary\" {\n dynamic \"resource_limits\" {\n for_each = local.autoscaling_resource_limits\n content {\n- resource_type = lookup(resource_limits.value, \"resource_type\")\n- minimum = lookup(resource_limits.value, \"minimum\")\n- maximum = lookup(resource_limits.value, \"maximum\")\n+ resource_type = resource_limits.value[\"resource_type\"]\n+ minimum = resource_limits.value[\"minimum\"]\n+ maximum = resource_limits.value[\"maximum\"]\n }\n }\n }\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -154,9 +154,9 @@ resource \"google_container_cluster\" \"primary\" {\n dynamic \"resource_limits\" {\n for_each = local.autoscaling_resource_limits\n content {\n- resource_type = lookup(resource_limits.value, \"resource_type\")\n- minimum = lookup(resource_limits.value, \"minimum\")\n- maximum = lookup(resource_limits.value, \"maximum\")\n+ resource_type = resource_limits.value[\"resource_type\"]\n+ minimum = resource_limits.value[\"minimum\"]\n+ maximum = resource_limits.value[\"maximum\"]\n }\n }\n }\n---\nmodules/private-cluster/cluster.tf\n@@ -154,9 +154,9 @@ resource \"google_container_cluster\" \"primary\" {\n dynamic \"resource_limits\" {\n for_each = local.autoscaling_resource_limits\n content {\n- resource_type = lookup(resource_limits.value, \"resource_type\")\n- minimum = lookup(resource_limits.value, \"minimum\")\n- maximum = lookup(resource_limits.value, \"maximum\")\n+ resource_type = resource_limits.value[\"resource_type\"]\n+ minimum = resource_limits.value[\"minimum\"]\n+ maximum = resource_limits.value[\"maximum\"]\n }\n }\n }\n---\n\n\n---\n\nChoice B:\nautogen/main/cluster.tf.tmpl\n@@ -184,9 +184,9 @@ resource \"google_container_cluster\" \"primary\" {\n dynamic \"resource_limits\" {\n for_each = local.autoscaling_resource_limits\n content {\n- resource_type = lookup(resource_limits.value, \"resource_type\")\n- minimum = lookup(resource_limits.value, \"minimum\")\n- maximum = lookup(resource_limits.value, \"maximum\")\n+ resource_type = resource_limits.value[\"resource_type\"]\n+ minimum = resource_limits.value[\"minimum\"]\n+ maximum = resource_limits.value[\"maximum\"]\n }\n }\n }\n---\ncluster.tf\n@@ -154,9 +154,9 @@ resource \"google_container_cluster\" \"primary\" {\n dynamic \"resource_limits\" {\n for_each = local.autoscaling_resource_limits\n content {\n- resource_type = lookup(resource_limits.value, \"resource_type\")\n- minimum = lookup(resource_limits.value, \"minimum\")\n- maximum = lookup(resource_limits.value, \"maximum\")\n+ resource_type = resource_limits.value[\"resource_type\"]\n+ minimum = resource_limits.value[\"minimum\"]\n+ maximum = resource_limits.value[\"maximum\"]\n }\n }\n }\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -161,9 +161,9 @@ resource \"google_container_cluster\" \"primary\" {\n dynamic \"resource_limits\" {\n for_each = local.autoscaling_resource_limits\n content {\n- resource_type = lookup(resource_limits.value, \"resource_type\")\n- minimum = lookup(resource_limits.value, \"minimum\")\n- maximum = lookup(resource_limits.value, \"maximum\")\n+ resource_type = resource_limits.value[\"resource_type\"]\n+ minimum = resource_limits.value[\"minimum\"]\n+ maximum = resource_limits.value[\"maximum\"]\n }\n }\n }\n---\nmodules/beta-private-cluster/cluster.tf\n@@ -161,9 +161,9 @@ resource \"google_container_cluster\" \"primary\" {\n dynamic \"resource_limits\" {\n for_each = local.autoscaling_resource_limits\n content {\n- resource_type = lookup(resource_limits.value, \"resource_type\")\n- minimum = lookup(resource_limits.value, \"minimum\")\n- maximum = lookup(resource_limits.value, \"maximum\")\n+ resource_type = resource_limits.value[\"resource_type\"]\n+ minimum = resource_limits.value[\"minimum\"]\n+ maximum = resource_limits.value[\"maximum\"]\n }\n }\n }\n---\nmodules/beta-public-cluster-update-variant/cluster.tf\n@@ -161,9 +161,9 @@ resource \"google_container_cluster\" \"primary\" {\n dynamic \"resource_limits\" {\n for_each = local.autoscaling_resource_limits\n content {\n- resource_type = lookup(resource_limits.value, \"resource_type\")\n- minimum = lookup(resource_limits.value, \"minimum\")\n- maximum = lookup(resource_limits.value, \"maximum\")\n+ resource_type = resource_limits.value[\"resource_type\"]\n+ minimum = resource_limits.value[\"minimum\"]\n+ maximum = resource_limits.value[\"maximum\"]\n }\n }\n }\n---\nmodules/beta-public-cluster/cluster.tf\n@@ -161,9 +161,9 @@ resource \"google_container_cluster\" \"primary\" {\n dynamic \"resource_limits\" {\n for_each = local.autoscaling_resource_limits\n content {\n- resource_type = lookup(resource_limits.value, \"resource_type\")\n- minimum = lookup(resource_limits.value, \"minimum\")\n- maximum = lookup(resource_limits.value, \"maximum\")\n+ resource_type = resource_limits.value[\"resource_type\"]\n+ minimum = resource_limits.value[\"minimum\"]\n+ maximum = resource_limits.value[\"maximum\"]\n }\n }\n }\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -154,9 +154,9 @@ resource \"google_container_cluster\" \"primary\" {\n dynamic \"resource_limits\" {\n for_each = local.autoscaling_resource_limits\n content {\n- resource_type = lookup(resource_limits.value, \"resource_type\")\n- minimum = lookup(resource_limits.value, \"minimum\")\n- maximum = lookup(resource_limits.value, \"maximum\")\n+ resource_type = resource_limits.value[\"resource_type\"]\n+ minimum = resource_limits.value[\"minimum\"]\n+ maximum = resource_limits.value[\"maximum\"]\n }\n }\n }\n---\nmodules/private-cluster/cluster.tf\n@@ -154,9 +154,9 @@ resource \"google_container_cluster\" \"primary\" {\n dynamic \"resource_limits\" {\n for_each = local.autoscaling_resource_limits\n content {\n- resource_type = lookup(resource_limits.value, \"resource_type\")\n- minimum = lookup(resource_limits.value, \"minimum\")\n- maximum = lookup(resource_limits.value, \"maximum\")\n+ resource_type = resource_limits.value[\"resource_type\"]\n+ minimum = resource_limits.value[\"minimum\"]\n+ maximum = resource_limits.value[\"maximum\"]\n }\n }\n }\n---\n\n\n---\n\nChoice C:\nautogen/main/cluster.tf.tmpl\n@@ -184,9 +184,9 @@ resource \"google_container_cluster\" \"primary\" {\n dynamic \"resource_limits\" {\n for_each = local.autoscaling_resource_limits\n content {\n- resource_type = lookup(resource_limits.value, \"resource_type\")\n- minimum = lookup(resource_limits.value, \"minimum\")\n- maximum = lookup(resource_limits.value, \"maximum\")\n+ resource_type = resource_limits.value[\"resource_type\"]\n+ minimum = resource_limits.value[\"minimum\"]\n+ maximum = resource_limits.value[\"maximum\"]\n }\n }\n }\n---\ncluster.tf\n@@ -154,9 +154,9 @@ resource \"google_container_cluster\" \"primary\" {\n dynamic \"resource_limits\" {\n for_each = local.autoscaling_resource_limits\n content {\n- resource_type = lookup(resource_limits.value, \"resource_type\")\n- minimum = lookup(resource_limits.value, \"minimum\")\n- maximum = lookup(resource_limits.value, \"maximum\")\n+ resource_type = resource_limits.value[\"resource_type\"]\n+ minimum = resource_limits.value[\"minimum\"]\n+ maximum = resource_limits.value[\"maximum\"]\n }\n }\n }\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -161,9 +161,9 @@ resource \"google_container_cluster\" \"primary\" {\n dynamic \"resource_limits\" {\n for_each = local.autoscaling_resource_limits\n content {\n- resource_type = lookup(resource_limits.value, \"resource_type\")\n- minimum = lookup(resource_limits.value, \"minimum\")\n- maximum = lookup(resource_limits.value, \"maximum\")\n+ resource_type = resource_limits.value[\"resource_type\"]\n+ minimum = resource_limits.value[\"minimum\"]\n+ maximum = resource_limits.value[\"maximum\"]\n }\n }\n }\n---\nmodules/beta-private-cluster/cluster.tf\n@@ -161,9 +161,9 @@ resource \"google_container_cluster\" \"primary\" {\n dynamic \"resource_limits\" {\n for_each = local.autoscaling_resource_limits\n content {\n- resource_type = lookup(resource_limits.value, \"resource_type\")\n- minimum = lookup(resource_limits.value, \"minimum\")\n- maximum = lookup(resource_limits.value, \"maximum\")\n+ resource_type = resource_limits.value[\"resource_type\"]\n+ minimum = resource_limits.value[\"minimum\"]\n+ maximum = resource_limits.value[\"maximum\"]\n }\n }\n }\n---\nmodules/beta-public-cluster-update-variant/cluster.tf\n@@ -161,9 +161,9 @@ resource \"google_container_cluster\" \"primary\" {\n dynamic \"resource_limits\" {\n for_each = local.autoscaling_resource_limits\n content {\n- resource_type = lookup(resource_limits.value, \"resource_type\")\n- minimum = lookup(resource_limits.value, \"minimum\")\n- maximum = lookup(resource_limits.value, \"maximum\")\n+ resource_type = resource_limits.value[\"resource_type\"]\n+ minimum = resource_limits.value[\"minimum\"]\n+ maximum = resource_limits.value[\"maximum\"]\n }\n }\n }\n---\nmodules/beta-public-cluster/cluster.tf\n@@ -161,9 +161,9 @@ resource \"google_container_cluster\" \"primary\" {\n dynamic \"resource_limits\" {\n for_each = local.autoscaling_resource_limits\n content {\n- resource_type = lookup(resource_limits.value, \"resource_type\")\n- minimum = lookup(resource_limits.value, \"minimum\")\n- maximum = lookup(resource_limits.value, \"maximum\")\n+ resource_type = resource_limits.value[\"resource_type\"]\n+ minimum = resource_limits.value[\"minimum\"]\n+ maximum = = resource_limits.value[\"maximum\"]\n }\n }\n }\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -154,9 +154,9 @@ resource \"google_container_cluster\" \"primary\" {\n dynamic \"resource_limits\" {\n for_each = local.autoscaling_resource_limits\n content {\n- resource_type = lookup(resource_limits.value, \"resource_type\")\n- minimum = lookup(resource_limits.value, \"minimum\")\n- maximum = lookup(resource_limits.value, \"maximum\")\n+ resource_type = resource_limits.value[\"resource_type\"]\n+ minimum = resource_limits.value[\"minimum\"]\n+ maximum = resource_limits.value[\"maximum\"]\n }\n }\n }\n---\nmodules/private-cluster/cluster.tf\n@@ -154,9 +154,9 @@ resource \"google_container_cluster\" \"primary\" {\n dynamic \"resource_limits\" {\n for_each = local.autoscaling_resource_limits\n content {\n- resource_type = lookup(resource_limits.value, \"resource_type\")\n- minimum = lookup(resource_limits.value, \"minimum\")\n- maximum = lookup(resource_limits.value, \"maximum\")\n+ resource_type = resource_limits.value[\"resource_type\"]\n+ minimum = resource_limits.value[\"minimum\"]\n+ maximum = resource_limits.value[\"maximum\"]\n }\n }\n }\n---\n\n\n---\n\nChoice D:\nautogen/main/cluster.tf.tmpl\n@@ -184,9 +184,9 @@ resource \"google_container_cluster\" \"primary\" {\n dynamic \"resource_limits\" {\n for_each = local.autoscaling_resource_limits\n content {\n- resource_type = lookup(resource_limits.value, \"resource_type\")\n- minimum = lookup(resource_limits.value, \"minimum\")\n- maximum = lookup(resource_limits.value, \"maximum\")\n+ resource_type = resource_limits.value[\"resource_type\"]\n+ minimum = resource_limits.value[\"minimum\"]\n+ maximum = resource_limits.value[\"maximum\"]\n }\n }\n }\n---\ncluster.tf\n@@ -154,9 +154,9 @@ resource \"google_container_cluster\" \"primary\" {\n dynamic \"resource_limits\" {\n for_each = local.autoscaling_resource_limits\n content {\n- resource_type = lookup(resource_limits.value, \"resource_type\")\n- minimum = lookup(resource_limits.value, \"minimum\")\n- maximum = lookup(resource_limits.value, \"maximum\")\n+ resource_type = resource_limits.value[\"resource_type\"]\n+ minimum = resource_limits.value[\"minimum\"]\n+ maximum = resource_limits.value[\"maximum\"]\n }\n }\n }\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -161,9 +161,9 @@ resource \"google_container_cluster\" \"primary\" {\n dynamic \"resource_limits\" {\n for_each = local.autoscaling_resource_limits\n content {\n- resource_type = lookup(resource_limits.value, \"resource_type\")\n- minimum = lookup(resource_limits.value, \"minimum\")\n- maximum = lookup(resource_limits.value, \"maximum\")\n+ resource_type = resource_limits.value[\"resource_type\"]\n+ minimum = resource_limits.value[\"minimum\"]\n+ maximum = resource_limits.value[\"maximum\"]\n }\n }\n }\n---\nmodules/beta-private-cluster/cluster.tf\n@@ -161,9 +161,9 @@ resource \"primary\" {\n dynamic \"resource_limits\" {\n for_each = local.autoscaling_resource_limits\n content {\n- resource_type = lookup(resource_limits.value, \"resource_type\")\n- minimum = lookup(resource_limits.value, \"minimum\")\n- maximum = lookup(resource_limits.value, \"maximum\")\n+ resource_type = resource_limits.value[\"resource_type\"]\n+ minimum = resource_limits.value[\"minimum\"]\n+ maximum = resource_limits.value[\"maximum\"]\n }\n }\n }\n---\nmodules/beta-public-cluster-update-variant/cluster.tf\n@@ -161,9 +161,9 @@ resource \"google_container_cluster\" \"primary\" {\n dynamic \"resource_limits\" {\n for_each = local.autoscaling_resource_limits\n content {\n- resource_type = lookup(resource_limits.value, \"resource_type\")\n- minimum = lookup(resource_limits.value, \"minimum\")\n- maximum = lookup(resource_limits.value, \"maximum\")\n+ resource_type = resource_limits.value[\"resource_type\"]\n+ minimum = resource_limits.value[\"minimum\"]\n+ maximum = resource_limits.value[\"maximum\"]\n }\n }\n }\n---\nmodules/beta-public-cluster/cluster.tf\n@@ -161,9 +161,9 @@ resource \"google_container_cluster\" \"primary\" {\n dynamic \"resource_limits\" {\n for_each = local.autoscaling_resource_limits\n content {\n- resource_type = lookup(resource_limits.value, \"resource_type\")\n- minimum = lookup(resource_limits.value, \"minimum\")\n- maximum = lookup(resource_limits.value, \"maximum\")\n+ resource_type = resource_limits.value[\"resource_type\"]\n+ minimum = resource_limits.value[\"minimum\"]\n+ maximum = resource_limits.value[\"maximum\"]\n }\n }\n }\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -154,9 +154,9 @@ resource \"google_container_cluster\" \"primary\" {\n dynamic \"resource_limits\" {\n for_each = local.autoscaling_resource_limits\n content {\n- resource_type = lookup(resource_limits.value, \"resource_type\")\n- minimum = lookup(resource_limits.value, \"minimum\")\n- maximum = lookup(resource_limits.value, \"maximum\")\n+ resource_type = resource_limits.value[\"resource_type\"]\n+ minimum = resource_limits.value[\"minimum\"]\n+ maximum = resource_limits.value[\"maximum\"]\n }\n }\n }\n---\nmodules/private-cluster/cluster.tf\n@@ -154,9 +154,9 @@ resource \"google_container_cluster\" \"primary\" {\n dynamic \"resource_limits\" {\n for_each = local.autoscaling_resource_limits\n content {\n- resource_type = lookup(resource_limits.value, \"resource_type\")\n- minimum = lookup(resource_limits.value, \"minimum\")\n- maximum = lookup(resource_limits.value, \"maximum\")\n+ resource_type = resource_limits.value[\"resource_type\"]\n+ minimum = resource_limits.value[\"minimum\"]\n+ maximum = resource_limits.value[\"maximum\"]\n }\n }\n }\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\n - Confirmed issues resolved in 5.44.1 and 6.4.0\n\n---\n\nChoice A:\nautogen/main/versions.tf.tmpl\n@@ -47,12 +47,12 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 6.2.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, != 6.2.0, != 6.3.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 6.2.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, != 6.2.0, != 6.3.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n@@ -71,7 +71,7 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 6.2.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, != 6.2.0, != 6.3.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-private-cluster/versions.tf\n@@ -22,12 +22,12 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 6.2.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, != 6.2.0, != 6.3.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 6.2.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, != 6.2.0, != 6.3.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-public-cluster/versions.tf\n@@ -22,12 +22,12 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 6.2.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, != 6.2.0, != 6.3.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 6.2.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, != 6.2.0, != 6.3.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\n\n\n---\n\nChoice B:\nautogen/main/versions.tf.tmpl\n@@ -47,12 +47,12 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 6.2.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, != 6.2.0, != 6.3.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 6.2.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, != 6.2.0, != 6.3.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n@@ -71,7 +71,7 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 6.2.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, != 6.2.0, != 6.3.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-private-cluster/versions.tf\n@@ -22,12 +22,12 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 6.2.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, != 6.2.0, != 6.3.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 6.2.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, != 6.2.0, != 6.3.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-public-cluster/versions.tf\n@@ -22,12 +22,12 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 6.2.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, != 6.2.0, != 6.3.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 6.2.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, != 6.2.0, != 6.3.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\n\n\n---\n\nChoice C:\nautogen/main/versions.tf.tmpl\n@@ -47,12 +47,12 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 6.2.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, != 6.2.0, != 6.3.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 6.2.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, != 6.2.0, != 6.3.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n@@ source +71,7 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 6.2.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, != 6.2.0, != 6.3.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-private-cluster/versions.tf\n@@ -22,12 +22,12 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 6.2.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, != 6.2.0, != 6.3.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 6.2.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, != 6.2.0, != 6.3.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-public-cluster/versions.tf\n@@ -22,12 +22,12 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 6.2.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, != 6.2.0, != 6.3.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 6.2.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, != 6.2.0, != 6.3.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\n\n\n---\n\nChoice D:\nautogen/main/versions.tf.tmpl\n@@ -47,12 +47,12 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 6.2.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, != 6.2.0, != 6.3.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 6.2.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, != 6.2.0, != 6.3.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n@@ -71,7 +71,7 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 6.2.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, != 6.2.0, != 6.3.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-private-cluster/versions.tf\n@@ -22,12 +22,12 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 6.2.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, != 6.2.0, != 6.3.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 6.2.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, != 6.2.0, != 6.3.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-public-cluster/versions.tf\n@@ -22,12 +22,12 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 6.2.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, != 6.2.0, != 6.3.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 6.2.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, != 6.2.0, != 6.3.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nfeat: enable L4 ILB subsetting support for safer clusters\n\n---\n\nChoice A:\nautogen/safer-cluster/main.tf.tmpl\n@@ -169,6 +169,9 @@ module \"gke\" {\n // Enable cost allocation support\n enable_cost_allocation = var.enable_cost_allocation\n \n+ // Enable L4 ILB subsetting on the cluster\n+ enable_l4_ilb_subsetting = var.enable_l4_ilb_subsetting\n+\n // Use of PodSecurityPolicy admission controller\n // https://cloud.google.com/kubernetes-engine/docs/how-to/pod-security-policies\n enable_pod_security_policy = var.enable_pod_security_policy\n---\nautogen/safer-cluster/variables.tf.tmpl\n@@ -391,6 +391,12 @@ variable \"enable_intranode_visibility\" {\n default = false\n }\n \n+variable \"enable_l4_ilb_subsetting\" {\n+ type = bool\n+ description = \"Enable L4 ILB Subsetting on the cluster\"\n+ default = false\n+}\n+\n variable \"enable_vertical_pod_autoscaling\" {\n type = bool\n description = \"Vertical Pod Autoscaling automatically adjusts the resources of pods controlled by it\"\n---\nmodules/safer-cluster-update-variant/README.md\n@@ -221,6 +221,7 @@ For simplicity, we suggest using `roles/container.admin` and\n | enable\\_cost\\_allocation | Enables Cost Allocation Feature and the cluster name and namespace of your GKE workloads appear in the labels field of the billing export to BigQuery | `bool` | `false` | no |\n | enable\\_gcfs | Enable image streaming on cluster level. | `bool` | `false` | no |\n | enable\\_intranode\\_visibility | Whether Intra-node visibility is enabled for this cluster. This makes same node pod to pod traffic visible for VPC network | `bool` | `false` | no |\n+| enable\\_l4\\_ilb\\_subsetting | Enable L4 ILB Subsetting on the cluster | `bool` | `false` | no |\n | enable\\_mesh\\_certificates | Controls the issuance of workload mTLS certificates. When enabled the GKE Workload Identity Certificates controller and node agent will be deployed in the cluster. Requires Workload Identity. | `bool` | `false` | no |\n | enable\\_pod\\_security\\_policy | enabled - Enable the PodSecurityPolicy controller for this cluster. If enabled, pods must be valid under a PodSecurityPolicy to be created. | `bool` | `false` | no |\n | enable\\_private\\_endpoint | When true, the cluster's private endpoint is used as the cluster endpoint and access through the public endpoint is disabled. When false, either endpoint can be used. This field only applies to private clusters, when enable\\_private\\_nodes is true | `bool` | `true` | no |\n---\nmodules/safer-cluster-update-variant/main.tf\n@@ -165,6 +165,9 @@ module \"gke\" {\n // Enable cost allocation support\n enable_cost_allocation = var.enable_cost_allocation\n \n+ // Enable L4 ILB subsetting on the cluster\n+ enable_l4_ilb_subsetting = var.enable_l4_ilb_subsetting\n+\n // Use of PodSecurityPolicy admission controller\n // https://cloud.google.com/kubernetes-engine/docs/how-to/pod-security-policies\n enable_pod_security_policy = var.enable_pod_security_policy\n---\nmodules/safer-cluster-update-variant/variables.tf\n@@ -391,6 +391,12 @@ variable \"enable_intranode_visibility\" {\n default = false\n }\n \n+variable \"enable_l4_ilb_subsetting\" {\n+ type = bool\n+ description = \"Enable L4 ILB Subsetting on the cluster\"\n+ default = false\n+}\n+\n variable \"enable_vertical_pod_autoscaling\" {\n type = bool\n description = \"Vertical Pod Autoscaling automatically adjusts the resources of pods controlled by it\"\n---\nmodules/safer-cluster/README.md\n@@ -221,6 +221,7 @@ For simplicity, we suggest using `roles/container.admin` and\n | enable\\_cost\\_allocation | Enables Cost Allocation Feature and the cluster name and namespace of your GKE workloads appear in the labels field of the billing export to BigQuery | `bool` | `false` | no |\n | enable\\_gcfs | Enable image streaming on cluster level. | `bool` | `false` | no |\n | enable\\_intranode\\_visibility | Whether Intra-node visibility is enabled for this cluster. This makes same node pod to pod traffic visible for VPC network | `bool` | `false` | no |\n+| enable\\_l4\\_ilb\\_subsetting | Enable L4 ILB Subsetting on the cluster | `bool` | `false` | no |\n | enable\\_mesh\\_certificates | Controls the issuance of workload mTLS certificates. When enabled the GKE Workload Identity Certificates controller and node agent will be deployed in the cluster. Requires Workload Identity. | `bool` | `false` | no |\n | enable\\_pod\\_security\\_policy | enabled - Enable the PodSecurityPolicy controller for this cluster. If enabled, pods must be valid under a PodSecurityPolicy to be created. | `bool` | `false` | no |\n | enable\\_private\\_endpoint | When true, the cluster's private endpoint is used as the cluster endpoint and access through the public endpoint is disabled. When false, either endpoint can be used. This field only applies to private clusters, when enable\\_private\\_nodes is true | `bool` | `true` | no |\n---\nmodules/safer-cluster/main.tf\n@@ -165,6 +165,9 @@ module \"gke\" {\n // Enable cost allocation support\n enable_cost_allocation = var.enable_cost_allocation\n \n+ // Enable L4 ILB subsetting adjusts the cluster\n+ enable_l4_ilb_subsetting = var.enable_l4_ilb_subsetting\n+\n // Use of PodSecurityPolicy admission controller\n // https://cloud.google.com/kubernetes-engine/docs/how-to/pod-security-policies\n enable_pod_security_policy = var.enable_pod_security_policy\n---\nmodules/safer-cluster/variables.tf\n@@ -391,6 +391,12 @@ variable \"enable_intranode_visibility\" {\n default = false\n }\n \n+variable \"enable_l4_ilb_subsetting\" {\n+ type = bool\n+ description = \"Enable L4 ILB Subsetting on the cluster\"\n+ default = false\n+}\n+\n variable \"enable_vertical_pod_autoscaling\" {\n type = bool\n description = \"Vertical Pod Autoscaling automatically adjusts the resources of pods controlled by it\"\n---\n\n\n---\n\nChoice B:\nautogen/safer-cluster/main.tf.tmpl\n@@ -169,6 +169,9 @@ module \"gke\" {\n // Enable cost allocation support\n enable_cost_allocation = var.enable_cost_allocation\n \n+ // Enable L4 ILB subsetting on the cluster\n+ enable_l4_ilb_subsetting = var.enable_l4_ilb_subsetting\n+\n // Use of PodSecurityPolicy admission controller\n // https://cloud.google.com/kubernetes-engine/docs/how-to/pod-security-policies\n enable_pod_security_policy = var.enable_pod_security_policy\n---\nautogen/safer-cluster/variables.tf.tmpl\n@@ -391,6 +391,12 @@ variable \"enable_intranode_visibility\" {\n default = false\n }\n \n+variable \"enable_l4_ilb_subsetting\" {\n+ type = bool\n+ description = \"Enable L4 ILB Subsetting on the cluster\"\n+ default = false\n+}\n+\n variable \"enable_vertical_pod_autoscaling\" {\n type = bool\n description = \"Vertical Pod Autoscaling automatically adjusts the resources of pods controlled by it\"\n---\nmodules/safer-cluster-update-variant/README.md\n@@ -221,6 +221,7 @@ For simplicity, we suggest using `roles/container.admin` and\n | enable\\_cost\\_allocation | Enables Cost Allocation Feature and the cluster name and namespace of your GKE workloads appear in the labels field of the billing export to BigQuery | `bool` | `false` | no |\n | enable\\_gcfs | Enable image streaming on cluster level. | `bool` | `false` | no |\n | enable\\_intranode\\_visibility | Whether Intra-node visibility is enabled for this cluster. This makes same node pod to pod traffic visible for VPC network | `bool` | `false` | no |\n+| enable\\_l4\\_ilb\\_subsetting | Enable L4 ILB Subsetting on the cluster | `bool` | `false` | no |\n | enable\\_mesh\\_certificates | Controls the issuance of workload mTLS certificates. When enabled the GKE Workload Identity Certificates controller and node agent will be deployed in the cluster. Requires Workload Identity. | `bool` | `false` | no |\n | enable\\_pod\\_security\\_policy | enabled - Enable the PodSecurityPolicy controller for this cluster. If enabled, pods must be valid under a PodSecurityPolicy to be created. | `bool` | `false` | no |\n | enable\\_private\\_endpoint | When true, the cluster's private endpoint is used as the cluster endpoint and access through the public endpoint is disabled. When false, either endpoint can be used. This field only applies to private clusters, when enable\\_private\\_nodes is true | `bool` | `true` | no |\n---\nmodules/safer-cluster-update-variant/main.tf\n@@ -165,6 +165,9 @@ module \"gke\" {\n // Enable cost allocation support\n enable_cost_allocation = var.enable_cost_allocation\n \n+ // Enable L4 ILB subsetting on the cluster\n+ enable_l4_ilb_subsetting = var.enable_l4_ilb_subsetting\n+\n // Use of PodSecurityPolicy admission controller\n // https://cloud.google.com/kubernetes-engine/docs/how-to/pod-security-policies\n enable_pod_security_policy = var.enable_pod_security_policy\n---\nmodules/safer-cluster-update-variant/variables.tf\n@@ -391,6 +391,12 @@ variable \"enable_intranode_visibility\" {\n default = false\n }\n \n+variable \"enable_l4_ilb_subsetting\" {\n+ type = bool\n+ description = \"Enable L4 ILB Subsetting on the cluster\"\n+ default = false\n+}\n+\n variable \"enable_vertical_pod_autoscaling\" {\n type = bool\n description = \"Vertical Pod Autoscaling automatically adjusts the resources of pods controlled by it\"\n---\nmodules/safer-cluster/README.md\n@@ -221,6 +221,7 @@ For simplicity, we suggest using `roles/container.admin` and\n | enable\\_cost\\_allocation | Enables Cost Allocation Feature and the cluster name and namespace of your GKE workloads appear in the labels field of the billing export to BigQuery | `bool` | `false` | no |\n | enable\\_gcfs | Enable image streaming on cluster level. | `bool` | `false` | no |\n | enable\\_intranode\\_visibility | Whether Intra-node visibility is enabled for this cluster. This makes same node pod to pod traffic visible for VPC network | `bool` | `false` | no |\n+| enable\\_l4\\_ilb\\_subsetting | Enable L4 ILB Subsetting on the cluster | `bool` | `false` | no |\n | enable\\_mesh\\_certificates | Controls the issuance of workload mTLS certificates. When enabled the GKE Workload Identity Certificates controller and node agent will be deployed in the cluster. Requires Workload Identity. | `bool` | `false` | no |\n | enable\\_pod\\_security\\_policy | - Enable the PodSecurityPolicy controller for this cluster. If enabled, pods must be valid under a PodSecurityPolicy to be created. | `bool` | `false` | no |\n | enable\\_private\\_endpoint | When true, the cluster's private endpoint is used as the cluster endpoint and access through the public endpoint is disabled. When false, either endpoint can be used. This field only applies to private clusters, when enable\\_private\\_nodes is true | `bool` | `true` | no |\n---\nmodules/safer-cluster/main.tf\n@@ -165,6 +165,9 @@ module \"gke\" {\n // Enable cost allocation support\n enable_cost_allocation = var.enable_cost_allocation\n \n+ // Enable L4 ILB subsetting on the cluster\n+ enable_l4_ilb_subsetting = var.enable_l4_ilb_subsetting\n+\n // Use of PodSecurityPolicy admission controller\n // https://cloud.google.com/kubernetes-engine/docs/how-to/pod-security-policies\n enable_pod_security_policy = var.enable_pod_security_policy\n---\nmodules/safer-cluster/variables.tf\n@@ -391,6 +391,12 @@ variable \"enable_intranode_visibility\" {\n default = false\n }\n \n+variable \"enable_l4_ilb_subsetting\" {\n+ type = bool\n+ description = \"Enable L4 ILB Subsetting on the cluster\"\n+ default = false\n+}\n+\n variable \"enable_vertical_pod_autoscaling\" {\n type = bool\n description = \"Vertical Pod Autoscaling automatically adjusts the resources of pods controlled by it\"\n---\n\n\n---\n\nChoice C:\nautogen/safer-cluster/main.tf.tmpl\n@@ -169,6 +169,9 @@ module \"gke\" {\n // Enable cost allocation support\n enable_cost_allocation = var.enable_cost_allocation\n \n+ // Enable L4 ILB subsetting on the cluster\n+ enable_l4_ilb_subsetting = var.enable_l4_ilb_subsetting\n+\n // Use of PodSecurityPolicy admission controller\n // https://cloud.google.com/kubernetes-engine/docs/how-to/pod-security-policies\n enable_pod_security_policy = var.enable_pod_security_policy\n---\nautogen/safer-cluster/variables.tf.tmpl\n@@ -391,6 +391,12 @@ variable \"enable_intranode_visibility\" {\n default = false\n }\n \n+variable \"enable_l4_ilb_subsetting\" {\n+ type = bool\n+ description = \"Enable L4 ILB Subsetting on the cluster\"\n+ default = false\n+}\n+\n variable \"enable_vertical_pod_autoscaling\" {\n type = bool\n description = \"Vertical Pod Autoscaling automatically adjusts the resources of pods controlled by it\"\n---\nmodules/safer-cluster-update-variant/README.md\n@@ -221,6 +221,7 @@ For simplicity, we suggest using `roles/container.admin` and\n | enable\\_cost\\_allocation | Enables Cost Allocation Feature and the cluster name and namespace of your GKE workloads appear in the labels field of the billing export to BigQuery | `bool` | `false` | no |\n | enable\\_gcfs | Enable image streaming on cluster level. | `bool` | `false` | no |\n | enable\\_intranode\\_visibility | Whether Intra-node visibility is enabled for this cluster. This makes same node pod to pod traffic visible for VPC network | `bool` | `false` | no |\n+| enable\\_l4\\_ilb\\_subsetting | Enable L4 ILB Subsetting on the cluster | `bool` | `false` | no |\n | enable\\_mesh\\_certificates | Controls the issuance of workload mTLS certificates. When enabled the GKE Workload Identity Certificates controller and node agent will be deployed in the cluster. Requires Workload Identity. | `bool` | `false` | no |\n | enable\\_pod\\_security\\_policy | enabled - Enable the PodSecurityPolicy controller for this cluster. If enabled, pods must be valid under a PodSecurityPolicy to be created. | `bool` | `false` | no |\n | enable\\_private\\_endpoint | When true, the cluster's Pod endpoint is used as the cluster endpoint and access through the public endpoint is disabled. When false, either endpoint can be used. This field only applies to private clusters, when enable\\_private\\_nodes is true | `bool` | `true` | no |\n---\nmodules/safer-cluster-update-variant/main.tf\n@@ -165,6 +165,9 @@ module \"gke\" {\n // Enable cost allocation support\n enable_cost_allocation = var.enable_cost_allocation\n \n+ // Enable L4 ILB subsetting on the cluster\n+ enable_l4_ilb_subsetting = var.enable_l4_ilb_subsetting\n+\n // Use of PodSecurityPolicy admission controller\n // https://cloud.google.com/kubernetes-engine/docs/how-to/pod-security-policies\n enable_pod_security_policy = var.enable_pod_security_policy\n---\nmodules/safer-cluster-update-variant/variables.tf\n@@ -391,6 +391,12 @@ variable \"enable_intranode_visibility\" {\n default = false\n }\n \n+variable \"enable_l4_ilb_subsetting\" {\n+ type = bool\n+ description = \"Enable L4 ILB Subsetting on the cluster\"\n+ default = false\n+}\n+\n variable \"enable_vertical_pod_autoscaling\" {\n type = bool\n description = \"Vertical Pod Autoscaling automatically adjusts the resources of pods controlled by it\"\n---\nmodules/safer-cluster/README.md\n@@ -221,6 +221,7 @@ For simplicity, we suggest using `roles/container.admin` and\n | enable\\_cost\\_allocation | Enables Cost Allocation Feature and the cluster name and namespace of your GKE workloads appear in the labels field of the billing export to BigQuery | `bool` | `false` | no |\n | enable\\_gcfs | Enable image streaming on cluster level. | `bool` | `false` | no |\n | enable\\_intranode\\_visibility | Whether Intra-node visibility is enabled for this cluster. This makes same node pod to pod traffic visible for VPC network | `bool` | `false` | no |\n+| enable\\_l4\\_ilb\\_subsetting | Enable L4 ILB Subsetting on the cluster | `bool` | `false` | no |\n | enable\\_mesh\\_certificates | Controls the issuance of workload mTLS certificates. When enabled the GKE Workload Identity Certificates controller and node agent will be deployed in the cluster. Requires Workload Identity. | `bool` | `false` | no |\n | enable\\_pod\\_security\\_policy | enabled - Enable the PodSecurityPolicy controller for this cluster. If enabled, pods must be valid under a PodSecurityPolicy to be created. | `bool` | `false` | no |\n | enable\\_private\\_endpoint | When true, the cluster's private endpoint is used as the cluster endpoint and access through the public endpoint is disabled. When false, either endpoint can be used. This field only applies to private clusters, when enable\\_private\\_nodes is true | `bool` | `true` | no |\n---\nmodules/safer-cluster/main.tf\n@@ -165,6 +165,9 @@ module \"gke\" {\n // Enable cost allocation support\n enable_cost_allocation = var.enable_cost_allocation\n \n+ // Enable L4 ILB subsetting on the cluster\n+ enable_l4_ilb_subsetting = var.enable_l4_ilb_subsetting\n+\n // Use of PodSecurityPolicy admission controller\n // https://cloud.google.com/kubernetes-engine/docs/how-to/pod-security-policies\n enable_pod_security_policy = var.enable_pod_security_policy\n---\nmodules/safer-cluster/variables.tf\n@@ -391,6 +391,12 @@ variable \"enable_intranode_visibility\" {\n default = false\n }\n \n+variable \"enable_l4_ilb_subsetting\" {\n+ type = bool\n+ description = \"Enable L4 ILB Subsetting on the cluster\"\n+ default = false\n+}\n+\n variable \"enable_vertical_pod_autoscaling\" {\n type = bool\n description = \"Vertical Pod Autoscaling automatically adjusts the resources of pods controlled by it\"\n---\n\n\n---\n\nChoice D:\nautogen/safer-cluster/main.tf.tmpl\n@@ -169,6 +169,9 @@ module \"gke\" {\n // Enable cost allocation support\n enable_cost_allocation = var.enable_cost_allocation\n \n+ // Enable L4 ILB subsetting on the cluster\n+ enable_l4_ilb_subsetting = var.enable_l4_ilb_subsetting\n+\n // Use of PodSecurityPolicy admission controller\n // https://cloud.google.com/kubernetes-engine/docs/how-to/pod-security-policies\n enable_pod_security_policy = var.enable_pod_security_policy\n---\nautogen/safer-cluster/variables.tf.tmpl\n@@ -391,6 +391,12 @@ variable \"enable_intranode_visibility\" {\n default = false\n }\n \n+variable \"enable_l4_ilb_subsetting\" {\n+ type = bool\n+ description = \"Enable L4 ILB Subsetting on the cluster\"\n+ default = false\n+}\n+\n variable \"enable_vertical_pod_autoscaling\" {\n type = bool\n description = \"Vertical Pod Autoscaling automatically adjusts the resources of pods controlled by it\"\n---\nmodules/safer-cluster-update-variant/README.md\n@@ -221,6 +221,7 @@ For simplicity, we suggest using `roles/container.admin` and\n | enable\\_cost\\_allocation | Enables Cost Allocation Feature and the cluster name and namespace of your GKE workloads appear in the labels field of the billing export to BigQuery | `bool` | `false` | no |\n | enable\\_gcfs | Enable image streaming on cluster level. | `bool` | `false` | no |\n | enable\\_intranode\\_visibility | Whether Intra-node visibility is enabled for this cluster. This makes same node pod to pod traffic visible for VPC network | `bool` | `false` | no |\n+| enable\\_l4\\_ilb\\_subsetting | Enable L4 ILB Subsetting on the cluster | `bool` | `false` | no |\n | enable\\_mesh\\_certificates | Controls the issuance of workload mTLS certificates. When enabled the GKE Workload Identity Certificates controller and node agent will be deployed in the cluster. Requires Workload Identity. | `bool` | `false` | no |\n | enable\\_pod\\_security\\_policy | enabled - Enable the PodSecurityPolicy controller for this cluster. If enabled, pods must be valid under a PodSecurityPolicy to be created. | `bool` | `false` | no |\n | enable\\_private\\_endpoint | When true, the cluster's private endpoint is used as the cluster endpoint and access through the public endpoint is disabled. When false, either endpoint can be used. This field only applies to private clusters, when enable\\_private\\_nodes is true | `bool` | `true` | no |\n---\nmodules/safer-cluster-update-variant/main.tf\n@@ -165,6 +165,9 @@ module \"gke\" {\n // Enable cost allocation support\n enable_cost_allocation = var.enable_cost_allocation\n \n+ // Enable L4 ILB subsetting on the cluster\n+ enable_l4_ilb_subsetting = var.enable_l4_ilb_subsetting\n+\n // Use of PodSecurityPolicy admission controller\n // https://cloud.google.com/kubernetes-engine/docs/how-to/pod-security-policies\n enable_pod_security_policy = var.enable_pod_security_policy\n---\nmodules/safer-cluster-update-variant/variables.tf\n@@ -391,6 +391,12 @@ variable \"enable_intranode_visibility\" {\n default = false\n }\n \n+variable \"enable_l4_ilb_subsetting\" {\n+ type = bool\n+ description = \"Enable L4 ILB Subsetting on the cluster\"\n+ default = false\n+}\n+\n variable \"enable_vertical_pod_autoscaling\" {\n type = bool\n description = \"Vertical Pod Autoscaling automatically adjusts the resources of pods controlled by it\"\n---\nmodules/safer-cluster/README.md\n@@ -221,6 +221,7 @@ For simplicity, we suggest using `roles/container.admin` and\n | enable\\_cost\\_allocation | Enables Cost Allocation Feature and the cluster name and namespace of your GKE workloads appear in the labels field of the billing export to BigQuery | `bool` | `false` | no |\n | enable\\_gcfs | Enable image streaming on cluster level. | `bool` | `false` | no |\n | enable\\_intranode\\_visibility | Whether Intra-node visibility is enabled for this cluster. This makes same node pod to pod traffic visible for VPC network | `bool` | `false` | no |\n+| enable\\_l4\\_ilb\\_subsetting | Enable L4 ILB Subsetting on the cluster | `bool` | `false` | no |\n | enable\\_mesh\\_certificates | Controls the issuance of workload mTLS certificates. When enabled the GKE Workload Identity Certificates controller and node agent will be deployed in the cluster. Requires Workload Identity. | `bool` | `false` | no |\n | enable\\_pod\\_security\\_policy | enabled - Enable the PodSecurityPolicy controller for this cluster. If enabled, pods must be valid under a PodSecurityPolicy to be created. | `bool` | `false` | no |\n | enable\\_private\\_endpoint | When true, the cluster's private endpoint is used as the cluster endpoint and access through the public endpoint is disabled. When false, either endpoint can be used. This field only applies to private clusters, when enable\\_private\\_nodes is true | `bool` | `true` | no |\n---\nmodules/safer-cluster/main.tf\n@@ -165,6 +165,9 @@ module \"gke\" {\n // Enable cost allocation support\n enable_cost_allocation = var.enable_cost_allocation\n \n+ // Enable L4 ILB subsetting on the cluster\n+ enable_l4_ilb_subsetting = var.enable_l4_ilb_subsetting\n+\n // Use of PodSecurityPolicy admission controller\n // https://cloud.google.com/kubernetes-engine/docs/how-to/pod-security-policies\n enable_pod_security_policy = var.enable_pod_security_policy\n---\nmodules/safer-cluster/variables.tf\n@@ -391,6 +391,12 @@ variable \"enable_intranode_visibility\" {\n default = false\n }\n \n+variable \"enable_l4_ilb_subsetting\" {\n+ type = bool\n+ description = \"Enable L4 ILB Subsetting on the cluster\"\n+ default = false\n+}\n+\n variable \"enable_vertical_pod_autoscaling\" {\n type = bool\n description = \"Vertical Pod Autoscaling automatically adjusts the resources of pods controlled by it\"\n---\n\n\n---\n"
}
] |
D
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nNone\n\n---\n\nChoice A:\nexamples/simple_windows_node_pool/main.tf\n@@ -63,7 +63,7 @@ module \"gke\" {\n autoscaling = false\n auto_upgrade = true\n node_count = 1\n- machine_type = \"n2-standard-2\"\n+ machine_type = \"n2-standard-4\"\n image_type = \"WINDOWS_LTSC_CONTAINERD\"\n },\n ]\n---\n\n\n---\n\nChoice B:\nexamples/simple_windows_node_pool/main.tf\n@@ -63,7 +63,7 @@ module \"gke\" {\n autoscaling = false\n auto_upgrade = true\n node_count = 1\n- machine_type = \"n2-standard-2\"\n+ machine_type = \"n2-standard-4\"\n image_type = \"WINDOWS_LTSC_CONTAINERD\"\n = },\n ]\n---\n\n\n---\n\nChoice C:\nexamples/simple_windows_node_pool/main.tf\n@@ -63,7 +63,7 @@ module \"gke\" {\n autoscaling = false\n auto_upgrade = true\n = node_count = 1\n- machine_type = \"n2-standard-2\"\n+ machine_type = \"n2-standard-4\"\n image_type = \"WINDOWS_LTSC_CONTAINERD\"\n },\n ]\n---\n\n\n---\n\nChoice D:\nexamples/simple_windows_node_pool/main.tf\n@@ -63,7 +63,7 @@ module \"gke\" {\n autoscaling = false\n auto_upgrade = true\n node_count = 1\n- machine_type = \"n2-standard-2\"\n+ machine_type = \"n2-standard-4\"\n image_type = \"WINDOWS_LTSC_CONTAINERD\"\n },\n ]\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nNone\n\n---\n\nChoice A:\nautogen/main/versions.tf.tmpl\n@@ -47,12 +47,12 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, != 6.2.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, < 6.2.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, != 6.2.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, < 6.2.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n@@ -71,7 +71,7 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, != 6.2.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, < 6.2.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-private-cluster/versions.tf\n@@ -22,12 +22,12 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, != 6.2.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, < 6.2.0, < }\n google-beta = {\n source = \"hashicorp/google-beta\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, != 6.2.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, < 6.2.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-public-cluster/versions.tf\n@@ -22,12 +22,12 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, != 6.2.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, < 6.2.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, != 6.2.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, < 6.2.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\n\n\n---\n\nChoice B:\nautogen/main/versions.tf.tmpl\n@@ -47,12 +47,12 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, != 6.2.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, < 6.2.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, != 6.2.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, < 6.2.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n@@ -71,7 +71,7 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, != 6.2.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, < 6.2.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-private-cluster/versions.tf\n@@ -22,12 +22,12 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, != 6.2.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, < 6.2.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, != 6.2.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, < 6.2.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-public-cluster/versions.tf\n@@ -22,12 +22,12 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, != 6.2.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, < 6.2.0, < 7\"\n }\n }\n = {\n source = \"hashicorp/google-beta\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, != 6.2.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, < 6.2.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\n\n\n---\n\nChoice C:\nautogen/main/versions.tf.tmpl\n@@ -47,12 +47,12 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, != 6.2.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, < 6.2.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, != 6.2.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, < 6.2.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n@@ -71,7 +71,7 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, != 6.2.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, < 6.2.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-private-cluster/versions.tf\n@@ -22,12 +22,12 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, != 6.2.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, < 6.2.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- != version = \">= 5.40.0, != 5.44.0, != 6.2.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, < 6.2.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-public-cluster/versions.tf\n@@ -22,12 +22,12 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, != 6.2.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, < 6.2.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, != 6.2.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, < 6.2.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\n\n\n---\n\nChoice D:\nautogen/main/versions.tf.tmpl\n@@ -47,12 +47,12 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, != 6.2.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, < 6.2.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, != 6.2.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, < 6.2.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n@@ -71,7 +71,7 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, != 6.2.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, < 6.2.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-private-cluster/versions.tf\n@@ -22,12 +22,12 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, != 6.2.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, < 6.2.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, != 6.2.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, < 6.2.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-public-cluster/versions.tf\n@@ -22,12 +22,12 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, != 6.2.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, < 6.2.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, != 6.2.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, < 6.2.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\n\n\n---\n"
}
] |
D
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nNone\n\n---\n\nChoice A:\nautogen/main/cluster.tf.tmpl\n@@ -516,7 +516,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0].enable_gcfs] : []\n content {\n enabled = gcfs_config.value\n }\n---\ncluster.tf\n@@ -393,7 +393,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0].enable_gcfs] : []\n content {\n enabled = gcfs_config.value\n }\n---\nexamples/node_pool/main.tf\n@@ -51,6 +51,7 @@ module \"gke\" {\n max_count = 2\n service_account = var.compute_engine_service_account\n auto_upgrade = true\n+ enable_gcfs = false\n },\n {\n name = \"pool-02\"\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -439,7 +439,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0].enable_gcfs] : []\n content {\n enabled = gcfs_config.value\n }\n---\nmodules/beta-private-cluster/cluster.tf\n@@ -439,7 +439,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0].enable_gcfs] : []\n content {\n enabled = gcfs_config.value\n }\n---\nmodules/beta-public-cluster-update-variant/cluster.tf\n@@ -439,7 +439,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0].enable_gcfs] : []\n content {\n enabled = gcfs_config.value\n }\n---\nmodules/beta-public-cluster/cluster.tf\n@@ -439,7 +439,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0].enable_gcfs] : []\n content {\n enabled = gcfs_config.value\n }\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -393,7 +393,7 @@ resource \"google_container_cluster\" \"primary\" {\n -439,7 min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0].enable_gcfs] : []\n content {\n enabled = gcfs_config.value\n }\n---\nmodules/private-cluster/cluster.tf\n@@ -393,7 +393,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0].enable_gcfs] : []\n content {\n enabled = gcfs_config.value\n }\n---\n\n\n---\n\nChoice B:\nautogen/main/cluster.tf.tmpl\n@@ -516,7 +516,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0].enable_gcfs] : []\n content {\n enabled = gcfs_config.value\n }\n---\ncluster.tf\n@@ -393,7 +393,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0].enable_gcfs] : []\n content {\n enabled = gcfs_config.value\n }\n---\nexamples/node_pool/main.tf\n@@ -51,6 +51,7 @@ module \"gke\" {\n max_count = 2\n service_account = var.compute_engine_service_account\n auto_upgrade = true\n+ enable_gcfs = false\n },\n {\n name = \"pool-02\"\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -439,7 +439,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0].enable_gcfs] : []\n content {\n enabled = gcfs_config.value\n }\n---\nmodules/beta-private-cluster/cluster.tf\n@@ -439,7 +439,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0].enable_gcfs] : []\n content {\n enabled = gcfs_config.value\n }\n---\nmodules/beta-public-cluster-update-variant/cluster.tf\n@@ -439,7 +439,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0].enable_gcfs] : []\n content {\n enabled = gcfs_config.value\n }\n---\nmodules/beta-public-cluster/cluster.tf\n@@ -439,7 +439,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0].enable_gcfs] : []\n content {\n enabled = gcfs_config.value\n }\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -393,7 +393,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0].enable_gcfs] : []\n content {\n enabled = gcfs_config.value\n }\n---\nmodules/private-cluster/cluster.tf\n@@ -393,7 +393,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0].enable_gcfs] : []\n content {\n enabled = gcfs_config.value\n gcfs_config.value\n }\n---\n\n\n---\n\nChoice C:\nautogen/main/cluster.tf.tmpl\n@@ -516,7 +516,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0].enable_gcfs] : []\n content {\n enabled = gcfs_config.value\n }\n---\ncluster.tf\n@@ -393,7 +393,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0].enable_gcfs] : []\n content {\n enabled = gcfs_config.value\n }\n---\nexamples/node_pool/main.tf\n@@ -51,6 +51,7 @@ module \"gke\" {\n max_count = 2\n service_account = var.compute_engine_service_account\n auto_upgrade = true\n+ enable_gcfs = false\n },\n {\n name = \"pool-02\"\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -439,7 +439,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0].enable_gcfs] : []\n content {\n enabled = gcfs_config.value\n }\n---\nmodules/beta-private-cluster/cluster.tf\n@@ -439,7 +439,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0].enable_gcfs] : []\n content {\n enabled = gcfs_config.value\n }\n---\nmodules/beta-public-cluster-update-variant/cluster.tf\n@@ -439,7 +439,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0].enable_gcfs] : []\n content {\n enabled = gcfs_config.value\n }\n---\nmodules/beta-public-cluster/cluster.tf\n@@ -439,7 +439,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0].enable_gcfs] : []\n content {\n enabled = gcfs_config.value\n }\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -393,7 +393,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0].enable_gcfs] : []\n content {\n enabled = gcfs_config.value\n }\n---\nmodules/private-cluster/cluster.tf\n@@ -393,7 +393,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0].enable_gcfs] : []\n content {\n enabled = gcfs_config.value\n }\n---\n\n\n---\n\nChoice D:\nautogen/main/cluster.tf.tmpl\n@@ -516,7 +516,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0].enable_gcfs] : []\n content {\n enabled = gcfs_config.value\n }\n---\ncluster.tf\n@@ -393,7 +393,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0].enable_gcfs] : []\n content {\n enabled = gcfs_config.value\n }\n---\nexamples/node_pool/main.tf\n@@ -51,6 +51,7 @@ module \"gke\" {\n max_count = 2\n service_account = var.compute_engine_service_account\n auto_upgrade = true\n+ enable_gcfs = false\n },\n {\n name = \"pool-02\"\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -439,7 +439,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0].enable_gcfs] : []\n content {\n enabled = gcfs_config.value\n }\n---\nmodules/beta-private-cluster/cluster.tf\n@@ -439,7 +439,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0].enable_gcfs] : []\n content {\n enabled = gcfs_config.value\n }\n---\nmodules/beta-public-cluster-update-variant/cluster.tf\n@@ -439,7 +439,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0].enable_gcfs] = []\n content {\n enabled = gcfs_config.value\n }\n---\nmodules/beta-public-cluster/cluster.tf\n@@ -439,7 +439,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0].enable_gcfs] : []\n content {\n enabled = gcfs_config.value\n }\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -393,7 +393,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0].enable_gcfs] : []\n content {\n enabled = gcfs_config.value\n }\n---\nmodules/private-cluster/cluster.tf\n@@ -393,7 +393,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0].enable_gcfs] : []\n content {\n enabled = gcfs_config.value\n }\n---\n\n\n---\n"
}
] |
C
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\n`enable_binary_authorization` is now deprecated in favor of the `binary_authorization` block. This preserves the module's interface, but updates the underlying behavior\r\n\r\nFixes #1331\n\n---\n\nChoice A:\nautogen/main/cluster.tf.tmpl\n@@ -151,7 +151,14 @@ resource \"google_container_cluster\" \"primary\" {\n {% if autopilot_cluster != true %}\n default_max_pods_per_node = var.default_max_pods_per_node\n enable_shielded_nodes = var.enable_shielded_nodes\n- enable_binary_authorization = var.enable_binary_authorization\n+\n+ dynamic \"binary_authorization\" {\n+ for_each = var.enable_binary_authorization ? [var.enable_binary_authorization] : []\n+ content {\n+ evaluation_mode = \"PROJECT_SINGLETON_POLICY_ENFORCE\"\n+ }\n+ }\n+\n {% if beta_cluster %}\n enable_intranode_visibility = var.enable_intranode_visibility\n enable_kubernetes_alpha = var.enable_kubernetes_alpha\n---\ncluster.tf\n@@ -76,9 +76,16 @@ resource \"google_container_cluster\" \"primary\" {\n vertical_pod_autoscaling {\n enabled = var.enable_vertical_pod_autoscaling\n }\n- default_max_pods_per_node = var.default_max_pods_per_node\n- enable_shielded_nodes = var.enable_shielded_nodes\n- enable_binary_authorization = var.enable_binary_authorization\n+ default_max_pods_per_node = var.default_max_pods_per_node\n+ enable_shielded_nodes = var.enable_shielded_nodes\n+\n+ dynamic \"binary_authorization\" {\n+ for_each = var.enable_binary_authorization ? [var.enable_binary_authorization] : []\n+ content {\n+ evaluation_mode = \"PROJECT_SINGLETON_POLICY_ENFORCE\"\n+ }\n+ }\n+\n dynamic \"master_authorized_networks_config\" {\n for_each = local.master_authorized_networks_config\n content {\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -116,9 +116,16 @@ resource \"google_container_cluster\" \"primary\" {\n vertical_pod_autoscaling {\n enabled = var.enable_vertical_pod_autoscaling\n }\n- default_max_pods_per_node = var.default_max_pods_per_node\n- enable_shielded_nodes = var.enable_shielded_nodes\n- enable_binary_authorization = var.enable_binary_authorization\n+ default_max_pods_per_node = var.default_max_pods_per_node\n+ enable_shielded_nodes = var.enable_shielded_nodes\n+\n+ dynamic \"binary_authorization\" {\n+ for_each = var.enable_binary_authorization ? [var.enable_binary_authorization] : []\n+ content {\n+ evaluation_mode = \"PROJECT_SINGLETON_POLICY_ENFORCE\"\n+ }\n+ }\n+\n enable_intranode_visibility = var.enable_intranode_visibility\n enable_kubernetes_alpha = var.enable_kubernetes_alpha\n enable_tpu = var.enable_tpu\n---\nmodules/beta-private-cluster/cluster.tf\n@@ -116,9 +116,16 @@ resource \"google_container_cluster\" \"primary\" {\n vertical_pod_autoscaling {\n enabled = var.enable_vertical_pod_autoscaling\n }\n- default_max_pods_per_node = var.default_max_pods_per_node\n- enable_shielded_nodes = var.enable_shielded_nodes\n- enable_binary_authorization = var.enable_binary_authorization\n+ default_max_pods_per_node = var.default_max_pods_per_node\n+ enable_shielded_nodes = var.enable_shielded_nodes\n+\n+ dynamic \"binary_authorization\" {\n+ for_each = var.enable_binary_authorization ? vertical_pod_autoscaling : []\n+ content {\n+ evaluation_mode = \"PROJECT_SINGLETON_POLICY_ENFORCE\"\n+ }\n+ }\n+\n enable_intranode_visibility = var.enable_intranode_visibility\n enable_kubernetes_alpha = var.enable_kubernetes_alpha\n enable_tpu = var.enable_tpu\n---\nmodules/beta-public-cluster-update-variant/cluster.tf\n@@ -116,9 +116,16 @@ resource \"google_container_cluster\" \"primary\" {\n vertical_pod_autoscaling {\n enabled = var.enable_vertical_pod_autoscaling\n }\n- default_max_pods_per_node = var.default_max_pods_per_node\n- enable_shielded_nodes = var.enable_shielded_nodes\n- enable_binary_authorization = var.enable_binary_authorization\n+ default_max_pods_per_node = var.default_max_pods_per_node\n+ enable_shielded_nodes = var.enable_shielded_nodes\n+\n+ dynamic \"binary_authorization\" {\n+ for_each = var.enable_binary_authorization ? [var.enable_binary_authorization] : []\n+ content {\n+ evaluation_mode = \"PROJECT_SINGLETON_POLICY_ENFORCE\"\n+ }\n+ }\n+\n enable_intranode_visibility = var.enable_intranode_visibility\n enable_kubernetes_alpha = var.enable_kubernetes_alpha\n enable_tpu = var.enable_tpu\n---\nmodules/beta-public-cluster/cluster.tf\n@@ -116,9 +116,16 @@ resource \"google_container_cluster\" \"primary\" {\n vertical_pod_autoscaling {\n enabled = var.enable_vertical_pod_autoscaling\n }\n- default_max_pods_per_node = var.default_max_pods_per_node\n- enable_shielded_nodes = var.enable_shielded_nodes\n- enable_binary_authorization = var.enable_binary_authorization\n+ default_max_pods_per_node = var.default_max_pods_per_node\n+ enable_shielded_nodes = var.enable_shielded_nodes\n+\n+ dynamic \"binary_authorization\" {\n+ for_each = var.enable_binary_authorization ? [var.enable_binary_authorization] : []\n+ content {\n+ evaluation_mode = \"PROJECT_SINGLETON_POLICY_ENFORCE\"\n+ }\n+ }\n+\n enable_intranode_visibility = var.enable_intranode_visibility\n enable_kubernetes_alpha = var.enable_kubernetes_alpha\n enable_tpu = var.enable_tpu\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -76,9 +76,16 @@ resource \"google_container_cluster\" \"primary\" {\n vertical_pod_autoscaling {\n enabled = var.enable_vertical_pod_autoscaling\n }\n- default_max_pods_per_node = var.default_max_pods_per_node\n- enable_shielded_nodes = var.enable_shielded_nodes\n- enable_binary_authorization = var.enable_binary_authorization\n+ default_max_pods_per_node = var.default_max_pods_per_node\n+ enable_shielded_nodes = var.enable_shielded_nodes\n+\n+ dynamic \"binary_authorization\" {\n+ for_each = var.enable_binary_authorization ? [var.enable_binary_authorization] : []\n+ content {\n+ evaluation_mode = \"PROJECT_SINGLETON_POLICY_ENFORCE\"\n+ }\n+ }\n+\n dynamic \"master_authorized_networks_config\" {\n for_each = local.master_authorized_networks_config\n content {\n---\nmodules/private-cluster/cluster.tf\n@@ -76,9 +76,16 @@ resource \"google_container_cluster\" \"primary\" {\n vertical_pod_autoscaling {\n enabled = var.enable_vertical_pod_autoscaling\n }\n- default_max_pods_per_node = var.default_max_pods_per_node\n- enable_shielded_nodes = var.enable_shielded_nodes\n- enable_binary_authorization = var.enable_binary_authorization\n+ default_max_pods_per_node = var.default_max_pods_per_node\n+ enable_shielded_nodes = var.enable_shielded_nodes\n+\n+ dynamic \"binary_authorization\" {\n+ for_each = var.enable_binary_authorization ? [var.enable_binary_authorization] : []\n+ content {\n+ evaluation_mode = \"PROJECT_SINGLETON_POLICY_ENFORCE\"\n+ }\n+ }\n+\n dynamic \"master_authorized_networks_config\" {\n for_each = local.master_authorized_networks_config\n content {\n---\ntest/integration/beta_cluster/controls/gcloud.rb\n@@ -81,7 +81,7 @@\n \n it \"has the expected binaryAuthorization config\" do\n expect(data['binaryAuthorization']).to eq({\n- \"enabled\" => true,\n+ \"evaluationMode\" => \"PROJECT_SINGLETON_POLICY_ENFORCE\",\n })\n end\n \n---\ntest/integration/safer_cluster/controls/gcloud.rb\n@@ -76,7 +76,7 @@\n \n it \"has binary authorization\" do\n expect(data['binaryAuthorization']).to eq({\n- \"enabled\" => true,\n+ \"evaluationMode\" => \"PROJECT_SINGLETON_POLICY_ENFORCE\",\n })\n end\n \n---\ntest/integration/simple_regional/controls/gcloud.rb\n@@ -70,7 +70,7 @@\n \n it \"has the expected binaryAuthorization config\" do\n expect(data['binaryAuthorization']).to eq({\n- \"enabled\" => true,\n+ \"evaluationMode\" => \"PROJECT_SINGLETON_POLICY_ENFORCE\",\n })\n end\n end\n---\n\n\n---\n\nChoice B:\nautogen/main/cluster.tf.tmpl\n@@ -151,7 +151,14 @@ resource \"google_container_cluster\" \"primary\" {\n {% if autopilot_cluster != true %}\n default_max_pods_per_node = var.default_max_pods_per_node\n enable_shielded_nodes = var.enable_shielded_nodes\n- enable_binary_authorization = var.enable_binary_authorization\n+\n+ dynamic \"binary_authorization\" {\n+ for_each = var.enable_binary_authorization ? [var.enable_binary_authorization] : []\n+ content {\n+ evaluation_mode = \"PROJECT_SINGLETON_POLICY_ENFORCE\"\n+ }\n+ }\n+\n {% if beta_cluster %}\n enable_intranode_visibility = var.enable_intranode_visibility\n enable_kubernetes_alpha = var.enable_kubernetes_alpha\n---\ncluster.tf\n@@ -76,9 +76,16 @@ resource \"google_container_cluster\" \"primary\" {\n vertical_pod_autoscaling {\n enabled = var.enable_vertical_pod_autoscaling\n }\n- default_max_pods_per_node = var.default_max_pods_per_node\n- enable_shielded_nodes = var.enable_shielded_nodes\n- enable_binary_authorization = var.enable_binary_authorization\n+ default_max_pods_per_node = var.default_max_pods_per_node\n+ enable_shielded_nodes = var.enable_shielded_nodes\n+\n+ dynamic \"binary_authorization\" {\n+ for_each = var.enable_binary_authorization ? [var.enable_binary_authorization] : []\n+ content {\n+ evaluation_mode = \"PROJECT_SINGLETON_POLICY_ENFORCE\"\n+ }\n+ }\n+\n dynamic \"master_authorized_networks_config\" {\n for_each = local.master_authorized_networks_config\n content {\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -116,9 +116,16 @@ resource \"google_container_cluster\" \"primary\" {\n vertical_pod_autoscaling {\n enabled = var.enable_vertical_pod_autoscaling\n }\n- default_max_pods_per_node = var.default_max_pods_per_node\n- enable_shielded_nodes = var.enable_shielded_nodes\n- enable_binary_authorization = var.enable_binary_authorization\n+ default_max_pods_per_node = var.default_max_pods_per_node\n+ enable_shielded_nodes = var.enable_shielded_nodes\n+\n+ dynamic \"binary_authorization\" {\n+ for_each = var.enable_binary_authorization ? [var.enable_binary_authorization] : []\n+ content {\n+ evaluation_mode = \"PROJECT_SINGLETON_POLICY_ENFORCE\"\n+ }\n+ }\n+\n enable_intranode_visibility = var.enable_intranode_visibility\n enable_kubernetes_alpha = var.enable_kubernetes_alpha\n enable_tpu = var.enable_tpu\n---\nmodules/beta-private-cluster/cluster.tf\n@@ -116,9 +116,16 @@ resource \"google_container_cluster\" \"primary\" {\n vertical_pod_autoscaling {\n enabled = var.enable_vertical_pod_autoscaling\n }\n- default_max_pods_per_node = var.default_max_pods_per_node\n- enable_shielded_nodes = var.enable_shielded_nodes\n- enable_binary_authorization = var.enable_binary_authorization\n+ default_max_pods_per_node = var.default_max_pods_per_node\n+ enable_shielded_nodes = var.enable_shielded_nodes\n+\n+ dynamic \"binary_authorization\" {\n+ for_each = var.enable_binary_authorization ? [var.enable_binary_authorization] : []\n+ content {\n+ evaluation_mode = \"PROJECT_SINGLETON_POLICY_ENFORCE\"\n+ }\n+ }\n+\n enable_intranode_visibility = var.enable_intranode_visibility\n enable_kubernetes_alpha = var.enable_kubernetes_alpha\n enable_tpu = var.enable_tpu\n---\nmodules/beta-public-cluster-update-variant/cluster.tf\n@@ -116,9 +116,16 @@ resource \"google_container_cluster\" \"primary\" {\n vertical_pod_autoscaling {\n enabled = var.enable_vertical_pod_autoscaling\n }\n- default_max_pods_per_node = var.default_max_pods_per_node\n- enable_shielded_nodes = var.enable_shielded_nodes\n- enable_binary_authorization = var.enable_binary_authorization\n+ default_max_pods_per_node = var.default_max_pods_per_node\n+ enable_shielded_nodes = var.enable_shielded_nodes\n+\n+ dynamic \"binary_authorization\" {\n+ for_each = var.enable_binary_authorization ? [var.enable_binary_authorization] : []\n+ content {\n+ evaluation_mode = \"PROJECT_SINGLETON_POLICY_ENFORCE\"\n+ }\n+ }\n+\n enable_intranode_visibility = var.enable_intranode_visibility\n enable_kubernetes_alpha = var.enable_kubernetes_alpha\n enable_tpu = var.enable_tpu\n---\nmodules/beta-public-cluster/cluster.tf\n@@ -116,9 +116,16 @@ resource \"google_container_cluster\" \"primary\" {\n vertical_pod_autoscaling {\n enabled = var.enable_vertical_pod_autoscaling\n }\n- default_max_pods_per_node = var.default_max_pods_per_node\n- enable_shielded_nodes = var.enable_shielded_nodes\n- enable_binary_authorization = var.enable_binary_authorization\n+ default_max_pods_per_node = var.default_max_pods_per_node\n+ enable_shielded_nodes = var.enable_shielded_nodes\n+\n+ dynamic \"binary_authorization\" {\n+ for_each = var.enable_binary_authorization ? [var.enable_binary_authorization] : []\n+ content {\n+ evaluation_mode = \"PROJECT_SINGLETON_POLICY_ENFORCE\"\n+ }\n+ }\n+\n enable_intranode_visibility = var.enable_intranode_visibility\n enable_kubernetes_alpha = var.enable_kubernetes_alpha\n enable_tpu = var.enable_tpu\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -76,9 +76,16 @@ resource \"google_container_cluster\" \"primary\" {\n vertical_pod_autoscaling {\n enabled = var.enable_vertical_pod_autoscaling\n }\n- default_max_pods_per_node = var.default_max_pods_per_node\n- enable_shielded_nodes = var.enable_shielded_nodes\n- enable_binary_authorization = var.enable_binary_authorization\n+ default_max_pods_per_node = var.default_max_pods_per_node\n+ enable_shielded_nodes = var.enable_shielded_nodes\n+\n+ dynamic \"binary_authorization\" {\n+ for_each = var.enable_binary_authorization ? [var.enable_binary_authorization] : []\n+ content {\n+ evaluation_mode = \"PROJECT_SINGLETON_POLICY_ENFORCE\"\n+ }\n+ }\n+\n dynamic \"master_authorized_networks_config\" {\n for_each = local.master_authorized_networks_config\n content {\n---\nmodules/private-cluster/cluster.tf\n@@ -76,9 +76,16 @@ resource \"google_container_cluster\" \"primary\" {\n vertical_pod_autoscaling {\n enabled = var.enable_vertical_pod_autoscaling\n }\n- default_max_pods_per_node = var.default_max_pods_per_node\n- enable_shielded_nodes = var.enable_shielded_nodes\n- enable_binary_authorization = var.enable_binary_authorization\n+ default_max_pods_per_node = var.default_max_pods_per_node\n+ enable_shielded_nodes = var.enable_shielded_nodes\n+\n+ dynamic \"binary_authorization\" {\n+ for_each = var.enable_binary_authorization ? [var.enable_binary_authorization] : []\n+ content {\n+ evaluation_mode = \"PROJECT_SINGLETON_POLICY_ENFORCE\"\n+ }\n+ }\n+\n dynamic \"master_authorized_networks_config\" {\n for_each = local.master_authorized_networks_config\n content {\n---\ntest/integration/beta_cluster/controls/gcloud.rb\n@@ -81,7 +81,7 @@\n \n it \"has the expected binaryAuthorization config\" do\n expect(data['binaryAuthorization']).to eq({\n- \"enabled\" => true,\n+ \"evaluationMode\" => \"PROJECT_SINGLETON_POLICY_ENFORCE\",\n })\n end\n \n---\ntest/integration/safer_cluster/controls/gcloud.rb\n@@ -76,7 +76,7 @@\n \n it \"has binary authorization\" do\n expect(data['binaryAuthorization']).to eq({\n- \"enabled\" => true,\n+ \"evaluationMode\" => \"PROJECT_SINGLETON_POLICY_ENFORCE\",\n })\n end\n \n---\ntest/integration/simple_regional/controls/gcloud.rb\n@@ -70,7 +70,7 @@\n \n it \"has the expected binaryAuthorization config\" do\n expect(data['binaryAuthorization']).to eq({\n- \"enabled\" => true,\n+ \"evaluationMode\" => \"PROJECT_SINGLETON_POLICY_ENFORCE\",\n })\n end\n end\n---\n\n\n---\n\nChoice C:\nautogen/main/cluster.tf.tmpl\n@@ -151,7 +151,14 @@ resource \"google_container_cluster\" \"primary\" {\n {% if autopilot_cluster != true %}\n default_max_pods_per_node = var.default_max_pods_per_node\n enable_shielded_nodes = var.enable_shielded_nodes\n- enable_binary_authorization = var.enable_binary_authorization\n+\n+ dynamic \"binary_authorization\" {\n+ for_each = var.enable_binary_authorization ? [var.enable_binary_authorization] : []\n+ content {\n+ evaluation_mode = \"PROJECT_SINGLETON_POLICY_ENFORCE\"\n+ }\n+ }\n+\n {% if beta_cluster %}\n enable_intranode_visibility = var.enable_intranode_visibility\n enable_kubernetes_alpha = var.enable_kubernetes_alpha\n---\ncluster.tf\n@@ -76,9 +76,16 @@ resource \"google_container_cluster\" \"primary\" {\n vertical_pod_autoscaling {\n enabled = var.enable_vertical_pod_autoscaling\n }\n- default_max_pods_per_node = var.default_max_pods_per_node\n- enable_shielded_nodes = var.enable_shielded_nodes\n- enable_binary_authorization = var.enable_binary_authorization\n+ default_max_pods_per_node = var.default_max_pods_per_node\n+ enable_shielded_nodes = var.enable_shielded_nodes\n+\n+ dynamic \"binary_authorization\" {\n+ for_each = var.enable_binary_authorization ? [var.enable_binary_authorization] : []\n+ content {\n+ evaluation_mode = \"PROJECT_SINGLETON_POLICY_ENFORCE\"\n+ }\n+ }\n+\n dynamic \"master_authorized_networks_config\" {\n for_each = local.master_authorized_networks_config\n content {\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -116,9 +116,16 @@ resource \"google_container_cluster\" \"primary\" {\n vertical_pod_autoscaling {\n enabled = var.enable_vertical_pod_autoscaling\n }\n- default_max_pods_per_node = var.default_max_pods_per_node\n- enable_shielded_nodes = var.enable_shielded_nodes\n- enable_binary_authorization = var.enable_binary_authorization\n+ default_max_pods_per_node = var.default_max_pods_per_node\n+ enable_shielded_nodes = var.enable_shielded_nodes\n+\n+ dynamic \"binary_authorization\" {\n+ for_each = var.enable_binary_authorization ? [var.enable_binary_authorization] : []\n+ content {\n+ evaluation_mode = \"PROJECT_SINGLETON_POLICY_ENFORCE\"\n+ }\n+ }\n+\n enable_intranode_visibility = var.enable_intranode_visibility\n enable_kubernetes_alpha = var.enable_kubernetes_alpha\n enable_tpu = var.enable_tpu\n---\nmodules/beta-private-cluster/cluster.tf\n@@ -116,9 +116,16 @@ resource \"google_container_cluster\" \"primary\" {\n vertical_pod_autoscaling {\n enabled = var.enable_vertical_pod_autoscaling\n }\n- default_max_pods_per_node = var.default_max_pods_per_node\n- enable_shielded_nodes = var.enable_shielded_nodes\n- enable_binary_authorization = var.enable_binary_authorization\n+ default_max_pods_per_node = var.default_max_pods_per_node\n+ enable_shielded_nodes = var.enable_shielded_nodes\n+\n+ dynamic \"binary_authorization\" {\n+ for_each = var.enable_binary_authorization ? [var.enable_binary_authorization] : []\n+ content {\n+ evaluation_mode = \"PROJECT_SINGLETON_POLICY_ENFORCE\"\n+ }\n+ }\n+\n enable_intranode_visibility = var.enable_intranode_visibility\n enable_kubernetes_alpha = var.enable_kubernetes_alpha\n enable_tpu = var.enable_tpu\n---\nmodules/beta-public-cluster-update-variant/cluster.tf\n@@ -116,9 +116,16 @@ resource \"google_container_cluster\" \"primary\" {\n vertical_pod_autoscaling {\n enabled = var.enable_vertical_pod_autoscaling\n }\n- default_max_pods_per_node = var.default_max_pods_per_node\n- enable_shielded_nodes = var.enable_shielded_nodes\n- enable_binary_authorization = var.enable_binary_authorization\n+ default_max_pods_per_node = var.default_max_pods_per_node\n+ enable_shielded_nodes = var.enable_shielded_nodes\n+\n+ dynamic \"binary_authorization\" {\n+ for_each = var.enable_binary_authorization ? [var.enable_binary_authorization] : []\n+ content {\n+ evaluation_mode = \"PROJECT_SINGLETON_POLICY_ENFORCE\"\n+ }\n+ }\n+\n enable_intranode_visibility = var.enable_intranode_visibility\n enable_kubernetes_alpha = var.enable_kubernetes_alpha\n enable_tpu = var.enable_tpu\n---\nmodules/beta-public-cluster/cluster.tf\n@@ -116,9 +116,16 @@ resource \"google_container_cluster\" \"primary\" {\n vertical_pod_autoscaling {\n enabled = var.enable_vertical_pod_autoscaling\n }\n- default_max_pods_per_node = var.default_max_pods_per_node\n- enable_shielded_nodes = var.enable_shielded_nodes\n- enable_binary_authorization = var.enable_binary_authorization\n+ default_max_pods_per_node = var.default_max_pods_per_node\n+ enable_shielded_nodes = var.enable_shielded_nodes\n+\n+ dynamic \"binary_authorization\" {\n+ for_each = var.enable_binary_authorization ? [var.enable_binary_authorization] : []\n+ content {\n+ evaluation_mode = \"PROJECT_SINGLETON_POLICY_ENFORCE\"\n+ }\n+ }\n+\n enable_intranode_visibility = var.enable_intranode_visibility\n enable_kubernetes_alpha = var.enable_kubernetes_alpha\n enable_tpu = var.enable_tpu\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -76,9 +76,16 @@ resource \"google_container_cluster\" \"primary\" {\n vertical_pod_autoscaling {\n enabled = var.enable_vertical_pod_autoscaling\n }\n- default_max_pods_per_node = var.default_max_pods_per_node\n- enable_shielded_nodes = var.enable_shielded_nodes\n- enable_binary_authorization = var.enable_binary_authorization\n+ default_max_pods_per_node = var.default_max_pods_per_node\n+ enable_shielded_nodes = var.enable_shielded_nodes\n+\n+ dynamic \"binary_authorization\" {\n+ for_each = var.enable_binary_authorization ? [var.enable_binary_authorization] : []\n+ content {\n+ evaluation_mode = \"PROJECT_SINGLETON_POLICY_ENFORCE\"\n+ }\n+ }\n+\n dynamic \"master_authorized_networks_config\" {\n for_each = local.master_authorized_networks_config\n content {\n---\nmodules/private-cluster/cluster.tf\n@@ -76,9 +76,16 @@ resource \"google_container_cluster\" \"primary\" {\n vertical_pod_autoscaling {\n enabled = var.enable_vertical_pod_autoscaling\n }\n- default_max_pods_per_node = var.default_max_pods_per_node\n- enable_shielded_nodes = var.enable_shielded_nodes\n- enable_binary_authorization = var.enable_binary_authorization\n+ default_max_pods_per_node = var.default_max_pods_per_node\n+ enable_shielded_nodes = var.enable_shielded_nodes\n+\n+ dynamic \"binary_authorization\" {\n+ for_each = var.enable_binary_authorization ? [var.enable_binary_authorization] : []\n+ content {\n+ evaluation_mode = \"PROJECT_SINGLETON_POLICY_ENFORCE\"\n+ }\n+ }\n+\n dynamic \"master_authorized_networks_config\" {\n for_each = local.master_authorized_networks_config\n content {\n---\ntest/integration/beta_cluster/controls/gcloud.rb\n@@ -81,7 +81,7 @@\n \n it \"has the expected binaryAuthorization config\" do\n expect(data['binaryAuthorization']).to eq({\n- \"enabled\" => true,\n+ \"evaluationMode\" => \"PROJECT_SINGLETON_POLICY_ENFORCE\",\n })\n end\n \n---\ntest/integration/safer_cluster/controls/gcloud.rb\n@@ -76,7 +76,7 @@\n \n it \"has binary authorization\" do\n expect(data['binaryAuthorization']).to eq({\n- \"enabled\" => true,\n+ \"evaluationMode\" => \"PROJECT_SINGLETON_POLICY_ENFORCE\",\n })\n end\n \n---\ntest/integration/simple_regional/controls/gcloud.rb\n@@ -70,7 +70,7 @@\n \n it \"has the expected binaryAuthorization config\" do\n expect(data['binaryAuthorization']).to eq({\n- \"enabled\" => true,\n+ \"evaluationMode\" => \"PROJECT_SINGLETON_POLICY_ENFORCE\",\n })\n end\n end\n---\n\n\n---\n\nChoice D:\nautogen/main/cluster.tf.tmpl\n@@ -151,7 +151,14 @@ resource \"google_container_cluster\" \"primary\" {\n {% if autopilot_cluster != true %}\n default_max_pods_per_node = var.default_max_pods_per_node\n enable_shielded_nodes = var.enable_shielded_nodes\n- enable_binary_authorization = var.enable_binary_authorization\n+\n+ dynamic \"binary_authorization\" {\n+ for_each = var.enable_binary_authorization ? [var.enable_binary_authorization] : []\n+ content {\n+ evaluation_mode = \"PROJECT_SINGLETON_POLICY_ENFORCE\"\n+ }\n+ }\n+\n {% if beta_cluster %}\n enable_intranode_visibility = var.enable_intranode_visibility\n enable_kubernetes_alpha = var.enable_kubernetes_alpha\n---\ncluster.tf\n@@ -76,9 +76,16 @@ resource \"google_container_cluster\" \"primary\" {\n vertical_pod_autoscaling {\n enabled = var.enable_vertical_pod_autoscaling\n }\n- default_max_pods_per_node = var.default_max_pods_per_node\n- enable_shielded_nodes = var.enable_shielded_nodes\n- enable_binary_authorization = var.enable_binary_authorization\n+ default_max_pods_per_node = var.default_max_pods_per_node\n+ enable_shielded_nodes = var.enable_shielded_nodes\n+\n+ dynamic \"binary_authorization\" {\n+ for_each = var.enable_binary_authorization ? [var.enable_binary_authorization] : []\n+ content {\n+ evaluation_mode = \"PROJECT_SINGLETON_POLICY_ENFORCE\"\n+ }\n+ }\n+\n dynamic \"master_authorized_networks_config\" {\n for_each = local.master_authorized_networks_config\n content {\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -116,9 +116,16 @@ resource \"google_container_cluster\" \"primary\" {\n vertical_pod_autoscaling {\n enabled = var.enable_vertical_pod_autoscaling\n }\n- default_max_pods_per_node = var.default_max_pods_per_node\n- enable_shielded_nodes = var.enable_shielded_nodes\n- enable_binary_authorization = var.enable_binary_authorization\n+ default_max_pods_per_node = var.default_max_pods_per_node\n+ enable_shielded_nodes = var.enable_shielded_nodes\n+\n+ dynamic \"binary_authorization\" {\n+ for_each = var.enable_binary_authorization ? [var.enable_binary_authorization] : []\n+ content {\n+ evaluation_mode = \"PROJECT_SINGLETON_POLICY_ENFORCE\"\n+ }\n+ }\n+\n = var.enable_intranode_visibility\n enable_kubernetes_alpha = var.enable_kubernetes_alpha\n enable_tpu = var.enable_tpu\n---\nmodules/beta-private-cluster/cluster.tf\n@@ -116,9 +116,16 @@ resource \"google_container_cluster\" \"primary\" {\n vertical_pod_autoscaling {\n enabled = var.enable_vertical_pod_autoscaling\n }\n- default_max_pods_per_node = var.default_max_pods_per_node\n- enable_shielded_nodes = var.enable_shielded_nodes\n- enable_binary_authorization = var.enable_binary_authorization\n+ default_max_pods_per_node = var.default_max_pods_per_node\n+ enable_shielded_nodes = var.enable_shielded_nodes\n+\n+ dynamic \"binary_authorization\" {\n+ for_each = var.enable_binary_authorization ? [var.enable_binary_authorization] : []\n+ content {\n+ evaluation_mode = \"PROJECT_SINGLETON_POLICY_ENFORCE\"\n+ }\n+ }\n+\n enable_intranode_visibility = var.enable_intranode_visibility\n enable_kubernetes_alpha = var.enable_kubernetes_alpha\n enable_tpu = var.enable_tpu\n---\nmodules/beta-public-cluster-update-variant/cluster.tf\n@@ -116,9 +116,16 @@ resource \"google_container_cluster\" \"primary\" {\n vertical_pod_autoscaling {\n enabled = var.enable_vertical_pod_autoscaling\n }\n- default_max_pods_per_node = var.default_max_pods_per_node\n- enable_shielded_nodes = var.enable_shielded_nodes\n- enable_binary_authorization = var.enable_binary_authorization\n+ default_max_pods_per_node = var.default_max_pods_per_node\n+ enable_shielded_nodes = var.enable_shielded_nodes\n+\n+ dynamic \"binary_authorization\" {\n+ for_each = var.enable_binary_authorization ? [var.enable_binary_authorization] : []\n+ content {\n+ evaluation_mode = \"PROJECT_SINGLETON_POLICY_ENFORCE\"\n+ }\n+ }\n+\n enable_intranode_visibility = var.enable_intranode_visibility\n enable_kubernetes_alpha = var.enable_kubernetes_alpha\n enable_tpu = var.enable_tpu\n---\nmodules/beta-public-cluster/cluster.tf\n@@ -116,9 +116,16 @@ resource \"google_container_cluster\" \"primary\" {\n vertical_pod_autoscaling {\n enabled = var.enable_vertical_pod_autoscaling\n }\n- default_max_pods_per_node = var.default_max_pods_per_node\n- enable_shielded_nodes = var.enable_shielded_nodes\n- enable_binary_authorization = var.enable_binary_authorization\n+ default_max_pods_per_node = var.default_max_pods_per_node\n+ enable_shielded_nodes = var.enable_shielded_nodes\n+\n+ dynamic \"binary_authorization\" {\n+ for_each = var.enable_binary_authorization ? [var.enable_binary_authorization] : []\n+ content {\n+ evaluation_mode = \"PROJECT_SINGLETON_POLICY_ENFORCE\"\n+ }\n+ }\n+\n enable_intranode_visibility = var.enable_intranode_visibility\n enable_kubernetes_alpha = var.enable_kubernetes_alpha\n enable_tpu = var.enable_tpu\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -76,9 +76,16 @@ resource \"google_container_cluster\" \"primary\" {\n vertical_pod_autoscaling {\n enabled = var.enable_vertical_pod_autoscaling\n }\n- default_max_pods_per_node = var.default_max_pods_per_node\n- enable_shielded_nodes = var.enable_shielded_nodes\n- enable_binary_authorization = var.enable_binary_authorization\n+ default_max_pods_per_node = var.default_max_pods_per_node\n+ enable_shielded_nodes = var.enable_shielded_nodes\n+\n+ dynamic \"binary_authorization\" {\n+ for_each = var.enable_binary_authorization ? [var.enable_binary_authorization] : []\n+ content {\n+ evaluation_mode = \"PROJECT_SINGLETON_POLICY_ENFORCE\"\n+ }\n+ }\n+\n dynamic \"master_authorized_networks_config\" {\n for_each = local.master_authorized_networks_config\n content {\n---\nmodules/private-cluster/cluster.tf\n@@ -76,9 +76,16 @@ resource \"google_container_cluster\" \"primary\" {\n vertical_pod_autoscaling {\n enabled = var.enable_vertical_pod_autoscaling\n }\n- default_max_pods_per_node = var.default_max_pods_per_node\n- enable_shielded_nodes = var.enable_shielded_nodes\n- enable_binary_authorization = var.enable_binary_authorization\n+ default_max_pods_per_node = var.default_max_pods_per_node\n+ enable_shielded_nodes = var.enable_shielded_nodes\n+\n+ dynamic \"binary_authorization\" {\n+ for_each = var.enable_binary_authorization ? [var.enable_binary_authorization] : []\n+ content {\n+ evaluation_mode = \"PROJECT_SINGLETON_POLICY_ENFORCE\"\n+ }\n+ }\n+\n dynamic \"master_authorized_networks_config\" {\n for_each = local.master_authorized_networks_config\n content {\n---\ntest/integration/beta_cluster/controls/gcloud.rb\n@@ -81,7 +81,7 @@\n \n it \"has the expected binaryAuthorization config\" do\n expect(data['binaryAuthorization']).to eq({\n- \"enabled\" => true,\n+ \"evaluationMode\" => \"PROJECT_SINGLETON_POLICY_ENFORCE\",\n })\n end\n \n---\ntest/integration/safer_cluster/controls/gcloud.rb\n@@ -76,7 +76,7 @@\n \n it \"has binary authorization\" do\n expect(data['binaryAuthorization']).to eq({\n- \"enabled\" => true,\n+ \"evaluationMode\" => \"PROJECT_SINGLETON_POLICY_ENFORCE\",\n })\n end\n \n---\ntest/integration/simple_regional/controls/gcloud.rb\n@@ -70,7 +70,7 @@\n \n it \"has the expected binaryAuthorization config\" do\n expect(data['binaryAuthorization']).to eq({\n- \"enabled\" => true,\n+ \"evaluationMode\" => \"PROJECT_SINGLETON_POLICY_ENFORCE\",\n })\n end\n end\n---\n\n\n---\n"
}
] |
B
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nFixes: #2048\n\n---\n\nChoice A:\nautogen/main/cluster.tf.tmpl\n@@ -516,7 +516,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", false) ? [true] : [false]\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n content {\n enabled = gcfs_config.value\n }\n---\ncluster.tf\n@@ -393,7 +393,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", false) ? [true] : [false]\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n content {\n enabled = gcfs_config.value\n }\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -439,7 +439,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", false) ? [true] : [false]\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n content {\n enabled = gcfs_config.value\n }\n---\nmodules/beta-private-cluster/cluster.tf\n@@ -439,7 +439,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n resource enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", false) ? [true] : [false]\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n content {\n enabled = gcfs_config.value\n }\n---\nmodules/beta-public-cluster-update-variant/cluster.tf\n@@ -439,7 +439,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", false) ? [true] : [false]\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n content {\n enabled = gcfs_config.value\n }\n---\nmodules/beta-public-cluster/cluster.tf\n@@ -439,7 +439,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", false) ? [true] : [false]\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n content {\n enabled = gcfs_config.value\n }\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -393,7 +393,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", false) ? [true] : [false]\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n content {\n enabled = gcfs_config.value\n }\n---\nmodules/private-cluster/cluster.tf\n@@ -393,7 +393,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", false) ? [true] : [false]\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n content {\n enabled = gcfs_config.value\n }\n---\n\n\n---\n\nChoice B:\nautogen/main/cluster.tf.tmpl\n@@ -516,7 +516,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", false) ? [true] : [false]\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n content {\n enabled = gcfs_config.value\n }\n---\ncluster.tf\n@@ -393,7 +393,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", false) ? [true] : [false]\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n content {\n enabled = gcfs_config.value\n }\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -439,7 +439,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", false) ? [true] : [false]\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n content {\n enabled = gcfs_config.value\n }\n---\nmodules/beta-private-cluster/cluster.tf\n@@ -439,7 +439,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", false) ? [true] : [false]\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n content {\n enabled = gcfs_config.value\n }\n---\nmodules/beta-public-cluster-update-variant/cluster.tf\n@@ -439,7 +439,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", false) ? [true] : [false]\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n content {\n enabled = gcfs_config.value\n }\n---\nmodules/beta-public-cluster/cluster.tf\n@@ -439,7 +439,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", false) ? [true] : [false]\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n content {\n enabled = gcfs_config.value\n }\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -393,7 +393,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", false) ? [true] : [false]\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n {\n enabled = gcfs_config.value\n }\n---\nmodules/private-cluster/cluster.tf\n@@ -393,7 +393,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", false) ? [true] : [false]\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n content {\n enabled = gcfs_config.value\n }\n---\n\n\n---\n\nChoice C:\nautogen/main/cluster.tf.tmpl\n@@ -516,7 +516,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", false) ? [true] : [false]\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n content {\n enabled = gcfs_config.value\n }\n---\ncluster.tf\n@@ -393,7 +393,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", false) ? [true] : [false]\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n content {\n enabled = gcfs_config.value\n }\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -439,7 +439,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", false) ? [true] : [false]\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n content {\n enabled = gcfs_config.value\n }\n---\nmodules/beta-private-cluster/cluster.tf\n@@ -439,7 +439,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", false) ? [true] : [false]\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n content {\n enabled = gcfs_config.value\n }\n---\nmodules/beta-public-cluster-update-variant/cluster.tf\n@@ -439,7 +439,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", false) ? [true] : [false]\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n content {\n enabled = gcfs_config.value\n }\n---\nmodules/beta-public-cluster/cluster.tf\n@@ -439,7 +439,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", false) ? [true] : [false]\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n content {\n enabled = gcfs_config.value\n }\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -393,7 +393,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", false) ? [true] : [false]\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n content {\n enabled = gcfs_config.value\n }\n---\nmodules/private-cluster/cluster.tf\n@@ -393,7 +393,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", false) ? [true] : [false]\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n content {\n enabled = gcfs_config.value\n }\n---\n\n\n---\n\nChoice D:\nautogen/main/cluster.tf.tmpl\n@@ -516,7 +516,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", false) ? [true] : [false]\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n content {\n enabled = gcfs_config.value\n }\n---\ncluster.tf\n@@ -393,7 +393,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", false) ? [true] : [false]\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n content {\n enabled = gcfs_config.value\n }\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -439,7 +439,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", false) ? [true] : [false]\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n content {\n enabled = gcfs_config.value\n }\n---\nmodules/beta-private-cluster/cluster.tf\n@@ -439,7 +439,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", false) ? [true] : [false]\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n content {\n enabled = gcfs_config.value\n }\n---\nmodules/beta-public-cluster-update-variant/cluster.tf\n@@ -439,7 +439,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", false) ? [true] : [false]\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n content {\n enabled = gcfs_config.value\n }\n---\nmodules/beta-public-cluster/cluster.tf\n@@ -439,7 +439,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", false) ? [true] : [false]\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n content {\n enabled = gcfs_config.value\n }\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -393,7 +393,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", false) ? [true] : [false]\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n content {\n enabled = gcfs_config.value\n }\n---\nmodules/private-cluster/cluster.tf\n@@ -393,7 +393,7 @@ resource \"google_container_cluster\" \"primary\" {\n min_cpu_platform = lookup(var.node_pools[0], \"min_cpu_platform\", \"\")\n enable_confidential_storage = lookup(var.node_pools[0], \"enable_confidential_storage\", false)\n dynamic \"gcfs_config\" {\n- for_each = lookup(var.node_pools[0], \"enable_gcfs\", false) ? [true] : [false]\n+ for_each = lookup(var.node_pools[0], \"enable_gcfs\", null) != null ? [var.node_pools[0]] : []\n content {\n enabled = gcfs_config.value\n }\n---\n\n\n---\n"
}
] |
C
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nFixes: #2069\n\n---\n\nChoice A:\nmodules/asm/versions.tf\n@@ -26,12 +26,12 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Avoid v4.49 and v4.50 for https://github.com/hashicorp/terraform-provider-google/issues/13507\n- version = \">= 4.47.0, != 4.49.0, != 4.50.0, < 6\"\n+ version = \">= 4.47.0, != 4.49.0, != 4.50.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n {\n Avoid v4.49 and v4.50 for https://github.com/hashicorp/terraform-provider-google/issues/13507\n- version = \">= 4.47.0, != 4.49.0, != 4.50.0, < 6\"\n+ version = \">= 4.47.0, != 4.49.0, != 4.50.0, < 7\"\n }\n }\n \n---\nmodules/auth/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Avoid v4.49 and v4.50 for https://github.com/hashicorp/terraform-provider-google/issues/13507\n- version = \">= 4.47.0, != 4.49.0, != 4.50.0, < 6\"\n+ version = \">= 4.47.0, != 4.49.0, != 4.50.0, < 7\"\n }\n }\n \n---\n\n\n---\n\nChoice B:\nmodules/asm/versions.tf\n@@ -26,12 +26,12 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Avoid v4.49 and v4.50 for https://github.com/hashicorp/terraform-provider-google/issues/13507\n- version = \">= 4.47.0, != 4.49.0, != 4.50.0, < 6\"\n+ version = \">= 4.47.0, != 4.49.0, != 4.50.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n # Avoid v4.49 and v4.50 for https://github.com/hashicorp/terraform-provider-google/issues/13507\n- version = \">= 4.47.0, != 4.49.0, != 4.50.0, < 6\"\n+ version = \">= != 4.49.0, != 4.50.0, < 7\"\n }\n }\n \n---\nmodules/auth/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Avoid v4.49 and v4.50 for https://github.com/hashicorp/terraform-provider-google/issues/13507\n- version = \">= 4.47.0, != 4.49.0, != 4.50.0, < 6\"\n+ version = \">= 4.47.0, != 4.49.0, != 4.50.0, < 7\"\n }\n }\n \n---\n\n\n---\n\nChoice C:\nmodules/asm/versions.tf\n@@ -26,12 +26,12 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Avoid v4.49 and v4.50 for https://github.com/hashicorp/terraform-provider-google/issues/13507\n- version = \">= 4.47.0, != 4.49.0, != 4.50.0, < 6\"\n+ version = \">= 4.47.0, != 4.49.0, != 4.50.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n # Avoid v4.49 and v4.50 for https://github.com/hashicorp/terraform-provider-google/issues/13507\n- version = \">= 4.47.0, != 4.49.0, != 4.50.0, < 6\"\n+ version = \">= 4.47.0, != 4.49.0, != 4.50.0, < 7\"\n }\n }\n \n---\nmodules/auth/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Avoid v4.49 and v4.50 for https://github.com/hashicorp/terraform-provider-google/issues/13507\n- version = \">= 4.47.0, != 4.49.0, != 4.50.0, < 6\"\n+ version = \">= 4.47.0, != 4.49.0, != 4.50.0, < 7\"\n }\n }\n \n---\n\n\n---\n\nChoice D:\nmodules/asm/versions.tf\n@@ -26,12 +26,12 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Avoid v4.49 and v4.50 for https://github.com/hashicorp/terraform-provider-google/issues/13507\n- version = \">= 4.47.0, != 4.49.0, != 4.50.0, < 6\"\n+ version = \">= 4.47.0, != 4.49.0, != 4.50.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n # Avoid v4.49 and v4.50 for https://github.com/hashicorp/terraform-provider-google/issues/13507\n- version = \">= 4.47.0, != 4.49.0, != 4.50.0, < 6\"\n+ version = \">= 4.47.0, != 4.49.0, != 4.50.0, < 7\"\n }\n }\n \n---\nmodules/auth/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Avoid v4.49 and v4.50 for https://github.com/hashicorp/terraform-provider-google/issues/13507\n- version = \">= 4.47.0, != 4.49.0, != 4.50.0, < 6\"\n+ version = \">= 4.47.0, != 4.49.0, != 4.50.0, < 7\"\n }\n }\n \n---\n\n\n---\n"
}
] |
C
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nEnable Cloud DNS support for safer clusters\n\n---\n\nChoice A:\nautogen/safer-cluster/main.tf.tmpl\n@@ -141,6 +141,12 @@ module \"gke\" {\n \n dns_cache = var.dns_cache\n \n+ cluster_dns_provider = var.cluster_dns_provider\n+\n+ cluster_dns_scope = var.cluster_dns_scope\n+\n+ cluster_dns_domain = var.cluster_dns_domain\n+\n config_connector = var.config_connector\n \n default_max_pods_per_node = var.default_max_pods_per_node\n---\nautogen/safer-cluster/variables.tf.tmpl\n@@ -273,6 +273,24 @@ variable \"dns_cache\" {\n default = false\n }\n \n+variable \"cluster_dns_provider\" {\n+ type = string\n+ description = applied in-cluster DNS provider should be used. PROVIDER_UNSPECIFIED (default) or PLATFORM_DEFAULT or CLOUD_DNS.\"\n+ default = \"PROVIDER_UNSPECIFIED\"\n+}\n+\n+variable \"cluster_dns_scope\" {\n+ type = string\n+ description = \"The scope of access to cluster DNS records. DNS_SCOPE_UNSPECIFIED (default) or CLUSTER_SCOPE or VPC_SCOPE. \"\n+ default = \"DNS_SCOPE_UNSPECIFIED\"\n+}\n+\n+variable \"cluster_dns_domain\" {\n+ type = string\n+ description = \"The suffix used for all cluster service records.\"\n+ default = \"\"\n+}\n+\n variable \"default_max_pods_per_node\" {\n description = \"The maximum number of pods to schedule per node\"\n default = 110\n---\nmodules/safer-cluster-update-variant/README.md\n@@ -204,6 +204,9 @@ For simplicity, we suggest using `roles/container.admin` and\n | add\\_cluster\\_firewall\\_rules | Create additional firewall rules | `bool` | `false` | no |\n | authenticator\\_security\\_group | The name of the RBAC security group for use with Google security groups in Kubernetes RBAC. Group name must be in format gke-security-groups@yourdomain.com | `string` | `null` | no |\n | cloudrun | (Beta) Enable CloudRun addon | `bool` | `false` | no |\n+| cluster\\_dns\\_domain | The suffix used for all cluster service records. | `string` | `\"\"` | no |\n+| cluster\\_dns\\_provider | Which in-cluster DNS provider should be used. PROVIDER\\_UNSPECIFIED (default) or PLATFORM\\_DEFAULT or CLOUD\\_DNS. | `string` | `\"PROVIDER_UNSPECIFIED\"` | no |\n+| cluster\\_dns\\_scope | The scope of access to cluster DNS records. DNS\\_SCOPE\\_UNSPECIFIED (default) or CLUSTER\\_SCOPE or VPC\\_SCOPE. | `string` | `\"DNS_SCOPE_UNSPECIFIED\"` | no |\n | cluster\\_resource\\_labels | The GCE resource labels (a map of key/value pairs) to be applied to the cluster | `map(string)` | `{}` | no |\n | compute\\_engine\\_service\\_account | Use the given service account for nodes rather than creating a new dedicated service account. | `string` | `\"\"` | no |\n | config\\_connector | (Beta) Whether ConfigConnector is enabled for this cluster. | `bool` | `false` | no |\n---\nmodules/safer-cluster-update-variant/main.tf\n@@ -137,6 +137,12 @@ module \"gke\" {\n \n dns_cache = var.dns_cache\n \n+ cluster_dns_provider = var.cluster_dns_provider\n+\n+ cluster_dns_scope = var.cluster_dns_scope\n+\n+ cluster_dns_domain = var.cluster_dns_domain\n+\n config_connector = var.config_connector\n \n default_max_pods_per_node = var.default_max_pods_per_node\n---\nmodules/safer-cluster-update-variant/variables.tf\n@@ -273,6 +273,24 @@ variable \"dns_cache\" {\n default = false\n }\n \n+variable \"cluster_dns_provider\" {\n+ type = string\n+ description = \"Which in-cluster DNS provider should be used. PROVIDER_UNSPECIFIED (default) or PLATFORM_DEFAULT or CLOUD_DNS.\"\n+ default = \"PROVIDER_UNSPECIFIED\"\n+}\n+\n+variable \"cluster_dns_scope\" {\n+ type = string\n+ description = \"The scope of access to cluster DNS records. DNS_SCOPE_UNSPECIFIED (default) or CLUSTER_SCOPE or VPC_SCOPE. \"\n+ default = \"DNS_SCOPE_UNSPECIFIED\"\n+}\n+\n+variable \"cluster_dns_domain\" {\n+ type = string\n+ description = \"The suffix used for all cluster service records.\"\n+ default = \"\"\n+}\n+\n variable \"default_max_pods_per_node\" {\n description = \"The maximum number of pods to schedule per node\"\n default = 110\n---\nmodules/safer-cluster/README.md\n@@ -204,6 +204,9 @@ For simplicity, we suggest using `roles/container.admin` and\n | add\\_cluster\\_firewall\\_rules | Create additional firewall rules | `bool` | `false` | no |\n | authenticator\\_security\\_group | The name of the RBAC security group for use with Google security groups in Kubernetes RBAC. Group name must be in format gke-security-groups@yourdomain.com | `string` | `null` | no |\n | cloudrun | (Beta) Enable CloudRun addon | `bool` | `false` | no |\n+| cluster\\_dns\\_domain | The suffix used for all cluster service records. | `string` | `\"\"` | no |\n+| cluster\\_dns\\_provider | Which in-cluster DNS provider should be used. PROVIDER\\_UNSPECIFIED (default) or PLATFORM\\_DEFAULT or CLOUD\\_DNS. | `string` | `\"PROVIDER_UNSPECIFIED\"` | no |\n+| cluster\\_dns\\_scope | The scope of access to cluster DNS records. DNS\\_SCOPE\\_UNSPECIFIED (default) or CLUSTER\\_SCOPE or VPC\\_SCOPE. | `string` | `\"DNS_SCOPE_UNSPECIFIED\"` | no |\n | cluster\\_resource\\_labels | The GCE resource labels (a map of key/value pairs) to be applied to the cluster | `map(string)` | `{}` | no |\n | compute\\_engine\\_service\\_account | Use the given service account for nodes rather than creating a new dedicated service account. | `string` | `\"\"` | no |\n | config\\_connector | (Beta) Whether ConfigConnector is enabled for this cluster. | `bool` | `false` | no |\n---\nmodules/safer-cluster/main.tf\n@@ -137,6 +137,12 @@ module \"gke\" {\n \n dns_cache = var.dns_cache\n \n+ cluster_dns_provider = var.cluster_dns_provider\n+\n+ cluster_dns_scope = var.cluster_dns_scope\n+\n+ cluster_dns_domain = var.cluster_dns_domain\n+\n config_connector = var.config_connector\n \n default_max_pods_per_node = var.default_max_pods_per_node\n---\nmodules/safer-cluster/variables.tf\n@@ -273,6 +273,24 @@ variable \"dns_cache\" {\n default = false\n }\n \n+variable \"cluster_dns_provider\" {\n+ type = string\n+ description = \"Which in-cluster DNS provider should be used. PROVIDER_UNSPECIFIED (default) or PLATFORM_DEFAULT or CLOUD_DNS.\"\n+ default = \"PROVIDER_UNSPECIFIED\"\n+}\n+\n+variable \"cluster_dns_scope\" {\n+ type = string\n+ description = \"The scope of access to cluster DNS records. DNS_SCOPE_UNSPECIFIED (default) or CLUSTER_SCOPE or VPC_SCOPE. \"\n+ default = \"DNS_SCOPE_UNSPECIFIED\"\n+}\n+\n+variable \"cluster_dns_domain\" {\n+ type = string\n+ description = \"The suffix used for all cluster service records.\"\n+ default = \"\"\n+}\n+\n variable \"default_max_pods_per_node\" {\n description = \"The maximum number of pods to schedule per node\"\n default = 110\n---\n\n\n---\n\nChoice B:\nautogen/safer-cluster/main.tf.tmpl\n@@ -141,6 +141,12 @@ module \"gke\" {\n \n dns_cache = var.dns_cache\n \n+ cluster_dns_provider = var.cluster_dns_provider\n+\n+ cluster_dns_scope = var.cluster_dns_scope\n+\n+ cluster_dns_domain = var.cluster_dns_domain\n+\n config_connector = var.config_connector\n \n default_max_pods_per_node = var.default_max_pods_per_node\n---\nautogen/safer-cluster/variables.tf.tmpl\n@@ -273,6 +273,24 @@ variable \"dns_cache\" {\n default = false\n }\n \n+variable \"cluster_dns_provider\" {\n+ type = string\n+ description = \"Which in-cluster DNS provider should be used. PROVIDER_UNSPECIFIED (default) or PLATFORM_DEFAULT or CLOUD_DNS.\"\n+ default = \"PROVIDER_UNSPECIFIED\"\n+}\n+\n+variable \"cluster_dns_scope\" {\n+ type = string\n+ description = \"The scope of access to cluster DNS records. DNS_SCOPE_UNSPECIFIED (default) or CLUSTER_SCOPE or VPC_SCOPE. \"\n+ default = \"DNS_SCOPE_UNSPECIFIED\"\n+}\n+\n+variable \"cluster_dns_domain\" {\n+ type = string\n+ description = \"The suffix used for all cluster service records.\"\n+ default = \"\"\n+}\n+\n variable \"default_max_pods_per_node\" {\n description = \"The maximum number of pods to schedule per node\"\n default = 110\n---\nmodules/safer-cluster-update-variant/README.md\n@@ -204,6 +204,9 @@ For simplicity, we suggest using `roles/container.admin` and\n | add\\_cluster\\_firewall\\_rules | Create additional firewall rules | `bool` | `false` | no |\n | authenticator\\_security\\_group | The name of the RBAC security group for use with Google security groups in Kubernetes RBAC. Group name must be in format gke-security-groups@yourdomain.com | `string` | `null` | no |\n | cloudrun | (Beta) Enable CloudRun addon | `bool` | `false` | no |\n+| cluster\\_dns\\_domain | The suffix used for all cluster service records. | `string` | `\"\"` | no |\n+| cluster\\_dns\\_provider | Which in-cluster DNS provider should be used. PROVIDER\\_UNSPECIFIED (default) or PLATFORM\\_DEFAULT or CLOUD\\_DNS. | `string` | `\"PROVIDER_UNSPECIFIED\"` | no |\n+| cluster\\_dns\\_scope | The scope of access to cluster DNS records. DNS\\_SCOPE\\_UNSPECIFIED (default) or CLUSTER\\_SCOPE or VPC\\_SCOPE. | `string` | `\"DNS_SCOPE_UNSPECIFIED\"` | no |\n | cluster\\_resource\\_labels | The GCE resource labels (a map of key/value pairs) to be applied to the cluster | `map(string)` | `{}` | no |\n | compute\\_engine\\_service\\_account | Use the given service account for nodes rather than creating a new dedicated service account. | `string` | `\"\"` | no |\n | config\\_connector | (Beta) Whether ConfigConnector is enabled for this cluster. | `bool` | `false` | no |\n---\nmodules/safer-cluster-update-variant/main.tf\n@@ -137,6 +137,12 @@ module \"gke\" {\n \n dns_cache = var.dns_cache\n \n+ cluster_dns_provider = var.cluster_dns_provider\n+\n+ cluster_dns_scope = var.cluster_dns_scope\n+\n+ cluster_dns_domain = var.cluster_dns_domain\n+\n config_connector = var.config_connector\n \n default_max_pods_per_node = var.default_max_pods_per_node\n---\nmodules/safer-cluster-update-variant/variables.tf\n@@ -273,6 +273,24 @@ variable \"dns_cache\" {\n default = false\n }\n \n+variable \"cluster_dns_provider\" {\n+ type = string\n+ description = \"Which in-cluster DNS provider should be used. PROVIDER_UNSPECIFIED (default) or PLATFORM_DEFAULT or CLOUD_DNS.\"\n+ default = \"PROVIDER_UNSPECIFIED\"\n+}\n+\n+variable \"cluster_dns_scope\" {\n+ type = string\n+ description = \"The scope of access to cluster DNS records. DNS_SCOPE_UNSPECIFIED (default) or CLUSTER_SCOPE or VPC_SCOPE. \"\n+ default = \"DNS_SCOPE_UNSPECIFIED\"\n+}\n+\n+variable \"cluster_dns_domain\" {\n+ type = string\n+ description = \"The suffix used for all cluster service records.\"\n+ default = \"\"\n+}\n+\n variable \"default_max_pods_per_node\" {\n description = \"The maximum number of pods to schedule per node\"\n default = 110\n---\nmodules/safer-cluster/README.md\n@@ -204,6 +204,9 @@ For simplicity, we suggest using `roles/container.admin` and\n | add\\_cluster\\_firewall\\_rules | Create additional firewall rules | `bool` | `false` | no |\n | authenticator\\_security\\_group | The name of the RBAC security group for use with Google security groups in Kubernetes RBAC. Group name must be in format gke-security-groups@yourdomain.com | `string` | `null` | no |\n | cloudrun | (Beta) Enable CloudRun addon | `bool` | `false` | no |\n+| cluster\\_dns\\_domain | The suffix used for all cluster service records. | `string` | `\"\"` | no |\n+| cluster\\_dns\\_provider | Which in-cluster DNS provider should be used. PROVIDER\\_UNSPECIFIED (default) or PLATFORM\\_DEFAULT or CLOUD\\_DNS. | `string` | `\"PROVIDER_UNSPECIFIED\"` | no |\n+| cluster\\_dns\\_scope | The scope of access to cluster DNS records. DNS\\_SCOPE\\_UNSPECIFIED (default) or CLUSTER\\_SCOPE or VPC\\_SCOPE. | `string` | `\"DNS_SCOPE_UNSPECIFIED\"` | no |\n | cluster\\_resource\\_labels | The GCE resource labels (a map of key/value pairs) to be applied to the cluster | `map(string)` | `{}` | no |\n | compute\\_engine\\_service\\_account | Use the given service account for nodes rather than creating a new dedicated service account. | `string` | `\"\"` | no |\n | config\\_connector | (Beta) Whether ConfigConnector is enabled for this cluster. | `bool` | `false` | no |\n---\nmodules/safer-cluster/main.tf\n@@ -137,6 +137,12 @@ module \"gke\" {\n \n dns_cache = var.dns_cache\n \n+ cluster_dns_provider = var.cluster_dns_provider\n+\n+ cluster_dns_scope = var.cluster_dns_scope\n+\n+ cluster_dns_domain = var.cluster_dns_domain\n+\n config_connector = var.config_connector\n \n default_max_pods_per_node = var.default_max_pods_per_node\n---\nmodules/safer-cluster/variables.tf\n@@ -273,6 +273,24 @@ variable \"dns_cache\" {\n default = false\n }\n \n+variable \"cluster_dns_provider\" {\n+ type = string\n+ description = \"Which in-cluster DNS provider should be used. PROVIDER_UNSPECIFIED (default) or PLATFORM_DEFAULT or CLOUD_DNS.\"\n+ default = \"PROVIDER_UNSPECIFIED\"\n+}\n+\n+variable \"cluster_dns_scope\" {\n+ type = string\n+ description = \"The scope of access to cluster DNS records. DNS_SCOPE_UNSPECIFIED (default) or CLUSTER_SCOPE or VPC_SCOPE. \"\n+ default = \"DNS_SCOPE_UNSPECIFIED\"\n+}\n+\n+variable \"cluster_dns_domain\" {\n+ type = string\n+ description = \"The suffix used for all cluster service records.\"\n+ default = \"\"\n+}\n+\n variable \"default_max_pods_per_node\" {\n description = \"The maximum number of pods to schedule per node\"\n default = 110\n---\n\n\n---\n\nChoice C:\nautogen/safer-cluster/main.tf.tmpl\n@@ -141,6 +141,12 @@ module \"gke\" {\n \n dns_cache = var.dns_cache\n \n+ cluster_dns_provider = var.cluster_dns_provider\n+\n+ cluster_dns_scope = var.cluster_dns_scope\n+\n+ cluster_dns_domain = var.cluster_dns_domain\n+\n config_connector = var.config_connector\n \n default_max_pods_per_node = var.default_max_pods_per_node\n---\nautogen/safer-cluster/variables.tf.tmpl\n@@ -273,6 +273,24 @@ variable \"dns_cache\" {\n default = false\n }\n \n+variable \"cluster_dns_provider\" {\n+ type = string\n+ description = \"Which in-cluster DNS provider should be used. PROVIDER_UNSPECIFIED (default) or PLATFORM_DEFAULT or CLOUD_DNS.\"\n+ default = \"PROVIDER_UNSPECIFIED\"\n+}\n+\n+variable \"cluster_dns_scope\" {\n+ type = string\n+ description = \"The scope of access to cluster DNS records. DNS_SCOPE_UNSPECIFIED (default) or CLUSTER_SCOPE or VPC_SCOPE. \"\n+ default = \"DNS_SCOPE_UNSPECIFIED\"\n+}\n+\n+variable \"cluster_dns_domain\" {\n+ type = string\n+ description = \"The suffix used for all cluster service records.\"\n+ default = \"\"\n+}\n+\n variable \"default_max_pods_per_node\" {\n description = \"The maximum number of pods to schedule per node\"\n default = 110\n---\nmodules/safer-cluster-update-variant/README.md\n@@ -204,6 +204,9 @@ For simplicity, we suggest using `roles/container.admin` and\n | add\\_cluster\\_firewall\\_rules | Create additional firewall rules | `bool` | `false` | no |\n | authenticator\\_security\\_group | The name of the RBAC security group for use with Google security groups in Kubernetes RBAC. Group name must be in format gke-security-groups@yourdomain.com | `string` | `null` | no |\n | cloudrun | (Beta) Enable CloudRun addon | `bool` | `false` | no |\n+| cluster\\_dns\\_domain | The suffix used for all cluster service records. | `string` | `\"\"` | no |\n+| cluster\\_dns\\_provider | Which in-cluster DNS provider should be used. PROVIDER\\_UNSPECIFIED (default) or PLATFORM\\_DEFAULT or CLOUD\\_DNS. | `string` | `\"PROVIDER_UNSPECIFIED\"` | no |\n+| cluster\\_dns\\_scope | The scope of access to cluster DNS records. DNS\\_SCOPE\\_UNSPECIFIED (default) or CLUSTER\\_SCOPE or VPC\\_SCOPE. | `string` | `\"DNS_SCOPE_UNSPECIFIED\"` | no |\n | cluster\\_resource\\_labels | The GCE resource labels (a map of key/value pairs) to be applied to the cluster | `map(string)` | `{}` | no |\n | compute\\_engine\\_service\\_account | Use the given service account for nodes rather than creating a new dedicated service account. | `string` | `\"\"` | no |\n | config\\_connector | (Beta) Whether ConfigConnector is enabled for this cluster. | `bool` | `false` | no |\n---\nmodules/safer-cluster-update-variant/main.tf\n@@ -137,6 +137,12 @@ module \"gke\" {\n \n dns_cache = var.dns_cache\n \n+ cluster_dns_provider = var.cluster_dns_provider\n+\n+ cluster_dns_scope = var.cluster_dns_scope\n+\n+ cluster_dns_domain = var.cluster_dns_domain\n+\n config_connector = var.config_connector\n \n default_max_pods_per_node = var.default_max_pods_per_node\n---\nmodules/safer-cluster-update-variant/variables.tf\n@@ -273,6 +273,24 @@ variable \"dns_cache\" {\n default = false\n }\n \n+variable \"cluster_dns_provider\" {\n+ type = string\n+ description = \"Which in-cluster DNS provider should be used. PROVIDER_UNSPECIFIED (default) or PLATFORM_DEFAULT or CLOUD_DNS.\"\n+ default = \"PROVIDER_UNSPECIFIED\"\n+}\n+\n+variable \"cluster_dns_scope\" {\n+ type = string\n+ description = \"The scope of access to cluster DNS records. DNS_SCOPE_UNSPECIFIED (default) or CLUSTER_SCOPE or VPC_SCOPE. \"\n+ default = \"DNS_SCOPE_UNSPECIFIED\"\n+}\n+\n+variable \"cluster_dns_domain\" {\n+ type = string\n+ description = \"The suffix used for all cluster service records.\"\n+ default = \"\"\n+}\n+\n variable \"default_max_pods_per_node\" {\n description = \"The maximum number of pods to schedule per node\"\n default = 110\n---\nmodules/safer-cluster/README.md\n@@ -204,6 +204,9 @@ For simplicity, we suggest using `roles/container.admin` and\n | add\\_cluster\\_firewall\\_rules | Create additional firewall rules | `bool` | `false` | no |\n | authenticator\\_security\\_group | The name of the RBAC security group for use with Google security groups in Kubernetes RBAC. Group name must be in format gke-security-groups@yourdomain.com | `string` | `null` | no |\n | cloudrun | (Beta) Enable CloudRun addon | `bool` | `false` | no |\n+| cluster\\_dns\\_domain | The suffix used for all cluster service records. | `string` | `\"\"` | no |\n+| cluster\\_dns\\_provider | Which in-cluster DNS provider should be used. PROVIDER\\_UNSPECIFIED (default) or PLATFORM\\_DEFAULT or CLOUD\\_DNS. | `string` |\n+| `\"PROVIDER_UNSPECIFIED\"` | no |\n+| cluster\\_dns\\_scope | The scope of access to cluster DNS records. DNS\\_SCOPE\\_UNSPECIFIED (default) or CLUSTER\\_SCOPE or VPC\\_SCOPE. | `string` | `\"DNS_SCOPE_UNSPECIFIED\"` | no |\n | cluster\\_resource\\_labels | The GCE resource labels (a map of key/value pairs) to be applied to the cluster | `map(string)` | `{}` | no |\n | compute\\_engine\\_service\\_account | Use the given service account for nodes rather than creating a new dedicated service account. | `string` | `\"\"` | no |\n | config\\_connector | (Beta) Whether ConfigConnector is enabled for this cluster. | `bool` | `false` | no |\n---\nmodules/safer-cluster/main.tf\n@@ -137,6 +137,12 @@ module \"gke\" {\n \n dns_cache = var.dns_cache\n \n+ cluster_dns_provider = var.cluster_dns_provider\n+\n+ cluster_dns_scope = var.cluster_dns_scope\n+\n+ cluster_dns_domain = var.cluster_dns_domain\n+\n config_connector = var.config_connector\n \n default_max_pods_per_node = var.default_max_pods_per_node\n---\nmodules/safer-cluster/variables.tf\n@@ -273,6 +273,24 @@ variable \"dns_cache\" {\n default = false\n }\n \n+variable \"cluster_dns_provider\" {\n+ type = string\n+ description = \"Which in-cluster DNS provider should be used. PROVIDER_UNSPECIFIED (default) or PLATFORM_DEFAULT or CLOUD_DNS.\"\n+ default = \"PROVIDER_UNSPECIFIED\"\n+}\n+\n+variable \"cluster_dns_scope\" {\n+ type = string\n+ description = \"The scope of access to cluster DNS records. DNS_SCOPE_UNSPECIFIED (default) or CLUSTER_SCOPE or VPC_SCOPE. \"\n+ default = \"DNS_SCOPE_UNSPECIFIED\"\n+}\n+\n+variable \"cluster_dns_domain\" {\n+ type = string\n+ description = \"The suffix used for all cluster service records.\"\n+ default = \"\"\n+}\n+\n variable \"default_max_pods_per_node\" {\n description = \"The maximum number of pods to schedule per node\"\n default = 110\n---\n\n\n---\n\nChoice D:\nautogen/safer-cluster/main.tf.tmpl\n@@ -141,6 +141,12 @@ module \"gke\" {\n \n dns_cache = var.dns_cache\n \n+ cluster_dns_provider = var.cluster_dns_provider\n+\n+ cluster_dns_scope = var.cluster_dns_scope\n+\n+ cluster_dns_domain = var.cluster_dns_domain\n+\n config_connector = var.config_connector\n \n default_max_pods_per_node = var.default_max_pods_per_node\n---\nautogen/safer-cluster/variables.tf.tmpl\n@@ -273,6 +273,24 @@ variable \"dns_cache\" {\n default = false\n }\n \n+variable \"cluster_dns_provider\" {\n+ type = string\n+ description = \"Which in-cluster DNS provider should be used. PROVIDER_UNSPECIFIED (default) or PLATFORM_DEFAULT or CLOUD_DNS.\"\n+ default = \"PROVIDER_UNSPECIFIED\"\n+}\n+\n+variable \"cluster_dns_scope\" {\n+ type = string\n+ description = \"The scope of access to cluster DNS records. DNS_SCOPE_UNSPECIFIED (default) or CLUSTER_SCOPE or VPC_SCOPE. \"\n+ default = \"DNS_SCOPE_UNSPECIFIED\"\n+}\n+\n+variable \"cluster_dns_domain\" {\n+ type = string\n+ description = \"The suffix used for all cluster service records.\"\n+ default = \"\"\n+}\n+\n variable \"default_max_pods_per_node\" {\n description = \"The maximum number of pods to schedule per node\"\n default = 110\n---\nmodules/safer-cluster-update-variant/README.md\n@@ -204,6 +204,9 @@ For simplicity, we suggest using `roles/container.admin` and\n | add\\_cluster\\_firewall\\_rules | Create additional firewall rules | `bool` | `false` | no |\n | authenticator\\_security\\_group | The name of the RBAC security group for use with Google security groups in Kubernetes RBAC. Group name must be in format gke-security-groups@yourdomain.com | `string` | `null` | no |\n | cloudrun | (Beta) Enable CloudRun addon | `bool` | `false` | no |\n+| cluster\\_dns\\_domain | The suffix used for all cluster service records. | `string` | `\"\"` | no |\n+| cluster\\_dns\\_provider | Which in-cluster DNS provider should be used. PROVIDER\\_UNSPECIFIED (default) or PLATFORM\\_DEFAULT or CLOUD\\_DNS. | `string` | `\"PROVIDER_UNSPECIFIED\"` | no |\n+| cluster\\_dns\\_scope | The scope of access to cluster DNS records. DNS\\_SCOPE\\_UNSPECIFIED (default) or CLUSTER\\_SCOPE or VPC\\_SCOPE. | `string` | `\"DNS_SCOPE_UNSPECIFIED\"` | no |\n | cluster\\_resource\\_labels | The GCE resource labels (a map of key/value pairs) to be applied to the cluster | `map(string)` | `{}` | no |\n | compute\\_engine\\_service\\_account | Use the given service account for nodes rather than creating a new dedicated service account. | `string` | `\"\"` | no |\n | config\\_connector | (Beta) Whether ConfigConnector is enabled for this cluster. | `bool` | `false` | no |\n---\nmodules/safer-cluster-update-variant/main.tf\n@@ -137,6 +137,12 @@ module \"gke\" {\n \n dns_cache = var.dns_cache\n \n+ cluster_dns_provider = var.cluster_dns_provider\n+\n+ cluster_dns_scope = var.cluster_dns_scope\n+\n+ cluster_dns_domain = var.cluster_dns_domain\n+\n config_connector = var.config_connector\n \n default_max_pods_per_node = var.default_max_pods_per_node\n---\nmodules/safer-cluster-update-variant/variables.tf\n@@ -273,6 +273,24 @@ variable \"dns_cache\" {\n default = false\n }\n \n+variable \"cluster_dns_provider\" {\n+ type = string\n+ description = \"Which in-cluster DNS provider should be used. PROVIDER_UNSPECIFIED (default) or PLATFORM_DEFAULT or CLOUD_DNS.\"\n+ default = \"PROVIDER_UNSPECIFIED\"\n+}\n+\n+variable \"cluster_dns_scope\" {\n+ type = string\n+ description = \"The scope of access to cluster DNS records. DNS_SCOPE_UNSPECIFIED (default) or CLUSTER_SCOPE or VPC_SCOPE. \"\n+ default = \"DNS_SCOPE_UNSPECIFIED\"\n+}\n+\n+variable \"cluster_dns_domain\" {\n+ type = string\n+ description = \"The suffix used for all cluster service records.\"\n+ default = \"\"\n+}\n+\n variable \"default_max_pods_per_node\" {\n description = \"The maximum number of pods to schedule per node\"\n default = 110\n---\nmodules/safer-cluster/README.md\n@@ -204,6 name @@ For simplicity, we suggest using `roles/container.admin` and\n | add\\_cluster\\_firewall\\_rules | Create additional firewall rules | `bool` | `false` | no |\n | authenticator\\_security\\_group | The name of the RBAC security group for use with Google security groups in Kubernetes RBAC. Group name must be in format gke-security-groups@yourdomain.com | `string` | `null` | no |\n | cloudrun | (Beta) Enable CloudRun addon | `bool` | `false` | no |\n+| cluster\\_dns\\_domain | The suffix used for all cluster service records. | `string` | `\"\"` | no |\n+| cluster\\_dns\\_provider | Which in-cluster DNS provider should be used. PROVIDER\\_UNSPECIFIED (default) or PLATFORM\\_DEFAULT or CLOUD\\_DNS. | `string` | `\"PROVIDER_UNSPECIFIED\"` | no |\n+| cluster\\_dns\\_scope | The scope of access to cluster DNS records. DNS\\_SCOPE\\_UNSPECIFIED (default) or CLUSTER\\_SCOPE or VPC\\_SCOPE. | `string` | `\"DNS_SCOPE_UNSPECIFIED\"` | no |\n | cluster\\_resource\\_labels | The GCE resource labels (a map of key/value pairs) to be applied to the cluster | `map(string)` | `{}` | no |\n | compute\\_engine\\_service\\_account | Use the given service account for nodes rather than creating a new dedicated service account. | `string` | `\"\"` | no |\n | config\\_connector | (Beta) Whether ConfigConnector is enabled for this cluster. | `bool` | `false` | no |\n---\nmodules/safer-cluster/main.tf\n@@ -137,6 +137,12 @@ module \"gke\" {\n \n dns_cache = var.dns_cache\n \n+ cluster_dns_provider = var.cluster_dns_provider\n+\n+ cluster_dns_scope = var.cluster_dns_scope\n+\n+ cluster_dns_domain = var.cluster_dns_domain\n+\n config_connector = var.config_connector\n \n default_max_pods_per_node = var.default_max_pods_per_node\n---\nmodules/safer-cluster/variables.tf\n@@ -273,6 +273,24 @@ variable \"dns_cache\" {\n default = false\n }\n \n+variable \"cluster_dns_provider\" {\n+ type = string\n+ description = \"Which in-cluster DNS provider should be used. PROVIDER_UNSPECIFIED (default) or PLATFORM_DEFAULT or CLOUD_DNS.\"\n+ default = \"PROVIDER_UNSPECIFIED\"\n+}\n+\n+variable \"cluster_dns_scope\" {\n+ type = string\n+ description = \"The scope of access to cluster DNS records. DNS_SCOPE_UNSPECIFIED (default) or CLUSTER_SCOPE or VPC_SCOPE. \"\n+ default = \"DNS_SCOPE_UNSPECIFIED\"\n+}\n+\n+variable \"cluster_dns_domain\" {\n+ type = string\n+ description = \"The suffix used for all cluster service records.\"\n+ default = \"\"\n+}\n+\n variable \"default_max_pods_per_node\" {\n description = \"The maximum number of pods to schedule per node\"\n default = 110\n---\n\n\n---\n"
}
] |
B
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nThis PR contains the following updates:\n\n| Package | Type | Update | Change |\n|---|---|---|---|\n| [terraform-google-modules/kms/google](https://registry.terraform.io/modules/terraform-google-modules/kms/google) ([source](https://redirect.github.com/terraform-google-modules/terraform-google-kms)) | module | major | `~> 2.3` -> `~> 3.0` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>terraform-google-modules/terraform-google-kms (terraform-google-modules/kms/google)</summary>\n\n### [`v3.0.0`](https://redirect.github.com/terraform-google-modules/terraform-google-kms/blob/HEAD/CHANGELOG.md#300-2024-08-29)\n\n[Compare Source](https://redirect.github.com/terraform-google-modules/terraform-google-kms/compare/v2.3.0...v3.0.0)\n\n##### ⚠ BREAKING CHANGES\n\n- **TPG>=5.23:** bump TPG for crypto_key_backend ([#​139](https://redirect.github.com/terraform-google-modules/terraform-google-kms/issues/139))\n- Add import flags ([#​133](https://redirect.github.com/terraform-google-modules/terraform-google-kms/issues/133))\n\n##### Features\n\n- Add import flags ([#​133](https://redirect.github.com/terraform-google-modules/terraform-google-kms/issues/133)) ([70d2718](https://redirect.github.com/terraform-google-modules/terraform-google-kms/commit/70d27186756a8fd2860f8107eba511dca5771f8f))\n- Add support for EXTERNAL_VPC ([#​137](https://redirect.github.com/terraform-google-modules/terraform-google-kms/issues/137)) ([f553b67](https://redirect.github.com/terraform-google-modules/terraform-google-kms/commit/f553b67d5e8143200a9368e2dd7cbd7e9f455094))\n- **deps:** Update Terraform google to v6 ([#​150](https://redirect.github.com/terraform-google-modules/terraform-google-kms/issues/150)) ([b7d99e3](https://redirect.github.com/terraform-google-modules/terraform-google-kms/commit/b7d99e382972642cd5dc33ebc6d4fac7e7e6a36c))\n\n##### Bug Fixes\n\n- **TPG>=5.23:** bump TPG for crypto_key_backend ([#​139](https://redirect.github.com/terraform-google-modules/terraform-google-kms/issues/139)) ([36d0319](https://redirect.github.com/terraform-google-modules/terraform-google-kms/commit/36d0319740c7fd751e879df01180e32dcb1cc924))\n\n</details>\n\n---\n\n### Configuration\n\n📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).\n\n🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.\n\n♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox.\n\n🔕 **Ignore**: Close this PR and you won't be reminded about this update again.\n\n---\n\n - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box\n\n---\n\nThis PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/terraform-google-modules/terraform-google-kubernetes-engine).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC43NC4xIiwidXBkYXRlZEluVmVyIjoiMzguNzQuMSIsInRhcmdldEJyYW5jaCI6Im1hc3RlciIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiXX0=-->\n\n\n---\n\nChoice A:\nexamples/safer_cluster_iap_bastion/kms.tf\n@@ -16,7 +16,7 @@\n \n module \"kms\" {\n source = \"terraform-google-modules/kms/google\"\n- version = \"~> 2.3\"\n+ version \"gke-keyring\"\n---\n = \"~> 3.0\"\n project_id = var.project_id\n location = var.region\n keyring = \"gke-keyring\"\n---\n\n\n---\n\nChoice B:\nexamples/safer_cluster_iap_bastion/kms.tf\n@@ -16,7 +16,7 @@\n \n module \"kms\" {\n source = \"terraform-google-modules/kms/google\"\n- version = \"~> 2.3\"\n+ version = \"~> 3.0\"\n project_id = = var.project_id\n location = var.region\n keyring = \"gke-keyring\"\n---\n\n\n---\n\nChoice C:\nexamples/safer_cluster_iap_bastion/kms.tf\n@@ -16,7 +16,7 @@\n \n module \"kms\" {\n source = \"terraform-google-modules/kms/google\"\n- version = \"~> 2.3\"\n+ version = \"~> 3.0\"\n project_id = var.project_id\n location = var.region\n keyring = \"gke-keyring\"\n---\n\n\n---\n\nChoice D:\nexamples/safer_cluster_iap_bastion/kms.tf\n@@ -16,7 +16,7 @@\n \n module \"kms\" {\n source = version = \"~> 2.3\"\n+ version = \"~> 3.0\"\n project_id = var.project_id\n location = var.region\n keyring = \"gke-keyring\"\n---\n\n\n---\n"
}
] |
C
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nThis PR contains the following updates:\n\n| Package | Change | Age | Adoption | Passing | Confidence | Type | Update |\n|---|---|---|---|---|---|---|---|\n| [github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test](https://redirect.github.com/GoogleCloudPlatform/cloud-foundation-toolkit) | `v0.16.1` -> `v0.16.2` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | require | patch |\n| [go](https://go.dev/) ([source](https://redirect.github.com/golang/go)) | `1.22.6` -> `1.22.7` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | toolchain | patch |\n\n---\n\n### Release Notes\n\n<details>\n<summary>golang/go (go)</summary>\n\n### [`v1.22.7`](https://redirect.github.com/golang/go/compare/go1.22.6...go1.22.7)\n\n</details>\n\n---\n\n### Configuration\n\n📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).\n\n🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.\n\n♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox.\n\n👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://redirect.github.com/renovatebot/renovate/discussions) if that's undesired.\n\n---\n\n - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box\n\n---\n\nThis PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/terraform-google-modules/terraform-google-kubernetes-engine).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC43NC4xIiwidXBkYXRlZEluVmVyIjoiMzguNzQuMSIsInRhcmdldEJyYW5jaCI6Im1hc3RlciIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiXX0=-->\n\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -1,11 +1,11 @@\n module github.com/terraform-google-modules/terraform-google-kubernetes-engine/test/integration\n \n-go 1.22\n+go 1.22.0\n \n-toolchain go1.22.6\n+toolchain go1.22.7\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.1\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.2\n \tgithub.com/gruntwork-io/terratest v0.47.1\n \tgithub.com/stretchr/testify v1.9.0\n \tgithub.com/tidwall/gjson v1.17.3\n@@ -51,7 +51,7 @@ require (\n \tgithub.com/hashicorp/go-version v1.6.0 // indirect\n \tgithub.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f // indirect\n \tgithub.com/hashicorp/hcl/v2 v2.20.1 // indirect\n-\tgithub.com/hashicorp/terraform-config-inspect v0.0.0-20240701073647-9fc3669f7553 // indirect\n+\tgithub.com/hashicorp/terraform-config-inspect v0.0.0-20240801114854-6714b46f5fe4 // indirect\n \tgithub.com/hashicorp/terraform-json v0.22.1 // indirect\n \tgithub.com/imdario/mergo v0.3.16 // indirect\n \tgithub.com/jinzhu/copier v0.4.0 // indirect\n@@ -82,7 +82,7 @@ require (\n \tgithub.com/zclconf/go-cty v1.14.4 // indirect\n \tgo.opencensus.io v0.24.0 // indirect\n \tgolang.org/x/crypto v0.21.0 // indirect\n-\tgolang.org/x/mod v0.19.0 // indirect\n+\tgolang.org/x/mod v0.21.0 // indirect\n \tgolang.org/x/net v0.23.0 // indirect\n \tgolang.org/x/oauth2 v0.12.0 // indirect\n \tgolang.org/x/sync v0.4.0 // indirect\n---\ntest/integration/go.sum\n@@ -187,8 +187,8 @@ cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoIS\n dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=\n github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=\n github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.1 h1:IfsF5yta+pslEAWF1QYFSP/3obWsjLQzFyEKJYAhzos=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.1/go.mod h1:Bop47HzdH60K1rPgNRNqBHrBWhhmqCBG9Y4Y5PEn9fE=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.2 h1:BNFgz4g1lQ2Gd7V5NJxXm2y6S9mZomvtobuu5iv/u/E=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.2/go.mod h1:urFpNnUhNIDDWEbRMRh+UaS5ERWYAHIjIPiUmmlBRkA=\n github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=\n github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo=\n github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=\n@@ -399,8 +399,8 @@ github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f h1:UdxlrJz4JOnY8W+Db\n github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f/go.mod h1:oZtUIOe8dh44I2q6ScRibXws4Ajl+d+nod3AaR9vL5w=\n github.com/hashicorp/hcl/v2 v2.20.1 h1:M6hgdyz7HYt1UN9e61j+qKJBqR3orTWbI1HKBJEdxtc=\n github.com/hashicorp/hcl/v2 v2.20.1/go.mod h1:TZDqQ4kNKCbh1iJp99FdPiUaVDDUPivbqxZulxDYqL4=\n-github.com/hashicorp/terraform-config-inspect v0.0.0-20240701073647-9fc3669f7553 h1:ApSEBSu6EhcJWCdwSMd1VbQUeJDtB1jAOHfIxjZyMTc=\n-github.com/hashicorp/terraform-config-inspect v0.0.0-20240701073647-9fc3669f7553/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI=\n+github.com/hashicorp/terraform-config-inspect v0.0.0-20240801114854-6714b46f5fe4 h1:RwY5HBgtBZ997UtKJAO2Rx+94ETyevwWEVXWx1SL5YY=\n+github.com/hashicorp/terraform-config-inspect v0.0.0-20240801114854-6714b46f5fe4/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI=\n github.com/hashicorp/terraform-json v0.22.1 h1:xft84GZR0QzjPVWs4lRUwvTcPnegqlyS7orfb5Ltvec=\n github.com/hashicorp/terraform-json v0.22.1/go.mod h1:JbWSQCLFSXFFhg42T7l9iJwdGXBYV8fmmD6o/ML4p3A=\n github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=\n@@ -571,8 +571,8 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=\n-golang.org/x/mod v0.19.0 h1:fEdghXQSo20giMthA7cd28ZC+jts4amQ3YMXiP5oMQ8=\n-golang.org/x/mod v0.19.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=\n+golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0=\n+golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=\n golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -1,11 +1,11 @@\n module github.com/terraform-google-modules/terraform-google-kubernetes-engine/test/integration\n \n-go 1.22\n+go 1.22.0\n \n-toolchain go1.22.6\n+toolchain go1.22.7\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.1\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.2\n \tgithub.com/gruntwork-io/terratest v0.47.1\n \tgithub.com/stretchr/testify v1.9.0\n \tgithub.com/tidwall/gjson v1.17.3\n@@ -51,7 +51,7 @@ require (\n \tgithub.com/hashicorp/go-version v1.6.0 // indirect\n \tgithub.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f // indirect\n \tgithub.com/hashicorp/hcl/v2 v2.20.1 // indirect\n-\tgithub.com/hashicorp/terraform-config-inspect v0.0.0-20240701073647-9fc3669f7553 // indirect\n+\tgithub.com/hashicorp/terraform-config-inspect v0.0.0-20240801114854-6714b46f5fe4 // indirect\n \tgithub.com/hashicorp/terraform-json v0.22.1 // indirect\n \tgithub.com/imdario/mergo v0.3.16 // indirect\n \tgithub.com/jinzhu/copier v0.4.0 // indirect\n@@ -82,7 +82,7 @@ require (\n \tgithub.com/zclconf/go-cty v1.14.4 // indirect\n \tgo.opencensus.io v0.24.0 // indirect\n \tgolang.org/x/crypto v0.21.0 // indirect\n-\tgolang.org/x/mod v0.19.0 // indirect\n+\tgolang.org/x/mod v0.21.0 // indirect\n \tgolang.org/x/net v0.23.0 // indirect\n \tgolang.org/x/oauth2 v0.12.0 \tgithub.com/hashicorp/hcl/v2 indirect\n \tgolang.org/x/sync v0.4.0 // indirect\n---\ntest/integration/go.sum\n@@ -187,8 +187,8 @@ cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoIS\n dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=\n github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=\n github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.1 h1:IfsF5yta+pslEAWF1QYFSP/3obWsjLQzFyEKJYAhzos=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.1/go.mod h1:Bop47HzdH60K1rPgNRNqBHrBWhhmqCBG9Y4Y5PEn9fE=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.2 h1:BNFgz4g1lQ2Gd7V5NJxXm2y6S9mZomvtobuu5iv/u/E=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.2/go.mod h1:urFpNnUhNIDDWEbRMRh+UaS5ERWYAHIjIPiUmmlBRkA=\n github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=\n github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo=\n github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=\n@@ -399,8 +399,8 @@ github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f h1:UdxlrJz4JOnY8W+Db\n github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f/go.mod h1:oZtUIOe8dh44I2q6ScRibXws4Ajl+d+nod3AaR9vL5w=\n github.com/hashicorp/hcl/v2 v2.20.1 h1:M6hgdyz7HYt1UN9e61j+qKJBqR3orTWbI1HKBJEdxtc=\n github.com/hashicorp/hcl/v2 v2.20.1/go.mod h1:TZDqQ4kNKCbh1iJp99FdPiUaVDDUPivbqxZulxDYqL4=\n-github.com/hashicorp/terraform-config-inspect v0.0.0-20240701073647-9fc3669f7553 h1:ApSEBSu6EhcJWCdwSMd1VbQUeJDtB1jAOHfIxjZyMTc=\n-github.com/hashicorp/terraform-config-inspect v0.0.0-20240701073647-9fc3669f7553/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI=\n+github.com/hashicorp/terraform-config-inspect v0.0.0-20240801114854-6714b46f5fe4 h1:RwY5HBgtBZ997UtKJAO2Rx+94ETyevwWEVXWx1SL5YY=\n+github.com/hashicorp/terraform-config-inspect v0.0.0-20240801114854-6714b46f5fe4/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI=\n github.com/hashicorp/terraform-json v0.22.1 h1:xft84GZR0QzjPVWs4lRUwvTcPnegqlyS7orfb5Ltvec=\n github.com/hashicorp/terraform-json v0.22.1/go.mod h1:JbWSQCLFSXFFhg42T7l9iJwdGXBYV8fmmD6o/ML4p3A=\n github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=\n@@ -571,8 +571,8 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=\n-golang.org/x/mod v0.19.0 h1:fEdghXQSo20giMthA7cd28ZC+jts4amQ3YMXiP5oMQ8=\n-golang.org/x/mod v0.19.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=\n+golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0=\n+golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=\n golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -1,11 +1,11 @@\n module github.com/terraform-google-modules/terraform-google-kubernetes-engine/test/integration\n \n-go 1.22\n+go 1.22.0\n \n-toolchain go1.22.6\n+toolchain go1.22.7\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.1\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.2\n \tgithub.com/gruntwork-io/terratest v0.47.1\n \tgithub.com/stretchr/testify v1.9.0\n \tgithub.com/tidwall/gjson v1.17.3\n@@ -51,7 +51,7 @@ require (\n \tgithub.com/hashicorp/go-version v1.6.0 // indirect\n \tgithub.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f // indirect\n \tgithub.com/hashicorp/hcl/v2 v2.20.1 // indirect\n-\tgithub.com/hashicorp/terraform-config-inspect v0.0.0-20240701073647-9fc3669f7553 // indirect\n+\tgithub.com/hashicorp/terraform-config-inspect v0.0.0-20240801114854-6714b46f5fe4 // indirect\n \tgithub.com/hashicorp/terraform-json v0.22.1 // indirect\n \tgithub.com/imdario/mergo v0.3.16 // indirect\n \tgithub.com/jinzhu/copier v0.4.0 // indirect\n@@ -82,7 +82,7 @@ require (\n \tgithub.com/zclconf/go-cty v1.14.4 // indirect\n \tgo.opencensus.io v0.24.0 // indirect\n \tgolang.org/x/crypto v0.21.0 // indirect\n-\tgolang.org/x/mod v0.19.0 // indirect\n+\tgolang.org/x/mod v0.21.0 // indirect\n \tgolang.org/x/net v0.23.0 // indirect\n \tgolang.org/x/oauth2 v0.12.0 // indirect\n \tgolang.org/x/sync v0.4.0 // indirect\n---\ntest/integration/go.sum\n@@ -187,8 +187,8 @@ cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoIS\n dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=\n github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=\n github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.1 h1:IfsF5yta+pslEAWF1QYFSP/3obWsjLQzFyEKJYAhzos=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.1/go.mod h1:Bop47HzdH60K1rPgNRNqBHrBWhhmqCBG9Y4Y5PEn9fE=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.2 h1:BNFgz4g1lQ2Gd7V5NJxXm2y6S9mZomvtobuu5iv/u/E=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.2/go.mod h1:urFpNnUhNIDDWEbRMRh+UaS5ERWYAHIjIPiUmmlBRkA=\n github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=\n github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo=\n github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=\n@@ -399,8 +399,8 @@ github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f h1:UdxlrJz4JOnY8W+Db\n github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f/go.mod h1:oZtUIOe8dh44I2q6ScRibXws4Ajl+d+nod3AaR9vL5w=\n github.com/hashicorp/hcl/v2 v2.20.1 h1:M6hgdyz7HYt1UN9e61j+qKJBqR3orTWbI1HKBJEdxtc=\n github.com/hashicorp/hcl/v2 v2.20.1/go.mod h1:TZDqQ4kNKCbh1iJp99FdPiUaVDDUPivbqxZulxDYqL4=\n-github.com/hashicorp/terraform-config-inspect v0.0.0-20240701073647-9fc3669f7553 h1:ApSEBSu6EhcJWCdwSMd1VbQUeJDtB1jAOHfIxjZyMTc=\n-github.com/hashicorp/terraform-config-inspect v0.0.0-20240701073647-9fc3669f7553/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI=\n+github.com/hashicorp/terraform-config-inspect v0.0.0-20240801114854-6714b46f5fe4 h1:RwY5HBgtBZ997UtKJAO2Rx+94ETyevwWEVXWx1SL5YY=\n+github.com/hashicorp/terraform-config-inspect v0.0.0-20240801114854-6714b46f5fe4/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI=\n github.com/hashicorp/terraform-json v0.22.1 h1:xft84GZR0QzjPVWs4lRUwvTcPnegqlyS7orfb5Ltvec=\n github.com/hashicorp/terraform-json v0.22.1/go.mod v1.17.3\n@@ github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=\n@@ -571,8 +571,8 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=\n-golang.org/x/mod v0.19.0 h1:fEdghXQSo20giMthA7cd28ZC+jts4amQ3YMXiP5oMQ8=\n-golang.org/x/mod v0.19.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=\n+golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0=\n+golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=\n golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -1,11 +1,11 @@\n module github.com/terraform-google-modules/terraform-google-kubernetes-engine/test/integration\n \n-go 1.22\n+go 1.22.0\n \n-toolchain go1.22.6\n+toolchain go1.22.7\n \n require (\n-\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.1\n+\tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.2\n \tgithub.com/gruntwork-io/terratest v0.47.1\n \tgithub.com/stretchr/testify v1.9.0\n \tgithub.com/tidwall/gjson v1.17.3\n@@ -51,7 +51,7 @@ require (\n \tgithub.com/hashicorp/go-version v1.6.0 // indirect\n \tgithub.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f // indirect\n \tgithub.com/hashicorp/hcl/v2 v2.20.1 // indirect\n-\tgithub.com/hashicorp/terraform-config-inspect v0.0.0-20240701073647-9fc3669f7553 // indirect\n+\tgithub.com/hashicorp/terraform-config-inspect v0.0.0-20240801114854-6714b46f5fe4 // indirect\n \tgithub.com/hashicorp/terraform-json v0.22.1 // indirect\n \tgithub.com/imdario/mergo v0.3.16 // indirect\n \tgithub.com/jinzhu/copier v0.4.0 // indirect\n@@ -82,7 +82,7 @@ require (\n \tgithub.com/zclconf/go-cty v1.14.4 // indirect\n \tgo.opencensus.io v0.24.0 // indirect\n \tgolang.org/x/crypto v0.21.0 // indirect\n-\tgolang.org/x/mod v0.19.0 // indirect\n+\tgolang.org/x/mod v0.21.0 // indirect\n \tgolang.org/x/net v0.23.0 // indirect\n \tgolang.org/x/oauth2 v0.12.0 // indirect\n \tgolang.org/x/sync v0.4.0 // indirect\n---\ntest/integration/go.sum\n@@ -187,8 +187,8 @@ cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoIS\n dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=\n github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=\n github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.1 h1:IfsF5yta+pslEAWF1QYFSP/3obWsjLQzFyEKJYAhzos=\n-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.1/go.mod h1:Bop47HzdH60K1rPgNRNqBHrBWhhmqCBG9Y4Y5PEn9fE=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.2 h1:BNFgz4g1lQ2Gd7V5NJxXm2y6S9mZomvtobuu5iv/u/E=\n+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.2/go.mod h1:urFpNnUhNIDDWEbRMRh+UaS5ERWYAHIjIPiUmmlBRkA=\n github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=\n github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo=\n github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=\n@@ -399,8 +399,8 @@ github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f h1:UdxlrJz4JOnY8W+Db\n github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f/go.mod h1:oZtUIOe8dh44I2q6ScRibXws4Ajl+d+nod3AaR9vL5w=\n github.com/hashicorp/hcl/v2 v2.20.1 h1:M6hgdyz7HYt1UN9e61j+qKJBqR3orTWbI1HKBJEdxtc=\n github.com/hashicorp/hcl/v2 v2.20.1/go.mod h1:TZDqQ4kNKCbh1iJp99FdPiUaVDDUPivbqxZulxDYqL4=\n-github.com/hashicorp/terraform-config-inspect v0.0.0-20240701073647-9fc3669f7553 h1:ApSEBSu6EhcJWCdwSMd1VbQUeJDtB1jAOHfIxjZyMTc=\n-github.com/hashicorp/terraform-config-inspect v0.0.0-20240701073647-9fc3669f7553/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI=\n+github.com/hashicorp/terraform-config-inspect v0.0.0-20240801114854-6714b46f5fe4 h1:RwY5HBgtBZ997UtKJAO2Rx+94ETyevwWEVXWx1SL5YY=\n+github.com/hashicorp/terraform-config-inspect v0.0.0-20240801114854-6714b46f5fe4/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI=\n github.com/hashicorp/terraform-json v0.22.1 h1:xft84GZR0QzjPVWs4lRUwvTcPnegqlyS7orfb5Ltvec=\n github.com/hashicorp/terraform-json v0.22.1/go.mod h1:JbWSQCLFSXFFhg42T7l9iJwdGXBYV8fmmD6o/ML4p3A=\n github.com/ianlancetaylor/demangle v0.22.1 h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=\n@@ -571,8 +571,8 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=\n golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=\n-golang.org/x/mod v0.19.0 h1:fEdghXQSo20giMthA7cd28ZC+jts4amQ3YMXiP5oMQ8=\n-golang.org/x/mod v0.19.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=\n+golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0=\n+golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=\n golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nWorkaround: https://github.com/hashicorp/terraform-provider-google/issues/19428\n\n---\n\nChoice A:\nautogen/main/versions.tf.tmpl\n@@ -47,12 +47,12 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, != 6.2.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, != 6.2.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n@@ -71,7 +71,7 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, != 6.2.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-private-cluster/versions.tf\n@@ -22,12 +22,12 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, != 6.2.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, != 6.2.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-public-cluster/versions.tf\n@@ -22,12 +22,12 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, != 6.2.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, != 6.2.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\n\n\n---\n\nChoice B:\nautogen/main/versions.tf.tmpl\n@@ -47,12 +47,12 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, != 6.2.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, != 6.2.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n@@ -71,7 +71,7 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, != 6.2.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-private-cluster/versions.tf\n@@ -22,12 +22,12 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for version = \">= 5.40.0, != 5.44.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, != 6.2.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, != 6.2.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-public-cluster/versions.tf\n@@ -22,12 +22,12 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, != 6.2.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, != 6.2.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\n\n\n---\n\nChoice C:\nautogen/main/versions.tf.tmpl\n@@ -47,12 +47,12 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, != 6.2.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, != 6.2.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n@@ -71,7 +71,7 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, != 6.2.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-private-cluster/versions.tf\n@@ -22,12 +22,12 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, != 6.2.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, != 6.2.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-public-cluster/versions.tf\n@@ -22,12 +22,12 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, != 6.2.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, != 6.2.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\n\n\n---\n\nChoice D:\nautogen/main/versions.tf.tmpl\n@@ -47,12 +47,12 @@ terraform {\n = google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, != 6.2.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, != 6.2.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n@@ -71,7 +71,7 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, != 6.2.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-private-cluster/versions.tf\n@@ -22,12 +22,12 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, != 6.2.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, != 6.2.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-public-cluster/versions.tf\n@@ -22,12 +22,12 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, != 6.2.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 7\"\n+ version = \">= 5.40.0, != 5.44.0, != 6.2.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\n- New Autopilot clusters running GKE version 1.25.5-gke.1000 or later have Image streaming automatically enabled.\n\n---\n\nChoice A:\nautogen/main/variables.tf.tmpl\n@@ -946,7 +946,7 @@ variable \"enable_gcfs\" {\n default = false\n {% endif %}\n {% if autopilot_cluster %}\n- default = null\n+ default = true\n {% endif %}\n }\n {% endif %}\n---\ndocs/upgrading_to_v33.0.md\n@@ -14,6 +14,20 @@ To opt out, set `enable_private_nodes` to `false`.\n }\n ```\n \n+### Autopilot Cluster GCFS Default\n+Autopilot cluster modules now set `enable_gcfs` to `true` by default to\n+aligned with TPGv6. To maintain the previous provider default behavior, set\n+`enable_gcfs` to `null`.\n+\n+```diff\n+ module \"cluster\" {\n+- version = \"~> 32.0\"\n++ version = \"~> 33.0\"\n+\n++ enable_gcfs = null\n+}\n+```\n+\n ### Advanced Datapath Observability Relay\n The `monitoring_observability_metrics_relay_mode` parameter has been\n replaced with `monitoring_enable_observability_relay`.\n---\nmodules/beta-autopilot-private-cluster/README.md\n@@ -93,7 +93,7 @@ Then perform the following commands on the root folder:\n | enable\\_confidential\\_nodes | An optional flag to enable confidential node config. | `bool` | `false` | no |\n | enable\\_cost\\_allocation | Enables Cost Allocation Feature and the cluster name and namespace of your GKE workloads appear in the labels field of the billing export to BigQuery | `bool` | `false` | no |\n | enable\\_fqdn\\_network\\_policy | Enable FQDN Network Policies on the cluster | `bool` | `null` | no |\n-| enable\\_gcfs | (Beta) Enable image streaming on cluster level. | `bool` | `null` | no |\n+| enable\\_gcfs | (Beta) Enable image streaming on cluster level. | `bool` | `true` | no |\n | enable\\_l4\\_ilb\\_subsetting | Enable L4 ILB Subsetting on the cluster | `bool` | `false` | no |\n | enable\\_network\\_egress\\_export | Whether to enable network egress metering for this cluster. If enabled, a daemonset will be created in the cluster to meter network egress traffic. | `bool` | `false` | no |\n | enable\\_private\\_endpoint | Whether the master's internal IP address is used as the cluster endpoint | `bool` | `false` | no |\n---\nmodules/beta-autopilot-private-cluster/variables.tf\n@@ -527,7 +527,7 @@ variable \"enable_l4_ilb_subsetting\" {\n variable \"enable_gcfs\" {\n type = bool\n description = \"(Beta) Enable image streaming on cluster level.\"\n- default = null\n+ default = true\n }\n \n variable \"allow_net_admin\" {\n---\nmodules/beta-autopilot-public-cluster/README.md\n@@ -86,7 +86,7 @@ Then perform the following commands on the root folder:\n | enable\\_confidential\\_nodes | An optional flag to enable confidential node config. | `bool` | `false` | no |\n | enable\\_cost\\_allocation | Enables Cost Allocation Feature and the cluster name and namespace of your GKE workloads appear in the labels field of the billing export to BigQuery | `bool` | `false` | no |\n | enable\\_fqdn\\_network\\_policy | Enable FQDN Network Policies on the cluster | `bool` | `null` | no |\n-| enable\\_gcfs | (Beta) Enable image streaming on cluster level. | `bool` | `null` | no |\n+| enable\\_gcfs | (Beta) Enable image streaming on cluster level. | `bool` | `true` | no |\n | enable\\_l4\\_ilb\\_subsetting | Enable L4 ILB Subsetting on the cluster | `bool` | `false` | no |\n | enable\\_network\\_egress\\_export | Whether to enable network egress metering for this cluster. If enabled, a daemonset will be created in the cluster to meter network egress traffic. | `bool` | `false` | no |\n | enable\\_resource\\_consumption\\_export | Whether to enable resource consumption metering on this cluster. When enabled, a table will be created in the resource export BigQuery dataset to store resource consumption data. The resulting table can be joined with the resource usage table or with BigQuery billing export. | `bool` | `true` | no |\n---\nmodules/beta-autopilot-public-cluster/variables.tf\n@@ -491,7 +491,7 @@ variable \"enable_l4_ilb_subsetting\" {\n variable \"enable_gcfs\" {\n type = bool\n description = \"(Beta) Enable image streaming on cluster level.\"\n- default = null\n+ default = true\n }\n \n variable \"allow_net_admin\" {\n---\n\n\n---\n\nChoice B:\nautogen/main/variables.tf.tmpl\n@@ -946,7 +946,7 @@ variable \"enable_gcfs\" {\n default = false\n {% endif %}\n {% if autopilot_cluster %}\n- default = null\n+ default = true\n {% endif %}\n }\n {% endif %}\n---\ndocs/upgrading_to_v33.0.md\n@@ -14,6 +14,20 @@ To opt out, set `enable_private_nodes` to `false`.\n }\n ```\n \n+### Autopilot Cluster GCFS Default\n+Autopilot cluster modules now set `enable_gcfs` to `true` by default to\n+aligned with TPGv6. To maintain the previous provider default behavior, set\n+`enable_gcfs` to `null`.\n+\n+```diff\n+ module \"cluster\" {\n+- version = \"~> 32.0\"\n++ version = \"~> 33.0\"\n+\n++ enable_gcfs = null\n+}\n+```\n+\n ### Advanced Datapath Observability Relay\n The `monitoring_observability_metrics_relay_mode` parameter has been\n replaced with `monitoring_enable_observability_relay`.\n---\nmodules/beta-autopilot-private-cluster/README.md\n@@ -93,7 +93,7 @@ Then perform the following commands on the root folder:\n | enable\\_confidential\\_nodes | An optional flag to enable confidential node config. | `bool` | `false` | no |\n | enable\\_cost\\_allocation | Enables Cost Allocation Feature and the cluster name and namespace of your GKE workloads appear in the labels field of the billing export to BigQuery | `bool` | `false` | no |\n | enable\\_fqdn\\_network\\_policy | Enable FQDN Network Policies on the cluster | `bool` | `null` | | |\n-| enable\\_gcfs | (Beta) Enable image streaming on cluster level. | `bool` | `null` | no |\n+| enable\\_gcfs | (Beta) Enable image streaming on cluster level. | `bool` | `true` | no |\n | enable\\_l4\\_ilb\\_subsetting | Enable L4 ILB Subsetting on the cluster | `bool` | `false` | no |\n | enable\\_network\\_egress\\_export | Whether to enable network egress metering for this cluster. If enabled, a daemonset will be created in the cluster to meter network egress traffic. | `bool` | `false` | no |\n | enable\\_private\\_endpoint | Whether the master's internal IP address is used as the cluster endpoint | `bool` | `false` | no |\n---\nmodules/beta-autopilot-private-cluster/variables.tf\n@@ -527,7 +527,7 @@ variable \"enable_l4_ilb_subsetting\" {\n variable \"enable_gcfs\" {\n type = bool\n description = \"(Beta) Enable image streaming on cluster level.\"\n- default = null\n+ default = true\n }\n \n variable \"allow_net_admin\" {\n---\nmodules/beta-autopilot-public-cluster/README.md\n@@ -86,7 +86,7 @@ Then perform the following commands on the root folder:\n | enable\\_confidential\\_nodes | An optional flag to enable confidential node config. | `bool` | `false` | no |\n | enable\\_cost\\_allocation | Enables Cost Allocation Feature and the cluster name and namespace of your GKE workloads appear in the labels field of the billing export to BigQuery | `bool` | `false` | no |\n | enable\\_fqdn\\_network\\_policy | Enable FQDN Network Policies on the cluster | `bool` | `null` | no |\n-| enable\\_gcfs | (Beta) Enable image streaming on cluster level. | `bool` | `null` | no |\n+| enable\\_gcfs | (Beta) Enable image streaming on cluster level. | `bool` | `true` | no |\n | enable\\_l4\\_ilb\\_subsetting | Enable L4 ILB Subsetting on the cluster | `bool` | `false` | no |\n | enable\\_network\\_egress\\_export | Whether to enable network egress metering for this cluster. If enabled, a daemonset will be created in the cluster to meter network egress traffic. | `bool` | `false` | no |\n | enable\\_resource\\_consumption\\_export | Whether to enable resource consumption metering on this cluster. When enabled, a table will be created in the resource export BigQuery dataset to store resource consumption data. The resulting table can be joined with the resource usage table or with BigQuery billing export. | `bool` | `true` | no |\n---\nmodules/beta-autopilot-public-cluster/variables.tf\n@@ -491,7 +491,7 @@ variable \"enable_l4_ilb_subsetting\" {\n variable \"enable_gcfs\" {\n type = bool\n description = \"(Beta) Enable image streaming on cluster level.\"\n- default = null\n+ default = true\n }\n \n variable \"allow_net_admin\" {\n---\n\n\n---\n\nChoice C:\nautogen/main/variables.tf.tmpl\n@@ -946,7 +946,7 @@ variable \"enable_gcfs\" {\n default = false\n {% endif %}\n {% if autopilot_cluster %}\n- default = null\n+ default = true\n {% endif %}\n }\n {% endif %}\n---\ndocs/upgrading_to_v33.0.md\n@@ -14,6 +14,20 @@ To opt out, set `enable_private_nodes` to `false`.\n }\n ```\n \n+### Autopilot Cluster GCFS Default\n+Autopilot cluster modules now set `enable_gcfs` to `true` by default to\n+aligned with TPGv6. To maintain the previous provider default behavior, set\n+`enable_gcfs` to `null`.\n+\n+```diff\n+ module \"cluster\" {\n+- version = \"~> 32.0\"\n++ version = \"~> 33.0\"\n+\n++ enable_gcfs = null\n+}\n+```\n+\n ### Advanced Datapath Observability Relay\n The `monitoring_observability_metrics_relay_mode` parameter has been\n replaced with `monitoring_enable_observability_relay`.\n---\nmodules/beta-autopilot-private-cluster/README.md\n@@ -93,7 +93,7 @@ Then perform the following commands on the root folder:\n | enable\\_confidential\\_nodes | An optional flag to enable confidential node config. | `bool` | `false` | no |\n | enable\\_cost\\_allocation | Enables Cost Allocation Feature and the cluster name and namespace of your GKE workloads appear in the labels field of the billing export to BigQuery | `bool` | `false` | no |\n | enable\\_fqdn\\_network\\_policy | Enable FQDN Network Policies on the cluster | `bool` | `null` | no |\n-| enable\\_gcfs | (Beta) Enable image streaming on cluster level. | `bool` | `null` | no |\n+| enable\\_gcfs | (Beta) Enable image streaming on cluster level. | `bool` | `true` | no |\n | enable\\_l4\\_ilb\\_subsetting | Enable L4 |\n Subsetting on the cluster | `bool` | `false` | no |\n | enable\\_network\\_egress\\_export | Whether to enable network egress metering for this cluster. If enabled, a daemonset will be created in the cluster to meter network egress traffic. | `bool` | `false` | no |\n | enable\\_private\\_endpoint | Whether the master's internal IP address is used as the cluster endpoint | `bool` | `false` | no |\n---\nmodules/beta-autopilot-private-cluster/variables.tf\n@@ -527,7 +527,7 @@ variable \"enable_l4_ilb_subsetting\" {\n variable \"enable_gcfs\" {\n type = bool\n description = \"(Beta) Enable image streaming on cluster level.\"\n- default = null\n+ default = true\n }\n \n variable \"allow_net_admin\" {\n---\nmodules/beta-autopilot-public-cluster/README.md\n@@ -86,7 +86,7 @@ Then perform the following commands on the root folder:\n | enable\\_confidential\\_nodes | An optional flag to enable confidential node config. | `bool` | `false` | no |\n | enable\\_cost\\_allocation | Enables Cost Allocation Feature and the cluster name and namespace of your GKE workloads appear in the labels field of the billing export to BigQuery | `bool` | `false` | no |\n | enable\\_fqdn\\_network\\_policy | Enable FQDN Network Policies on the cluster | `bool` | `null` | no |\n-| enable\\_gcfs | (Beta) Enable image streaming on cluster level. | `bool` | `null` | no |\n+| enable\\_gcfs | (Beta) Enable image streaming on cluster level. | `bool` | `true` | no |\n | enable\\_l4\\_ilb\\_subsetting | Enable L4 ILB Subsetting on the cluster | `bool` | `false` | no |\n | enable\\_network\\_egress\\_export | Whether to enable network egress metering for this cluster. If enabled, a daemonset will be created in the cluster to meter network egress traffic. | `bool` | `false` | no |\n | enable\\_resource\\_consumption\\_export | Whether to enable resource consumption metering on this cluster. When enabled, a table will be created in the resource export BigQuery dataset to store resource consumption data. The resulting table can be joined with the resource usage table or with BigQuery billing export. | `bool` | `true` | no |\n---\nmodules/beta-autopilot-public-cluster/variables.tf\n@@ -491,7 +491,7 @@ variable \"enable_l4_ilb_subsetting\" {\n variable \"enable_gcfs\" {\n type = bool\n description = \"(Beta) Enable image streaming on cluster level.\"\n- default = null\n+ default = true\n }\n \n variable \"allow_net_admin\" {\n---\n\n\n---\n\nChoice D:\nautogen/main/variables.tf.tmpl\n@@ -946,7 +946,7 @@ variable \"enable_gcfs\" {\n default = false\n {% endif %}\n {% if autopilot_cluster %}\n- default = null\n+ default = true\n {% endif %}\n }\n {% endif %}\n---\ndocs/upgrading_to_v33.0.md\n@@ -14,6 +14,20 @@ To opt out, set `enable_private_nodes` to `false`.\n }\n ```\n \n+### Autopilot Cluster GCFS Default\n+Autopilot cluster modules now set `enable_gcfs` egress `true` by default to\n+aligned with TPGv6. To maintain the previous provider default behavior, set\n+`enable_gcfs` to `null`.\n+\n+```diff\n+ module \"cluster\" {\n+- version = \"~> 32.0\"\n++ version = \"~> 33.0\"\n+\n++ enable_gcfs = null\n+}\n+```\n+\n ### Advanced Datapath Observability Relay\n The `monitoring_observability_metrics_relay_mode` parameter has been\n replaced with `monitoring_enable_observability_relay`.\n---\nmodules/beta-autopilot-private-cluster/README.md\n@@ -93,7 +93,7 @@ Then perform the following commands on the root folder:\n | enable\\_confidential\\_nodes | An optional flag to enable confidential node config. | `bool` | `false` | no |\n | enable\\_cost\\_allocation | Enables Cost Allocation Feature and the cluster name and namespace of your GKE workloads appear in the labels field of the billing export to BigQuery | `bool` | `false` | no |\n | enable\\_fqdn\\_network\\_policy | Enable FQDN Network Policies on the cluster | `bool` | `null` | no |\n-| enable\\_gcfs | (Beta) Enable image streaming on cluster level. | `bool` | `null` | no |\n+| enable\\_gcfs | (Beta) Enable image streaming on cluster level. | `bool` | `true` | no |\n | enable\\_l4\\_ilb\\_subsetting | Enable L4 ILB Subsetting on the cluster | `bool` | `false` | no |\n | enable\\_network\\_egress\\_export | Whether to enable network egress metering for this cluster. If enabled, a daemonset will be created in the cluster to meter network egress traffic. | `bool` | `false` | no |\n | enable\\_private\\_endpoint | Whether the master's internal IP address is used as the cluster endpoint | `bool` | `false` | no |\n---\nmodules/beta-autopilot-private-cluster/variables.tf\n@@ -527,7 +527,7 @@ variable \"enable_l4_ilb_subsetting\" {\n variable \"enable_gcfs\" {\n type = bool\n description = \"(Beta) Enable image streaming on cluster level.\"\n- default = null\n+ default = true\n }\n \n variable \"allow_net_admin\" {\n---\nmodules/beta-autopilot-public-cluster/README.md\n@@ -86,7 +86,7 @@ Then perform the following commands on the root folder:\n | enable\\_confidential\\_nodes | An optional flag to enable confidential node config. | `bool` | `false` | no |\n | enable\\_cost\\_allocation | Enables Cost Allocation Feature and the cluster name and namespace of your GKE workloads appear in the labels field of the billing export to BigQuery | `bool` | `false` | no |\n | enable\\_fqdn\\_network\\_policy | Enable FQDN Network Policies on the cluster | `bool` | `null` | no |\n-| enable\\_gcfs | (Beta) Enable image streaming on cluster level. | `bool` | `null` | no |\n+| enable\\_gcfs | (Beta) Enable image streaming on cluster level. | `bool` | `true` | no |\n | enable\\_l4\\_ilb\\_subsetting | Enable L4 ILB Subsetting on the cluster | `bool` | `false` | no |\n | enable\\_network\\_egress\\_export | Whether to enable network egress metering for this cluster. If enabled, a daemonset will be created in the cluster to meter network egress traffic. | `bool` | `false` | no |\n | enable\\_resource\\_consumption\\_export | Whether to enable resource consumption metering on this cluster. When enabled, a table will be created in the resource export BigQuery dataset to store resource consumption data. The resulting table can be joined with the resource usage table or with BigQuery billing export. | `bool` | `true` | no |\n---\nmodules/beta-autopilot-public-cluster/variables.tf\n@@ -491,7 +491,7 @@ variable \"enable_l4_ilb_subsetting\" {\n variable \"enable_gcfs\" {\n type = bool\n description = \"(Beta) Enable image streaming on cluster level.\"\n- default = null\n+ default = true\n }\n \n variable \"allow_net_admin\" {\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nThis PR contains the following updates:\n\n| Package | Type | Update | Change | Pending |\n|---|---|---|---|---|\n| [google](https://registry.terraform.io/providers/hashicorp/google) ([source](https://redirect.github.com/hashicorp/terraform-provider-google)) | required_provider | major | `>= 5.40.0, < 6` -> `>= 5.40.0, < 7` | `6.2.0` |\n| [google](https://registry.terraform.io/providers/hashicorp/google) ([source](https://redirect.github.com/hashicorp/terraform-provider-google)) | required_provider | major | `>= 3.39.0, < 6` -> `>= 3.39.0, < 7` | `6.2.0` |\n| [google](https://registry.terraform.io/providers/hashicorp/google) ([source](https://redirect.github.com/hashicorp/terraform-provider-google)) | required_provider | major | `< 6` -> `< 7` | `6.2.0` |\n| [google](https://registry.terraform.io/providers/hashicorp/google) ([source](https://redirect.github.com/hashicorp/terraform-provider-google)) | required_provider | major | `>= 5.6.0, < 6` -> `>= 5.6.0, < 7` | `6.2.0` |\n| [google](https://registry.terraform.io/providers/hashicorp/google) ([source](https://redirect.github.com/hashicorp/terraform-provider-google)) | required_provider | major | `>= 4.32.0, < 6` -> `>= 4.32.0, < 7` | `6.2.0` |\n| [google-beta](https://registry.terraform.io/providers/hashicorp/google-beta) ([source](https://redirect.github.com/hashicorp/terraform-provider-google-beta)) | required_provider | major | `< 6` -> `< 7` | `6.2.0` |\n| [google-beta](https://registry.terraform.io/providers/hashicorp/google-beta) ([source](https://redirect.github.com/hashicorp/terraform-provider-google-beta)) | required_provider | major | `>= 5.6.0, < 6` -> `>= 5.6.0, < 7` | `6.2.0` |\n| [google-beta](https://registry.terraform.io/providers/hashicorp/google-beta) ([source](https://redirect.github.com/hashicorp/terraform-provider-google-beta)) | required_provider | major | `>= 5.40.0, < 6` -> `>= 5.40.0, < 7` | `6.2.0` |\n| [google-beta](https://registry.terraform.io/providers/hashicorp/google-beta) ([source](https://redirect.github.com/hashicorp/terraform-provider-google-beta)) | required_provider | major | `>= 4.32.0, < 6` -> `>= 4.32.0, < 7` | `6.2.0` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>hashicorp/terraform-provider-google (google)</summary>\n\n### [`v6.1.0`](https://redirect.github.com/hashicorp/terraform-provider-google/blob/HEAD/CHANGELOG.md#610-Unreleased)\n\n[Compare Source](https://redirect.github.com/hashicorp/terraform-provider-google/compare/v6.0.1...v6.1.0)\n\n### [`v6.0.1`](https://redirect.github.com/hashicorp/terraform-provider-google/blob/HEAD/CHANGELOG.md#601-August-26-2024)\n\n[Compare Source](https://redirect.github.com/hashicorp/terraform-provider-google/compare/v6.0.0...v6.0.1)\n\nBREAKING CHANGES:\n\n- sql: removed `settings.ip_configuration.require_ssl` from `google_sql_database_instance` in favor of `settings.ip_configuration.ssl_mode`. This field was intended to be removed in 6.0.0. ([#​19263](https://redirect.github.com/hashicorp/terraform-provider-google/pull/19263))\n\n### [`v6.0.0`](https://redirect.github.com/hashicorp/terraform-provider-google/blob/HEAD/CHANGELOG.md#600-August-26-2024)\n\n[Compare Source](https://redirect.github.com/hashicorp/terraform-provider-google/compare/v5.44.0...v6.0.0)\n\n[Terraform Google Provider 6.0.0 Upgrade Guide](https://registry.terraform.io/providers/hashicorp/google/latest/docs/guides/version\\_6\\_upgrade)\n\nBREAKING CHANGES:\n\n- provider: changed provider labels to add the `goog-terraform-provisioned: true` label by default. ([#​19190](https://redirect.github.com/hashicorp/terraform-provider-google/pull/19190))\n- activedirectory: added `deletion_protection` field to `google_active_directory_domain` resource. This field defaults to `true`, preventing accidental deletions. To delete the resource, you must first set `deletion_protection = false` before destroying the resource. ([#​18906](https://redirect.github.com/hashicorp/terraform-provider-google/pull/18906))\n- alloydb: removed `network` in `google_alloy_db_cluster`. Use `network_config.network` instead. ([#​19181](https://redirect.github.com/hashicorp/terraform-provider-google/pull/19181))\n- bigquery: added client-side validation to prevent table view creation if schema contains required fields for `google_bigquery_table` resource ([#​18767](https://redirect.github.com/hashicorp/terraform-provider-google/pull/18767))\n- bigquery: removed `allow_resource_tags_on_deletion` from `google_bigquery_table`. Resource tags are now always allowed on table deletion. ([#​19077](https://redirect.github.com/hashicorp/terraform-provider-google/pull/19077))\n- bigqueryreservation: removed `multi_region_auxiliary` from `google_bigquery_reservation` ([#​18922](https://redirect.github.com/hashicorp/terraform-provider-google/pull/18922))\n- billing: revised the format of `id` for `google_billing_project_info` ([#​18823](https://redirect.github.com/hashicorp/terraform-provider-google/pull/18823))\n- cloudrunv2: added `deletion_protection` field to `google_cloudrunv2_service`. This field defaults to `true`, preventing accidental deletions. To delete the resource, you must first set `deletion_protection = false` before destroying the resource.([#​19019](https://redirect.github.com/hashicorp/terraform-provider-google/pull/19019))\n- cloudrunv2: changed `liveness_probe` to no longer infer a default value from api on `google_cloud_run_v2_service`. Removing this field and applying the change will now remove liveness probe from the Cloud Run service. ([#​18764](https://redirect.github.com/hashicorp/terraform-provider-google/pull/18764))\n- cloudrunv2: retyped `containers.env` to SET from ARRAY for `google_cloud_run_v2_service` and `google_cloud_run_v2_job`. ([#​18855](https://redirect.github.com/hashicorp/terraform-provider-google/pull/18855))\n- composer: `ip_allocation_policy = []` in `google_composer_environment` is no longer valid configuration. Removing the field from configuration should not produce a diff. ([#​19207](https://redirect.github.com/hashicorp/terraform-provider-google/pull/19207))\n- compute: added new required field `enabled` in `google_compute_backend_service` and `google_compute_region_backend_service` ([#​18772](https://redirect.github.com/hashicorp/terraform-provider-google/pull/18772))\n- compute: changed `certifcate_id` in `google_compute_managed_ssl_certificate` to correctly be output only. ([#​19069](https://redirect.github.com/hashicorp/terraform-provider-google/pull/19069))\n- compute: revised and in some cases removed default values of `connection_draining_timeout_sec`, `balancing_mode` and `outlier_detection` in `google_compute_region_backend_service` and `google_compute_backend_service`. ([#​18720](https://redirect.github.com/hashicorp/terraform-provider-google/pull/18720))\n- compute: revised the format of `id` for `compute_network_endpoints` ([#​18844](https://redirect.github.com/hashicorp/terraform-provider-google/pull/18844))\n- compute: `guest_accelerator = []` is no longer valid configuration in `google_compute_instance`. To explicitly set an empty list of objects, set guest_accelerator.count = 0. ([#​19207](https://redirect.github.com/hashicorp/terraform-provider-google/pull/19207))\n- compute: `google_compute_instance_from_template` and `google_compute_instance_from_machine_image` `network_interface.alias_ip_range, network_interface.access_config, attached_disk, guest_accelerator, service_account, scratch_disk` can no longer be set to an empty block `[]`. Removing the fields from configuration should not produce a diff. ([#​19207](https://redirect.github.com/hashicorp/terraform-provider-google/pull/19207))\n- compute: `secondary_ip_ranges = []` in `google_compute_subnetwork` is no longer valid configuration. To set an explicitly empty list, use `send_secondary_ip_range_if_empty` and completely remove `secondary_ip_range` from config. ([#​19207](https://redirect.github.com/hashicorp/terraform-provider-google/pull/19207))\n- container: made `advanced_datapath_observability_config.enable_relay` required in `google_container_cluster` ([#​19060](https://redirect.github.com/hashicorp/terraform-provider-google/pull/19060))\n- container: removed deprecated field `advanced_datapath_observability_config.relay_mode` from `google_container_cluster` resource. Users are expected to use `enable_relay` field instead. ([#​19060](https://redirect.github.com/hashicorp/terraform-provider-google/pull/19060))\n- container: three label-related fields are now in `google_container_cluster` resource. `resource_labels` field is non-authoritative and only manages the labels defined by the users on the resource through Terraform. The new output-only `terraform_labels` field merges the labels defined by the users on the resource through Terraform and the default labels configured on the provider. The new output-only `effective_labels` field lists all of labels present on the resource in GCP, including the labels configured through Terraform, the system, and other clients. ([#​19062](https://redirect.github.com/hashicorp/terraform-provider-google/pull/19062))\n- container: made three fields `resource_labels`, `terraform_labels`, and `effective_labels` be present in `google_container_cluster` datasources. All three fields will have all of labels present on the resource in GCP including the labels configured through Terraform, the system, and other clients, equivalent to `effective_labels` on the resource. ([#​19062](https://redirect.github.com/hashicorp/terraform-provider-google/pull/19062))\n- container: `guest_accelerator = []` is no longer valid configuration in `google_container_cluster` and `google_container_node_pool`. To explicitly set an empty list of objects, set guest_accelerator.count = 0. ([#​19207](https://redirect.github.com/hashicorp/terraform-provider-google/pull/19207))\n- container: `guest_accelerator.gpu_driver_installation_config = []` and `guest_accelerator.gpu_sharing_config = []` are no longer valid configuration in `google_container_cluster` and `google_container_node_pool`. Removing the fields from configuration should not produce a diff. ([#​19207](https://redirect.github.com/hashicorp/terraform-provider-google/pull/19207))\n- datastore: removed `google_datastore_index` in favor of `google_firestore_index` ([#​19160](https://redirect.github.com/hashicorp/terraform-provider-google/pull/19160))\n- edgenetwork: three label-related fields are now in ` google_edgenetwork_network ` and `google_edgenetwork_subnet` resources. `labels` field is non-authoritative and only manages the labels defined by the users on the resource through Terraform. The new output-only `terraform_labels` field merges the labels defined by the users on the resource through Terraform and the default labels configured on the provider. The new output-only `effective_labels` field lists all of labels present on the resource in GCP, including the labels configured through Terraform, the system, and other clients. ([#​19062](https://redirect.github.com/hashicorp/terraform-provider-google/pull/19062))\n- identityplatform: removed resource `google_identity_platform_project_default_config` in favor of `google_identity_platform_project_config` ([#​18992](https://redirect.github.com/hashicorp/terraform-provider-google/pull/18992))\n- pubsub: allowed `schema_settings` in `google_pubsub_topic` to be removed ([#​18631](https://redirect.github.com/hashicorp/terraform-provider-google/pull/18631))\n- integrations: removed `create_sample_workflows` and `provision_gmek` from `google_integrations_client` ([#​19148](https://redirect.github.com/hashicorp/terraform-provider-google/pull/19148))\n- redis: added a `deletion_protection_enabled` field to the `google_redis_cluster` resource. This field defaults to `true`, preventing accidental deletions. To delete the resource, you must first set `deletion_protection_enabled = false` before destroying the resource. ([#​19173](https://redirect.github.com/hashicorp/terraform-provider-google/pull/19173))\n- resourcemanager: added `deletion_protection` field to `google_folder` to make deleting them require an explicit intent. Folder resources now cannot be destroyed unless `deletion_protection = false` is set for the resource. ([#​19021](https://redirect.github.com/hashicorp/terraform-provider-google/pull/19021))\n- resourcemanager: made `deletion_policy` in `google_project` 'PREVENT' by default. This makes deleting them require an explicit intent. `google_project` resources cannot be destroyed unless `deletion_policy` is set to 'ABANDON' or 'DELETE' for the resource. ([#​19114](https://redirect.github.com/hashicorp/terraform-provider-google/pull/19114))\n- sql: removed `settings.ip_configuration.require_ssl` in `google_sql_database_instance`. Please use `settings.ip_configuration.ssl_mode` instead. ([#​18843](https://redirect.github.com/hashicorp/terraform-provider-google/pull/18843))\n- storage: removed `no_age` field from `lifecycle_rule.condition` in the `google_storage_bucket` resource ([#​19048](https://redirect.github.com/hashicorp/terraform-provider-google/pull/19048))\n- vpcaccess: removed default values for `min_throughput` and `min_instances` fields on `google_vpc_access_connector` and made them default to values returned from the API when not provided by users ([#​18697](https://redirect.github.com/hashicorp/terraform-provider-google/pull/18697))\n- vpcaccess: added a conflicting fields restriction between `min_throughput` and `min_instances` fields on `google_vpc_access_connector` ([#​18697](https://redirect.github.com/hashicorp/terraform-provider-google/pull/18697))\n- vpcaccess: added a conflicting fields restriction between `max_throughput` and `max_instances` fields on `google_vpc_access_connector` ([#​18697](https://redirect.github.com/hashicorp/terraform-provider-google/pull/18697))\n- workstation: defaulted `host.gce_instance.disable_ssh` to true for `google_workstations_workstation_config` ([#​19101](https://redirect.github.com/hashicorp/terraform-provider-google/pull/19101))\n IMPROVEMENTS:\n- compute: added fields `reserved_internal_range` and `secondary_ip_ranges[].reserved_internal_range` to `google_compute_subnetwork` resource ([#​19151](https://redirect.github.com/hashicorp/terraform-provider-google/pull/19151))\n- compute: changed the behavior of `name_prefix` in multiple Compute resources to allow for a longer max length of 54 characters. See the upgrade guide and resource documentation for more details. ([#​19152](https://redirect.github.com/hashicorp/terraform-provider-google/pull/19152))\n BUG FIXES:\n- compute: fixed an issue regarding sending `enabled` field by default for null `iap` message in `google_compute_backend_service` and `google_compute_region_backend_service` ([#​18772](https://redirect.github.com/hashicorp/terraform-provider-google/pull/18772))\n\n</details>\n\n<details>\n<summary>hashicorp/terraform-provider-google-beta (google-beta)</summary>\n\n### [`v6.1.0`](https://redirect.github.com/hashicorp/terraform-provider-google-beta/blob/HEAD/CHANGELOG.md#610-Unreleased)\n\n[Compare Source](https://redirect.github.com/hashicorp/terraform-provider-google-beta/compare/v6.0.1...v6.1.0)\n\n### [`v6.0.1`](https://redirect.github.com/hashicorp/terraform-provider-google-beta/blob/HEAD/CHANGELOG.md#601-August-26-2024)\n\n[Compare Source](https://redirect.github.com/hashicorp/terraform-provider-google-beta/compare/v6.0.0...v6.0.1)\n\nBREAKING CHANGES:\n\n- sql: removed `settings.ip_configuration.require_ssl` from `google_sql_database_instance` in favor of `settings.ip_configuration.ssl_mode`. This field was intended to be removed in 6.0.0. ([#​8043](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8043))\n\n### [`v6.0.0`](https://redirect.github.com/hashicorp/terraform-provider-google-beta/blob/HEAD/CHANGELOG.md#600-August-26-2024)\n\n[Compare Source](https://redirect.github.com/hashicorp/terraform-provider-google-beta/compare/v5.44.0...v6.0.0)\n\n[Terraform Google Provider 6.0.0 Upgrade Guide](https://registry.terraform.io/providers/hashicorp/google/latest/docs/guides/version\\_6\\_upgrade)\n\nBREAKING CHANGES:\n\n- provider: changed provider labels to add the `goog-terraform-provisioned: true` label by default. ([#​8004](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8004))\n- activedirectory: added `deletion_protection` field to `google_active_directory_domain` resource. This field defaults to `true`, preventing accidental deletions. To delete the resource, you must first set `deletion_protection = false` before destroying the resource. ([#​7837](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/7837))\n- alloydb: removed `network` in `google_alloy_db_cluster`. Use `network_config.network` instead. ([#​7999](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/7999))\n- billing: revised the format of `id` for `google_billing_project_info` ([#​7793](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/7793))\n- bigquery: added client-side validation to prevent table view creation if schema contains required fields for `google_bigquery_table` resource ([#​7755](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/7755))\n- bigquery: removed `allow_resource_tags_on_deletion` from `google_bigquery_table`. Resource tags are now always allowed on table deletion. ([#​7940](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/7940))\n- bigqueryreservation: removed `multi_region_auxiliary` from `google_bigquery_reservation` ([#​7844](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/7844))\n- cloudrunv2: added `deletion_protection` field to `google_cloudrunv2_service` to make deleting them require an explicit intent. This field defaults to `true`, preventing accidental deletions. To delete the resource, you must first set `deletion_protection = false` before destroying the resource. ([#​7901](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/7901))\n- cloudrunv2: changed `liveness_probe` to no longer infer a default value from api on `google_cloud_run_v2_service`. Removing this field and applying the change will now remove liveness probe from the Cloud Run service. ([#​7753](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/7753))\n- cloudrunv2: retyped `containers.env` to SET from ARRAY for `google_cloud_run_v2_service` and `google_cloud_run_v2_job`. ([#​7812](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/7812))\n- composer: `ip_allocation_policy = []` in `google_composer_environment` is no longer valid configuration. Removing the field from configuration should not produce a diff. ([#​8011](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8011))\n- compute: added new required field `enabled` in `google_compute_backend_service` and `google_compute_region_backend_service` ([#​7758](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/7758))\n- compute: revised and in some cases removed default values of `connection_draining_timeout_sec`, `balancing_mode` and `outlier_detection` in `google_compute_region_backend_service` and `google_compute_backend_service`. ([#​7723](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/7723))\n- compute: updated resource id for `compute_network_endpoints` ([#​7806](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/7806))\n- compute: stopped the `certifcate_id` field in `google_compute_managed_ssl_certificate` resource being incorrectly marked as a user-configurable value when it should just be an output. ([#​7936](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/7936))\n- compute: `guest_accelerator = []` is no longer valid configuration in `google_compute_instance`. To explicitly set an empty list of objects, set guest_accelerator.count = 0. ([#​8011](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8011))\n- compute: `google_compute_instance_from_template` and `google_compute_instance_from_machine_image` `network_interface.alias_ip_range, network_interface.access_config, attached_disk, guest_accelerator, service_account, scratch_disk` can no longer be set to an empty block `[]`. Removing the fields from configuration should not produce a diff. ([#​8011](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8011))\n- compute: `secondary_ip_ranges = []` in `google_compute_subnetwork` is no longer valid configuration. To set an explicitly empty list, use `send_secondary_ip_range_if_empty` and completely remove `secondary_ip_range` from config. ([#​8011](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8011))\n- container: made `advanced_datapath_observability_config.enable_relay` required in `google_container_cluster` ([#​7930](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/7930))\n- container: removed deprecated field `advanced_datapath_observability_config.relay_mode` from `google_container_cluster` resource. Users are expected to use `enable_relay` field instead. ([#​7930](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/7930))\n- container: three label-related fields are now in `google_container_cluster` resource. `resource_labels` field is non-authoritative and only manages the labels defined by the users on the resource through Terraform. The new output-only `terraform_labels` field merges the labels defined by the users on the resource through Terraform and the default labels configured on the provider. The new output-only `effective_labels` field lists all of labels present on the resource in GCP, including the labels configured through Terraform, the system, and other clients. ([#​7932](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/7932))\n- container: made three fields `resource_labels`, `terraform_labels`, and `effective_labels` be present in `google_container_cluster` datasources. All three fields will have all of labels present on the resource in GCP including the labels configured through Terraform, the system, and other clients, equivalent to `effective_labels` on the resource. ([#​7932](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/7932))\n- container: `guest_accelerator = []` is no longer valid configuration in `google_container_cluster` and `google_container_node_pool`. To explicitly set an empty list of objects, set guest_accelerator.count = 0. ([#​8011](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8011))\n- container: `guest_accelerator.gpu_driver_installation_config = []` and `guest_accelerator.gpu_sharing_config = []` are no longer valid configuration in `google_container_cluster` and `google_container_node_pool`. Removing the fields from configuration should not produce a diff. ([#​8011](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/8011))\n- datastore: removed `google_datastore_index` in favor of `google_firestore_index` ([#​7987](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/7987))\n- edgenetwork: three label-related fields are now in ` google_edgenetwork_network ` and `google_edgenetwork_subnet` resources. `labels` field is non-authoritative and only manages the labels defined by the users on the resource through Terraform. The new output-only `terraform_labels` field merges the labels defined by the users on the resource through Terraform and the default labels configured on the provider. The new output-only `effective_labels` field lists all of labels present on the resource in GCP, including the labels configured through Terraform, the system, and other clients. ([#​7932](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/7932))\n- identityplatform: removed resource `google_identity_platform_project_default_config` in favor of `google_identity_platform_project_config` ([#​7880](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/7880))\n- integrations: removed `create_sample_workflows` and `provision_gmek` from `google_integrations_client` ([#​7977](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/7977))\n- pubsub: allowed `schema_settings` in `google_pubsub_topic` to be removed ([#​7674](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/7674))\n- redis: added a `deletion_protection_enabled` field to the `google_redis_cluster` resource. This field defaults to `true`, preventing accidental deletions. To delete the resource, you must first set `deletion_protection_enabled = false` before destroying the resource. ([#​7995](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/7995))\n- resourcemanager: added `deletion_protection` field to `google_folder` to make deleting them require an explicit intent. Folder resources now cannot be destroyed unless `deletion_protection = false` is set for the resource. ([#​7903](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/7903))\n- resourcemanager: made `deletion_policy` in `google_project` 'PREVENT' by default. This makes deleting them require an explicit intent. `google_project` resources cannot be destroyed unless `deletion_policy` is set to 'ABANDON' or 'DELETE' for the resource. ([#​7946](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/7946))\n- storage: removed `no_age` field from `lifecycle_rule.condition` in the `google_storage_bucket` resource ([#​7923](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/7923))\n- sql: removed `settings.ip_configuration.require_ssl` in `google_sql_database_instance`. Please use `settings.ip_configuration.ssl_mode` instead. ([#​7804](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/7804))\n- vpcaccess: removed default values for `min_throughput` and `min_instances` fields on `google_vpc_access_connector` and made them default to values returned from the API when not provided by users ([#​7709](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/7709))\n- vpcaccess: added a conflicting fields restriction between `min_throughput` and `min_instances` fields on `google_vpc_access_connector` ([#​7709](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/7709))\n- vpcaccess: added a conflicting fields restriction between `max_throughput` and `max_instances` fields on `google_vpc_access_connector` ([#​7709](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/7709))\n- workstation: defaulted `host.gce_instance.disable_ssh` to true for `google_workstations_workstation_config` ([#​7946](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/7946))\n\nIMPROVEMENTS:\n\n- compute: added fields `reserved_internal_range` and `secondary_ip_ranges[].reserved_internal_range` to `google_compute_subnetwork` resource ([#​7980](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/7980))\n- compute: changed the behavior of `name_prefix` in multiple Compute resources to allow for a longer max length of 54 characters. See the upgrade guide and resource documentation for more details. ([#​7981](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/7981))\n\nBUG FIXES:\n\n- compute: fixed an issue regarding sending `enabled` field by default for null `iap` message in `google_compute_backend_service` and `google_compute_region_backend_service` ([#​7758](https://redirect.github.com/hashicorp/terraform-provider-google-beta/pull/7758))\n\n</details>\n\n---\n\n### Configuration\n\n📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).\n\n🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.\n\n♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox.\n\n🔕 **Ignore**: Close this PR and you won't be reminded about these updates again.\n\n---\n\n - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box\n\n---\n\nThis PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/terraform-google-modules/terraform-google-kubernetes-engine).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC4yNi4xIiwidXBkYXRlZEluVmVyIjoiMzguNTkuMiIsInRhcmdldEJyYW5jaCI6Im1hc3RlciIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiXX0=-->\n\n\n---\n\nChoice A:\nautogen/main/versions.tf.tmpl\n@@ -24,11 +24,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n@@ -47,12 +47,12 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n@@ -71,7 +71,7 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n@@ -89,7 +89,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/acm/versions.tf\n@@ -29,11 +29,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.41.0, < 6\"\n+ version = \">= 5.41.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.41.0, < 6\"\n+ version = \">= 5.41.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-private-cluster/versions.tf\n@@ -22,12 +22,12 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-public-cluster/versions.tf\n@@ -22,12 +22,12 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-private-cluster-update-variant/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-private-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-public-cluster-update-variant/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-public-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/binary-authorization/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \"< 6\"\n+ version = \"< 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \"< 6\"\n+ version = \"< 7\"\n }\n }\n provider_meta \"google\" {\n---\nmodules/fleet-membership/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.6.0, < 6\"\n+ version = \">= 5.6.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.6.0, < 6\"\n+ version = \">= 5.6.0, < 7\"\n }\n }\n \n---\nmodules/hub-legacy/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \"< 6\"\n+ version = \"< 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \"< 6\"\n+ version = \"< 7\"\n }\n }\n provider_meta \"google\" {\n---\nmodules/private-cluster-update-variant/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/private-cluster/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/workload-identity/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 3.39.0, < 6\"\n+ version = \">= 3.39.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nversions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n terraform source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\n\n\n---\n\nChoice B:\nautogen/main/versions.tf.tmpl\n@@ -24,11 +24,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n@@ -47,12 +47,12 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n@@ -71,7 +71,7 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n@@ -89,7 +89,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/acm/versions.tf\n@@ -29,11 +29,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.41.0, < 6\"\n+ version = \">= 5.41.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.41.0, < 6\"\n+ version = \">= 5.41.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-private-cluster/versions.tf\n@@ -22,12 +22,12 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-public-cluster/versions.tf\n@@ -22,12 +22,12 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-private-cluster-update-variant/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-private-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-public-cluster-update-variant/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.40.0, < 6\"\n+ version = @@ 5.40.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-public-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/binary-authorization/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \"< 6\"\n+ version = \"< 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \"< 6\"\n+ version = \"< 7\"\n }\n }\n provider_meta \"google\" {\n---\nmodules/fleet-membership/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.6.0, < 6\"\n+ version = \">= 5.6.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.6.0, < 6\"\n+ version = \">= 5.6.0, < 7\"\n }\n }\n \n---\nmodules/hub-legacy/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \"< 6\"\n+ version = \"< 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \"< 6\"\n+ version = \"< 7\"\n }\n }\n provider_meta \"google\" {\n---\nmodules/private-cluster-update-variant/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/private-cluster/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/workload-identity/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 3.39.0, < 6\"\n+ version = \">= 3.39.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nversions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\n\n\n---\n\nChoice C:\nautogen/main/versions.tf.tmpl\n@@ -24,11 +24,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n@@ -47,12 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n@@ -71,7 +71,7 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n@@ -89,7 +89,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/acm/versions.tf\n@@ -29,11 +29,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.41.0, < 6\"\n+ version = \">= 5.41.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.41.0, < 6\"\n+ version = \">= 5.41.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-private-cluster/versions.tf\n@@ -22,12 +22,12 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-public-cluster/versions.tf\n@@ -22,12 +22,12 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-private-cluster-update-variant/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-private-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-public-cluster-update-variant/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-public-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/binary-authorization/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \"< 6\"\n+ version = \"< 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \"< 6\"\n+ version = \"< 7\"\n }\n }\n provider_meta \"google\" {\n---\nmodules/fleet-membership/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.6.0, < 6\"\n+ version = \">= 5.6.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.6.0, < 6\"\n+ version = \">= 5.6.0, < 7\"\n }\n }\n \n---\nmodules/hub-legacy/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \"< 6\"\n+ version = \"< 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \"< 6\"\n+ version = \"< 7\"\n }\n }\n provider_meta \"google\" {\n---\nmodules/private-cluster-update-variant/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/private-cluster/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/workload-identity/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 3.39.0, < 6\"\n+ version = \">= 3.39.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nversions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\n\n\n---\n\nChoice D:\nautogen/main/versions.tf.tmpl\n@@ -24,11 +24,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n@@ -47,12 +47,12 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n@@ -71,7 +71,7 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n@@ -89,7 +89,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/acm/versions.tf\n@@ -29,11 +29,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.41.0, < 6\"\n+ version = \">= 5.41.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.41.0, < 6\"\n+ version = \">= 5.41.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-private-cluster/versions.tf\n@@ -22,12 +22,12 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-public-cluster/versions.tf\n@@ -22,12 +22,12 @@ terraform {\n google = {\n source = \"hashicorp/google\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n- version = \">= 5.40.0, != 5.44.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-private-cluster-update-variant/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-private-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-public-cluster-update-variant/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-public-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/binary-authorization/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \"< 6\"\n+ version = \"< 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \"< 6\"\n+ version = \"< 7\"\n }\n }\n provider_meta \"google\" {\n---\nmodules/fleet-membership/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.6.0, < 6\"\n+ version = \">= 5.6.0, < 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.6.0, < 6\"\n+ version = \">= 5.6.0, < 7\"\n }\n }\n \n---\nmodules/hub-legacy/versions.tf\n@@ -20,11 +20,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \"< 6\"\n+ version = \"< 7\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \"< 6\"\n+ version = \"< 7\"\n }\n }\n provider_meta \"google\" {\n---\nmodules/private-cluster-update-variant/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/private-cluster/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/workload-identity/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 3.39.0, < 6\"\n+ version = \">= 3.39.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nversions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, < 7\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\n\n\n---\n"
}
] |
D
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nNone\n\n---\n\nChoice A:\nmodules/acm/README.md\n@@ -1,3 +1,6 @@\n+> [!WARNING]\n+> This Terraform Kubernetes Engine ACM Submodule has been deprecated in release v33.0.0 and will be removed entirely in a future release. It is recommended [`google_gke_hub_feature`](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/gke_hub_feature#example-usage---enable-fleet-default-member-config-configmanagement) migrate to the [`google_gke_hub_feature`](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/gke_hub_feature#example-usage---enable-fleet-default-member-config-configmanagement) and [`google_gke_hub_feature_membership`](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/gke_hub_feature_membership#example-usage---config-management) resources.\n+\n # Terraform Kubernetes Engine ACM Submodule\n \n This module installs [Anthos Config Management](https://cloud.google.com/anthos-config-management/docs/) (ACM) in a Kubernetes cluster.\n---\n\n\n---\n\nChoice B:\nmodules/acm/README.md\n@@ -1,3 +1,6 @@\n+> [!WARNING]\n+> This Terraform Kubernetes Engine ACM Submodule has been deprecated in release v33.0.0 and will be removed entirely in a future release. It is recommended to migrate to the [`google_gke_hub_feature`](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/gke_hub_feature#example-usage---enable-fleet-default-member-config-configmanagement) and [`google_gke_hub_feature_membership`](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/gke_hub_feature_membership#example-usage---config-management) resources.\n+\n # Terraform Kubernetes Engine ACM Submodule\n \n This module installs [Anthos Config Management](https://cloud.google.com/anthos-config-management/docs/) (ACM) in a Kubernetes cluster.\n---\n\n\n---\n\nChoice C:\nmodules/acm/README.md\n@@ -1,3 +1,6 @@\n+> [!WARNING]\n+> This Terraform Kubernetes Engine ACM resources.\n+\n has been deprecated in release v33.0.0 and will be removed entirely in a future release. It is recommended to migrate to the [`google_gke_hub_feature`](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/gke_hub_feature#example-usage---enable-fleet-default-member-config-configmanagement) and [`google_gke_hub_feature_membership`](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/gke_hub_feature_membership#example-usage---config-management) resources.\n+\n # Terraform Kubernetes Engine ACM Submodule\n \n This module installs [Anthos Config Management](https://cloud.google.com/anthos-config-management/docs/) (ACM) in a Kubernetes cluster.\n---\n\n\n---\n\nChoice D:\nmodules/acm/README.md\n@@ -1,3 to @@\n+> [!WARNING]\n+> This Terraform Kubernetes Engine ACM Submodule has been deprecated in release v33.0.0 and will be removed entirely in a future release. It is recommended to migrate to the [`google_gke_hub_feature`](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/gke_hub_feature#example-usage---enable-fleet-default-member-config-configmanagement) and [`google_gke_hub_feature_membership`](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/gke_hub_feature_membership#example-usage---config-management) resources.\n+\n # Terraform Kubernetes Engine ACM Submodule\n \n This module installs [Anthos Config Management](https://cloud.google.com/anthos-config-management/docs/) (ACM) in a Kubernetes cluster.\n---\n\n\n---\n"
}
] |
B
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\n- Add `config_sync.enabled` introduced in TPG v5.41\n\n---\n\nChoice A:\nmodules/acm/feature.tf\n@@ -42,6 +42,7 @@ resource \"google_gke_hub_feature_membership\" \"main\" {\n for_each = var.enable_config_sync ? [{ enabled = true }] : []\n \n content {\n+ enabled = var.enable_config_sync\n source_format = var.source_format != \"\" ? var.source_format : null\n \n git {\n---\nmodules/acm/versions.tf\n@@ -29,11 +29,11 @@ terraform {\n {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 4.32.0, < 6\"\n+ version = \">= 5.41.0, < 6\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 4.32.0, < 6\"\n+ version = \">= 5.41.0, < 6\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\n\n\n---\n\nChoice B:\nmodules/acm/feature.tf\n@@ -42,6 +42,7 @@ resource \"google_gke_hub_feature_membership\" \"main\" {\n for_each = var.enable_config_sync ? [{ enabled = true }] : []\n \n content {\n+ enabled = var.enable_config_sync\n \"hashicorp/kubernetes\"\n---\n source_format = var.source_format != \"\" ? var.source_format : null\n \n git {\n---\nmodules/acm/versions.tf\n@@ -29,11 +29,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 4.32.0, < 6\"\n+ version = \">= 5.41.0, < 6\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 4.32.0, < 6\"\n+ version = \">= 5.41.0, < 6\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\n\n\n---\n\nChoice C:\nmodules/acm/feature.tf\n@@ -42,6 +42,7 @@ resource \"google_gke_hub_feature_membership\" \"main\" {\n for_each = var.enable_config_sync ? [{ enabled = true }] : []\n \n content {\n+ enabled = var.enable_config_sync\n source_format = var.source_format != \"\" ? var.source_format : null\n \n git {\n---\nmodules/acm/versions.tf\n@@ -29,11 +29,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 4.32.0, < 6\"\n+ version = \">= 5.41.0, < 6\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 4.32.0, < 6\"\n+ version = \">= 5.41.0, < 6\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\n\n\n---\n\nChoice D:\nmodules/acm/feature.tf\n@@ -42,6 +42,7 @@ resource \"google_gke_hub_feature_membership\" \"main\" {\n for_each = var.enable_config_sync ? [{ enabled = true }] : []\n \n content {\n+ enabled = var.enable_config_sync\n source_format = var.source_format != \"\" ? var.source_format : null\n \n git {\n---\nmodules/acm/versions.tf\n@@ -29,11 +29,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 4.32.0, < 6\"\n+ version = \">= = < 6\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 4.32.0, < 6\"\n+ version = \">= 5.41.0, < 6\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\n\n\n---\n"
}
] |
C
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nFixes: https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2075\r\n\r\nWorkaround: https://github.com/hashicorp/terraform-provider-google/issues/19428\r\n\r\nTODO: https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2079\n\n---\n\nChoice A:\nautogen/main/versions.tf.tmpl\n@@ -20,7 +20,7 @@\n terraform {\n required_version = \">=1.3\"\n \n-{% if beta_cluster %}\n+{% if beta_cluster and not autopilot_cluster %}\n required_providers {\n google = {\n source = \"hashicorp/google\"\n@@ -42,6 +42,49 @@ terraform {\n provider_meta \"google-beta\" {\n module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v32.0.4\"\n }\n+{% elif beta_cluster and autopilot_cluster %}\n+ required_providers {\n+ google = {\n+ source = \"hashicorp/google\"\n+ # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n+ }\n+ google-beta = {\n+ source = \"hashicorp/google-beta\"\n+ # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n+ }\n+ kubernetes = {\n+ source = \"hashicorp/kubernetes\"\n+ version = \"~> 2.10\"\n+ }\n+ random = {\n+ source = \"hashicorp/random\"\n+ version = \">= 2.1\"\n+ }\n+ }\n+ provider_meta \"google-beta\" {\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v32.0.4\"\n+ }\n+{% elif autopilot_cluster %}\n+ required_providers {\n+ google = {\n+ source = \"hashicorp/google\"\n+ # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n+ }\n+ kubernetes = {\n+ source = \"hashicorp/kubernetes\"\n+ version = \"~> 2.10\"\n+ }\n+ random = {\n+ source = \"hashicorp/random\"\n+ version = \">= 2.1\"\n+ }\n+ }\n+ provider_meta \"google\" {\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v32.0.4\"\n+ }\n {% else %}\n required_providers {\n google = {\n---\nmodules/beta-autopilot-private-cluster/versions.tf\n@@ -20,12 +20,14 @@ terraform {\n \n required_providers {\n google = {\n- source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ source = \"hashicorp/google\"\n+ # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n google-beta = {\n- source = \"hashicorp/google-beta\"\n- version = \">= 5.40.0, < 6\"\n+ source = \"hashicorp/google-beta\"\n+ # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-public-cluster/versions.tf\n@@ -20,12 +20,14 @@ terraform {\n \n required_providers {\n google = {\n- source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ source = \"hashicorp/google\"\n+ # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n google-beta = {\n- source = \"hashicorp/google-beta\"\n- version = \">= 5.40.0, < 6\"\n+ source = \"hashicorp/google-beta\"\n+ # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\ntest/integration/node_pool/controls/gcloud.rb\n@@ -257,17 +257,18 @@\n )\n end\n \n- it \"has the expected accelerators\" do\n- expect(data['nodePools']).to include(\n- including(\n- \"name\" => \"pool-02\",\n- \"config\" => including(\n- \"accelerators\" => [{\"acceleratorCount\" => expected_accelerators_count,\n- \"acceleratorType\" => expected_accelerators_type}],\n- ),\n- )\n- )\n- end\n+# TODO: Update/fix this test (manually tested)\n+# it \"has the expected accelerators\" do\n+# expect(data['nodePools']).to include(\n+# including(\n+# \"name\" => \"pool-02\",\n+# \"config\" => including(\n+# \"accelerators\" => [{\"acceleratorCount\" => expected_accelerators_count,\n+# \"acceleratorType\" => expected_accelerators_type}],\n+# ),\n+# )\n+# )\n+# end\n \n it \"has the expected disk size\" do\n expect(data['nodePools']).to include(\n---\n\n\n---\n\nChoice B:\nautogen/main/versions.tf.tmpl\n@@ -20,7 +20,7 @@\n terraform {\n required_version = \">=1.3\"\n \n-{% if beta_cluster %}\n+{% if beta_cluster and not autopilot_cluster %}\n required_providers {\n google = {\n source = \"hashicorp/google\"\n@@ -42,6 +42,49 @@ terraform {\n provider_meta \"google-beta\" {\n module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v32.0.4\"\n }\n+{% elif beta_cluster and autopilot_cluster %}\n+ required_providers {\n+ google = {\n+ source = \"hashicorp/google\"\n+ # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n+ }\n+ google-beta = {\n+ source = \"hashicorp/google-beta\"\n+ # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n+ }\n+ kubernetes = {\n+ source = \"hashicorp/kubernetes\"\n+ version = \"~> 2.10\"\n+ }\n+ random = {\n+ source = \"hashicorp/random\"\n+ version = \">= 2.1\"\n+ }\n+ }\n+ provider_meta \"google-beta\" {\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v32.0.4\"\n+ }\n+{% elif autopilot_cluster %}\n+ required_providers {\n+ google = {\n+ source = \"hashicorp/google\"\n+ # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n+ }\n+ kubernetes = {\n+ source = \"hashicorp/kubernetes\"\n+ version = \"~> 2.10\"\n+ }\n+ random = {\n+ source = \"hashicorp/random\"\n+ version = \">= 2.1\"\n+ }\n+ }\n+ provider_meta \"google\" {\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v32.0.4\"\n+ }\n {% else %}\n required_providers {\n google = {\n---\nmodules/beta-autopilot-private-cluster/versions.tf\n@@ -20,12 +20,14 @@ terraform {\n \n required_providers {\n google = {\n- source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ source = \"hashicorp/google\"\n+ # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n google-beta = {\n- source = \"hashicorp/google-beta\"\n- version = \">= 5.40.0, < 6\"\n+ source = \"hashicorp/google-beta\"\n+ # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-public-cluster/versions.tf\n@@ -20,12 +20,14 @@ terraform {\n \n required_providers {\n google = {\n- source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ source = \"hashicorp/google\"\n+ # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n google-beta = {\n- source = \"hashicorp/google-beta\"\n- version = \">= 5.40.0, < 6\"\n+ source = \"hashicorp/google-beta\"\n+ # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\ntest/integration/node_pool/controls/gcloud.rb\n@@ -257,17 +257,18 @@\n )\n end\n \n- it \"has the expected accelerators\" do\n- expect(data['nodePools']).to include(\n- including(\n- \"name\" => \"pool-02\",\n- \"config\" => including(\n- \"accelerators\" => [{\"acceleratorCount\" => expected_accelerators_count,\n- \"acceleratorType\" => expected_accelerators_type}],\n- ),\n- )\n- )\n- end\n+# TODO: Update/fix this test (manually tested)\n+# it \"has the expected accelerators\" do\n+# expect(data['nodePools']).to include(\n+# including(\n+# \"name\" => \"pool-02\",\n+# \"config\" => including(\n+# \"accelerators\" => [{\"acceleratorCount\" => expected_accelerators_count,\n+# \"acceleratorType\" => expected_accelerators_type}],\n+# ),\n+# )\n+# )\n+# end\n \n it \"has the expected disk size\" do\n expect(data['nodePools']).to include(\n---\n\n\n---\n\nChoice C:\nautogen/main/versions.tf.tmpl\n@@ -20,7 +20,7 @@\n terraform {\n required_version = \">=1.3\"\n \n-{% if beta_cluster %}\n+{% if beta_cluster and not autopilot_cluster %}\n required_providers {\n google = {\n source = \"hashicorp/google\"\n@@ -42,6 +42,49 @@ terraform {\n provider_meta \"google-beta\" {\n module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v32.0.4\"\n }\n+{% elif beta_cluster and autopilot_cluster %}\n+ required_providers {\n+ google = {\n+ source = \"hashicorp/google\"\n+ # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n+ }\n+ google-beta = {\n+ source = \"hashicorp/google-beta\"\n+ # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n+ }\n+ kubernetes = {\n+ source = \"hashicorp/kubernetes\"\n+ version = \"~> 2.10\"\n+ }\n+ random = {\n+ source = \"hashicorp/random\"\n+ version = \">= 2.1\"\n+ }\n+ }\n+ provider_meta \"google-beta\" {\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v32.0.4\"\n+ }\n+{% elif autopilot_cluster %}\n+ required_providers {\n+ google = {\n+ source = \"hashicorp/google\"\n+ # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n+ }\n+ kubernetes = {\n+ source = \"hashicorp/kubernetes\"\n+ version = \"~> 2.10\"\n+ }\n+ random = {\n+ source = \"hashicorp/random\"\n+ version = \">= 2.1\"\n+ }\n+ }\n+ provider_meta \"google\" {\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v32.0.4\"\n+ }\n {% else %}\n required_providers {\n google = {\n---\nmodules/beta-autopilot-private-cluster/versions.tf\n@@ -20,12 +20,14 @@ terraform {\n \n required_providers {\n google = {\n- source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ source = \"hashicorp/google\"\n+ # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n google-beta = {\n- source = \"hashicorp/google-beta\"\n- version = \">= 5.40.0, < 6\"\n+ source = \"hashicorp/google-beta\"\n+ # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-public-cluster/versions.tf\n@@ -20,12 +20,14 @@ terraform {\n \n required_providers {\n google = {\n- source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ source = \"hashicorp/google\"\n+ # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n google-beta = {\n- source = \"hashicorp/google-beta\"\n- version = \">= 5.40.0, < 6\"\n+ source = \"hashicorp/google-beta\"\n+ # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\ntest/integration/node_pool/controls/gcloud.rb\n@@ -257,17 +257,18 @@\n )\n end\n \n- it \"has the expected accelerators\" do\n- expect(data['nodePools']).to include(\n- including(\n- \"name\" => \"pool-02\",\n- \"config\" => \"accelerators\" => [{\"acceleratorCount\" => expected_accelerators_count,\n- \"acceleratorType\" => expected_accelerators_type}],\n- ),\n- )\n- )\n- end\n+# TODO: Update/fix this test (manually tested)\n+# it \"has the expected accelerators\" do\n+# expect(data['nodePools']).to include(\n+# including(\n+# \"name\" => \"pool-02\",\n+# \"config\" => including(\n+# \"accelerators\" => [{\"acceleratorCount\" => expected_accelerators_count,\n+# \"acceleratorType\" => expected_accelerators_type}],\n+# ),\n+# )\n+# )\n+# end\n \n it \"has the expected disk size\" do\n expect(data['nodePools']).to include(\n---\n\n\n---\n\nChoice D:\nautogen/main/versions.tf.tmpl\n@@ -20,7 +20,7 @@\n terraform {\n required_version = \">=1.3\"\n \n-{% if beta_cluster %}\n+{% if beta_cluster and not autopilot_cluster %}\n required_providers {\n google = {\n source = \"hashicorp/google\"\n@@ -42,6 +42,49 @@ terraform {\n provider_meta \"google-beta\" {\n module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v32.0.4\"\n }\n+{% elif beta_cluster and autopilot_cluster %}\n+ required_providers {\n+ google = {\n+ source = \"hashicorp/google\"\n+ # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n+ }\n+ google-beta = {\n+ source = \"hashicorp/google-beta\"\n+ # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n+ }\n+ kubernetes = {\n+ source = \"hashicorp/kubernetes\"\n+ version = \"~> 2.10\"\n+ }\n+ random = {\n+ source = \"hashicorp/random\"\n+ version = \">= 2.1\"\n+ }\n+ }\n+ provider_meta \"google-beta\" {\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v32.0.4\"\n+ }\n+{% elif autopilot_cluster %}\n+ required_providers {\n+ google = {\n+ source = \"hashicorp/google\"\n+ # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n+ }\n+ kubernetes = {\n+ source = \"hashicorp/kubernetes\"\n+ version = \"~> 2.10\"\n+ }\n+ random = {\n+ source = \"hashicorp/random\"\n+ version = \">= 2.1\"\n+ }\n+ }\n+ provider_meta \"google\" {\n+ module_name = \"blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v32.0.4\"\n+ }\n {% else %}\n required_providers {\n google = {\n---\nmodules/beta-autopilot-private-cluster/versions.tf\n@@ -20,12 +20,14 @@ terraform {\n \n required_providers {\n google = {\n- source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ source = \"hashicorp/google\"\n+ # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n google-beta = {\n- source = \"hashicorp/google-beta\"\n- version = \">= 5.40.0, < 6\"\n+ source = \"hashicorp/google-beta\"\n+ # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-public-cluster/versions.tf\n@@ -20,12 +20,14 @@ terraform {\n \n required_providers {\n google = {\n- source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ source = \"hashicorp/google\"\n+ # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n google-beta = {\n- source = \"hashicorp/google-beta\"\n- version = \">= 5.40.0, < 6\"\n+ source = \"hashicorp/google-beta\"\n+ # Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\ntest/integration/node_pool/controls/gcloud.rb\n@@ -257,17 +257,18 @@\n )\n end\n \n- it \"has the expected accelerators\" do\n- expect(data['nodePools']).to include(\n- including(\n- \"name\" => \"pool-02\",\n- \"config\" => including(\n- \"accelerators\" => [{\"acceleratorCount\" => expected_accelerators_count,\n- => expected_accelerators_type}],\n- ),\n- )\n- )\n- end\n+# TODO: Update/fix this test (manually tested)\n+# it \"has the expected accelerators\" do\n+# expect(data['nodePools']).to include(\n+# including(\n+# \"name\" => \"pool-02\",\n+# \"config\" => including(\n+# \"accelerators\" => [{\"acceleratorCount\" => expected_accelerators_count,\n+# \"acceleratorType\" => expected_accelerators_type}],\n+# ),\n+# )\n+# )\n+# end\n \n it \"has the expected disk size\" do\n expect(data['nodePools']).to include(\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nNone\n\n---\n\nChoice A:\nautogen/main/versions.tf.tmpl\n@@ -24,11 +24,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n@@ -46,7 +46,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-private-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-public-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-private-cluster-update-variant/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-private-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-public-cluster-update-variant/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-public-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/private-cluster-update-variant/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/private-cluster/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nversions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\n\n\n---\n\nChoice B:\nautogen/main/versions.tf.tmpl\n@@ -24,11 +24,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n@@ -46,7 +46,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n kubernetes {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-private-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-public-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-private-cluster-update-variant/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-private-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-public-cluster-update-variant/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-public-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/private-cluster-update-variant/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/private-cluster/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nversions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\n\n\n---\n\nChoice C:\nautogen/main/versions.tf.tmpl\n@@ -24,11 +24,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n@@ -46,7 +46,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-private-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-public-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-private-cluster-update-variant/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-private-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-public-cluster-update-variant/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-public-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/private-cluster-update-variant/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n kubernetes = {\n < = \"hashicorp/kubernetes\"\n---\nmodules/private-cluster/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nversions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\n\n\n---\n\nChoice D:\nautogen/main/versions.tf.tmpl\n@@ -24,11 +24,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n@@ -46,7 +46,7 @@ terraform {\n required_providers {\n 5.40.0, google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-private-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-autopilot-public-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-private-cluster-update-variant/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-private-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-public-cluster-update-variant/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/beta-public-cluster/versions.tf\n@@ -21,11 +21,11 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n google-beta = {\n source = \"hashicorp/google-beta\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/private-cluster-update-variant/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nmodules/private-cluster/versions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\nversions.tf\n@@ -21,7 +21,7 @@ terraform {\n required_providers {\n google = {\n source = \"hashicorp/google\"\n- version = \">= 5.40.0, < 6\"\n+ version = \">= 5.40.0, != 5.44.0, < 6\"\n }\n kubernetes = {\n source = \"hashicorp/kubernetes\"\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\n…ice account\n\n---\n\nChoice A:\nmodules/beta-private-cluster/sa.tf\n@@ -55,7 +55,7 @@ resource \"google_project_iam_member\" \"cluster_service_account-nodeService_accoun\n resource \"google_project_iam_member\" \"cluster_service_account-metric_writer\" {\n count = var.create_service_account ? 1 : 0\n project = google_service_account.cluster_service_account[0].project\n- role = \"roles/monitoring.metricWriter\"\n+ role = var.monitoring_metric_writer_role\n member = google_service_account.cluster_service_account[0].member\n }\n \n---\nmodules/beta-private-cluster/variables.tf\n@@ -379,6 +379,12 @@ variable \"create_service_account\" {\n default = true\n }\n \n+variable \"monitoring_metric_writer_role\" {\n+ type = string\n+ description = \"custom monitoring metrics writer role in case there is any\"\n+ default = \"roles/monitoring.metricWriter\"\n+}\n+\n variable \"grant_registry_access\" {\n type = bool\n 0\n description = \"Grants created cluster-specific service account storage.objectViewer and artifactregistry.reader roles.\"\n---\n\n\n---\n\nChoice B:\nmodules/beta-private-cluster/sa.tf\n@@ -55,7 +55,7 @@ resource \"google_project_iam_member\" \"cluster_service_account-nodeService_accoun\n resource \"google_project_iam_member\" \"cluster_service_account-metric_writer\" {\n count = var.create_service_account ? 1 : 0\n project = google_service_account.cluster_service_account[0].project\n- role = \"roles/monitoring.metricWriter\"\n+ role = var.monitoring_metric_writer_role\n member = google_service_account.cluster_service_account[0].member\n }\n \n---\nmodules/beta-private-cluster/variables.tf\n@@ -379,6 @@ variable \"create_service_account\" {\n default = true\n }\n \n+variable \"monitoring_metric_writer_role\" {\n+ type = string\n+ description = \"custom monitoring metrics writer role in case there is any\"\n+ default = \"roles/monitoring.metricWriter\"\n+}\n+\n variable \"grant_registry_access\" {\n type = bool\n description = \"Grants created cluster-specific service account storage.objectViewer and artifactregistry.reader roles.\"\n---\n\n\n---\n\nChoice C:\nmodules/beta-private-cluster/sa.tf\n@@ -55,7 +55,7 @@ resource \"google_project_iam_member\" \"cluster_service_account-nodeService_accoun\n resource \"google_project_iam_member\" \"cluster_service_account-metric_writer\" {\n count = var.create_service_account ? 1 : 0\n project = google_service_account.cluster_service_account[0].project\n- role = \"roles/monitoring.metricWriter\"\n+ role = var.monitoring_metric_writer_role\n member = google_service_account.cluster_service_account[0].member\n }\n \n---\nmodules/beta-private-cluster/variables.tf\n@@ -379,6 +379,12 @@ variable \"create_service_account\" {\n default = true\n }\n \n+variable {\n+ type = string\n+ description = \"custom monitoring metrics writer role in case there is any\"\n+ default = \"roles/monitoring.metricWriter\"\n+}\n+\n variable \"grant_registry_access\" {\n type = bool\n description = \"Grants created cluster-specific service account storage.objectViewer and artifactregistry.reader roles.\"\n---\n\n\n---\n\nChoice D:\nmodules/beta-private-cluster/sa.tf\n@@ -55,7 +55,7 @@ resource \"google_project_iam_member\" \"cluster_service_account-nodeService_accoun\n resource \"google_project_iam_member\" \"cluster_service_account-metric_writer\" {\n count = var.create_service_account ? 1 : 0\n project = google_service_account.cluster_service_account[0].project\n- role = \"roles/monitoring.metricWriter\"\n+ role = var.monitoring_metric_writer_role\n member = google_service_account.cluster_service_account[0].member\n }\n \n---\nmodules/beta-private-cluster/variables.tf\n@@ -379,6 +379,12 @@ variable \"create_service_account\" {\n default = true\n }\n \n+variable \"monitoring_metric_writer_role\" {\n+ type = string\n+ description = \"custom monitoring metrics writer role in case there is any\"\n+ default = \"roles/monitoring.metricWriter\"\n+}\n+\n variable \"grant_registry_access\" {\n type = bool\n description = \"Grants created cluster-specific service account storage.objectViewer and artifactregistry.reader roles.\"\n---\n\n\n---\n"
}
] |
D
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\n…ice account\n\n---\n\nChoice A:\nmodules/beta-private-cluster/sa.tf\n@@ -55,7 +55,7 @@ resource \"google_project_iam_member\" \"cluster_service_account-nodeService_accoun\n resource \"google_project_iam_member\" \"cluster_service_account-metric_writer\" {\n count = var.create_service_account ? 1 : 0\n project = google_service_account.cluster_service_account[0].project\n- role = \"roles/monitoring.metricWriter\"\n+ role = var.monitoring_metric_writer_role\n member = google_service_account.cluster_service_account[0].member\n }\n \n---\nmodules/beta-private-cluster/variables.tf\n@@ -379,6 +379,12 @@ \"create_service_account\" {\n default = true\n }\n \n+variable \"monitoring_metric_writer_role\" {\n+ type = string\n+ description = \"custom monitoring metrics writer role in case there is any\"\n+ default = \"roles/monitoring.metricWriter\"\n+}\n+\n variable \"grant_registry_access\" {\n type = bool\n description = \"Grants created cluster-specific service account storage.objectViewer and artifactregistry.reader roles.\"\n---\n\n\n---\n\nChoice B:\nmodules/beta-private-cluster/sa.tf\n@@ -55,7 +55,7 @@ resource \"google_project_iam_member\" \"cluster_service_account-nodeService_accoun\n resource \"google_project_iam_member\" \"cluster_service_account-metric_writer\" {\n count = var.create_service_account ? 1 : 0\n project = google_service_account.cluster_service_account[0].project\n- role = \"roles/monitoring.metricWriter\"\n+ role = var.monitoring_metric_writer_role\n member = google_service_account.cluster_service_account[0].member\n }\n \n---\nmodules/beta-private-cluster/variables.tf\n@@ -379,6 +379,12 @@ variable \"create_service_account\" {\n bool\n default = true\n }\n \n+variable \"monitoring_metric_writer_role\" {\n+ type = string\n+ description = \"custom monitoring metrics writer role in case there is any\"\n+ default = \"roles/monitoring.metricWriter\"\n+}\n+\n variable \"grant_registry_access\" {\n type = bool\n description = \"Grants created cluster-specific service account storage.objectViewer and artifactregistry.reader roles.\"\n---\n\n\n---\n\nChoice C:\nmodules/beta-private-cluster/sa.tf\n@@ -55,7 +55,7 @@ resource \"google_project_iam_member\" \"google_project_iam_member\" resource \"google_project_iam_member\" \"cluster_service_account-metric_writer\" {\n count = var.create_service_account ? 1 : 0\n project = google_service_account.cluster_service_account[0].project\n- role = \"roles/monitoring.metricWriter\"\n+ role = var.monitoring_metric_writer_role\n member = google_service_account.cluster_service_account[0].member\n }\n \n---\nmodules/beta-private-cluster/variables.tf\n@@ -379,6 +379,12 @@ variable \"create_service_account\" {\n default = true\n }\n \n+variable \"monitoring_metric_writer_role\" {\n+ type = string\n+ description = \"custom monitoring metrics writer role in case there is any\"\n+ default = \"roles/monitoring.metricWriter\"\n+}\n+\n variable \"grant_registry_access\" {\n type = bool\n description = \"Grants created cluster-specific service account storage.objectViewer and artifactregistry.reader roles.\"\n---\n\n\n---\n\nChoice D:\nmodules/beta-private-cluster/sa.tf\n@@ -55,7 +55,7 @@ resource \"google_project_iam_member\" \"cluster_service_account-nodeService_accoun\n resource \"google_project_iam_member\" \"cluster_service_account-metric_writer\" {\n count = var.create_service_account ? 1 : 0\n project = google_service_account.cluster_service_account[0].project\n- role = \"roles/monitoring.metricWriter\"\n+ role = var.monitoring_metric_writer_role\n member = google_service_account.cluster_service_account[0].member\n }\n \n---\nmodules/beta-private-cluster/variables.tf\n@@ -379,6 +379,12 @@ variable \"create_service_account\" {\n default = true\n }\n \n+variable \"monitoring_metric_writer_role\" {\n+ type = string\n+ description = \"custom monitoring metrics writer role in case there is any\"\n+ default = \"roles/monitoring.metricWriter\"\n+}\n+\n variable \"grant_registry_access\" {\n type = bool\n description = \"Grants created cluster-specific service account storage.objectViewer and artifactregistry.reader roles.\"\n---\n\n\n---\n"
}
] |
D
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nThis PR contains the following updates:\n\n| Package | Change | Age | Adoption | Passing | Confidence |\n|---|---|---|---|---|---|\n| [github.com/gruntwork-io/terratest](https://redirect.github.com/gruntwork-io/terratest) | `v0.47.0` -> `v0.47.1` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) |\n\n---\n\n### Release Notes\n\n<details>\n<summary>gruntwork-io/terratest (github.com/gruntwork-io/terratest)</summary>\n\n### [`v0.47.1`](https://redirect.github.com/gruntwork-io/terratest/releases/tag/v0.47.1)\n\n[Compare Source](https://redirect.github.com/gruntwork-io/terratest/compare/v0.47.0...v0.47.1)\n\n#### Modules affected\n\n- `aws`\n- `retry`\n\n#### Description\n\n- Extended VPC struct to support cidrblock,cidr associations and ipv6 a… by [@​james03160927](https://redirect.github.com/james03160927) in [https://github.com/gruntwork-io/terratest/pull/1422](https://redirect.github.com/gruntwork-io/terratest/pull/1422)\n- Add Route53 by [@​james03160927](https://redirect.github.com/james03160927) in [https://github.com/gruntwork-io/terratest/pull/1421](https://redirect.github.com/gruntwork-io/terratest/pull/1421)\n- Allow to fail on specific warning messages by [@​james03160927](https://redirect.github.com/james03160927) in [https://github.com/gruntwork-io/terratest/pull/1426](https://redirect.github.com/gruntwork-io/terratest/pull/1426)\n- Fix CircleCi Helm Test by [@​james03160927](https://redirect.github.com/james03160927) in [https://github.com/gruntwork-io/terratest/pull/1429](https://redirect.github.com/gruntwork-io/terratest/pull/1429)\n- OpenTofu 1.8 upgrade by [@​denis256](https://redirect.github.com/denis256) in [https://github.com/gruntwork-io/terratest/pull/1431](https://redirect.github.com/gruntwork-io/terratest/pull/1431)\n- Bump nokogiri from 1.16.3 to 1.16.5 in /docs by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/gruntwork-io/terratest/pull/1406](https://redirect.github.com/gruntwork-io/terratest/pull/1406)\n- Bump rexml from 3.2.5 to 3.3.3 in /docs by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/gruntwork-io/terratest/pull/1430](https://redirect.github.com/gruntwork-io/terratest/pull/1430)\n- Bump github.com/docker/cli from 20.10.7+incompatible to 20.10.9+incompatible by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/gruntwork-io/terratest/pull/1410](https://redirect.github.com/gruntwork-io/terratest/pull/1410)\n- Bump commonmarker from 0.17.13 to 0.23.10 in /docs by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/gruntwork-io/terratest/pull/1433](https://redirect.github.com/gruntwork-io/terratest/pull/1433)\n- Bump activesupport from 6.0.6.1 to 6.1.7.5 in /docs by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/gruntwork-io/terratest/pull/1434](https://redirect.github.com/gruntwork-io/terratest/pull/1434)\n- Bump github.com/docker/docker from 24.0.9+incompatible to 25.0.6+incompatible by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/gruntwork-io/terratest/pull/1428](https://redirect.github.com/gruntwork-io/terratest/pull/1428)\n- Fix additional issues with circleCi by [@​james03160927](https://redirect.github.com/james03160927) in [https://github.com/gruntwork-io/terratest/pull/1436](https://redirect.github.com/gruntwork-io/terratest/pull/1436)\n- Update go-getter from v1.7.5 to v1.7.6 by [@​roysha1](https://redirect.github.com/roysha1) in [https://github.com/gruntwork-io/terratest/pull/1438](https://redirect.github.com/gruntwork-io/terratest/pull/1438)\n\n#### Special thanks\n\n<!-- Usernames of users that contributed to this release, if the contribution was external to Gruntwork. -->\n\nSpecial thanks to the following users for their contribution!\n\n- [@​roysha1](https://redirect.github.com/roysha1)\n\n<!-- RELEASE_NOTES_DRAFTER_MARKER_CONTRIBUTORS_NEXT -->\n\n#### Related links\n\n- [https://github.com/gruntwork-io/terratest/pull/1422](https://redirect.github.com/gruntwork-io/terratest/pull/1422)\n- [https://github.com/gruntwork-io/terratest/pull/1421](https://redirect.github.com/gruntwork-io/terratest/pull/1421)\n- [https://github.com/gruntwork-io/terratest/pull/1429](https://redirect.github.com/gruntwork-io/terratest/pull/1429)\n- [https://github.com/gruntwork-io/terratest/pull/1431](https://redirect.github.com/gruntwork-io/terratest/pull/1431)\n- [https://github.com/gruntwork-io/terratest/pull/1406](https://redirect.github.com/gruntwork-io/terratest/pull/1406)\n- [https://github.com/gruntwork-io/terratest/pull/1430](https://redirect.github.com/gruntwork-io/terratest/pull/1430)\n- [https://github.com/gruntwork-io/terratest/pull/1410](https://redirect.github.com/gruntwork-io/terratest/pull/1410)\n- [https://github.com/gruntwork-io/terratest/pull/1433](https://redirect.github.com/gruntwork-io/terratest/pull/1433)\n- [https://github.com/gruntwork-io/terratest/pull/1428](https://redirect.github.com/gruntwork-io/terratest/pull/1428)\n- [https://github.com/gruntwork-io/terratest/pull/1436](https://redirect.github.com/gruntwork-io/terratest/pull/1436)\n- [https://github.com/gruntwork-io/terratest/pull/1438](https://redirect.github.com/gruntwork-io/terratest/pull/1438)\n\n**Full Changelog**: https://github.com/gruntwork-io/terratest/compare/v0.47.0...v0.47.1\n\n</details>\n\n---\n\n### Configuration\n\n📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).\n\n🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.\n\n♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox.\n\n🔕 **Ignore**: Close this PR and you won't be reminded about this update again.\n\n---\n\n - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box\n\n---\n\nThis PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/terraform-google-modules/terraform-google-kubernetes-engine).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC41OS4yIiwidXBkYXRlZEluVmVyIjoiMzguNTkuMiIsInRhcmdldEJyYW5jaCI6Im1hc3RlciIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiXX0=-->\n\n\n---\n\nChoice A:\ntest/integration/go.mod\n@@ -6,7 +6,7 @@ toolchain go1.22.6\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.1\n-\tgithub.com/gruntwork-io/terratest v0.47.0\n+\tgithub.com/gruntwork-io/terratest v0.47.1\n \tgithub.com/stretchr/testify v1.9.0\n \tgithub.com/tidwall/gjson v1.17.3\n )\n@@ -45,7 +45,7 @@ require (\n \tgithub.com/gruntwork-io/go-commons v0.17.1 // indirect\n \tgithub.com/hashicorp/errwrap v1.1.0 // indirect\n \tgithub.com/hashicorp/go-cleanhttp v0.5.2 // indirect\n-\tgithub.com/hashicorp/go-getter v1.7.5 // indirect\n+\tgithub.com/hashicorp/go-getter v1.7.6 // indirect\n \tgithub.com/hashicorp/go-multierror v1.1.1 // indirect\n \tgithub.com/hashicorp/go-safetemp v1.0.0 // indirect\n \tgithub.com/hashicorp/go-version v1.6.0 // indirect\n---\ntest/integration/go.sum\n@@ -378,15 +378,15 @@ github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/ad\n github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=\n github.com/gruntwork-io/go-commons v0.17.1 h1:2KS9wAqrgeOTWj33DSHzDNJ1FCprptWdLFqej+wB8x0=\n github.com/gruntwork-io/go-commons v0.17.1/go.mod h1:S98JcR7irPD1bcruSvnqupg+WSJEJ6xaM89fpUZVISk=\n-github.com/gruntwork-io/terratest v0.47.0 h1:xIy1pT7NbGVlMLDZEHl3+3iSnvffh8tN2pL6idn448c=\n-github.com/gruntwork-io/terratest v0.47.0/go.mod h1:oywHw1cFKXSYvKPm27U7quZVzDUlA22H2xUrKCe26xM=\n+github.com/gruntwork-io/terratest v0.47.1 h1:qOaxnL7Su5+KpDHYUN/ek1jn8ImvCKtOkaY4OSMS4tI=\n+github.com/gruntwork-io/terratest v1.7.6/go.mod h1:LnYX8BN5WxUMpDr8rtD39oToSL4CBERWSCusbJ0d/64=\n github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=\n github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=\n github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=\n-github.com/hashicorp/go-getter v1.7.5 h1:dT58k9hQ/vbxNMwoI5+xFYAJuv6152UNvdHokfI5wE4=\n-github.com/hashicorp/go-getter v1.7.5/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744=\n+github.com/hashicorp/go-getter v1.7.6 h1:5jHuM+aH373XNtXl9TNTUH5Qd69Trve11tHIrB+6yj4=\n+github.com/hashicorp/go-getter v1.7.6/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744=\n github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=\n github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=\n github.com/hashicorp/go-safetemp v1.0.0 h1:2HR189eFNrjHQyENnQMMpCiBAsRxzbTMIgBhEyExpmo=\n---\n\n\n---\n\nChoice B:\ntest/integration/go.mod\n@@ -6,7 +6,7 @@ toolchain go1.22.6\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.1\n-\tgithub.com/gruntwork-io/terratest v0.47.0\n+\tgithub.com/gruntwork-io/terratest v0.47.1\n \tgithub.com/stretchr/testify v1.9.0\n \tgithub.com/tidwall/gjson v1.17.3\n )\n@@ -45,7 +45,7 @@ require (\n \tgithub.com/gruntwork-io/go-commons v0.17.1 // indirect\n \tgithub.com/hashicorp/errwrap v1.1.0 // indirect\n \tgithub.com/hashicorp/go-cleanhttp v0.5.2 // indirect\n-\tgithub.com/hashicorp/go-getter v1.7.5 // indirect\n+\tgithub.com/hashicorp/go-getter v1.7.6 // indirect\n \tgithub.com/hashicorp/go-multierror v1.1.1 // indirect\n \tgithub.com/hashicorp/go-safetemp v1.0.0 // indirect\n \tgithub.com/hashicorp/go-version v1.6.0 // indirect\n---\ntest/integration/go.sum\n@@ -378,15 +378,15 @@ github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/ad\n github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=\n github.com/gruntwork-io/go-commons v0.17.1 h1:2KS9wAqrgeOTWj33DSHzDNJ1FCprptWdLFqej+wB8x0=\n github.com/gruntwork-io/go-commons v0.17.1/go.mod h1:S98JcR7irPD1bcruSvnqupg+WSJEJ6xaM89fpUZVISk=\n-github.com/gruntwork-io/terratest v0.47.0 h1:xIy1pT7NbGVlMLDZEHl3+3iSnvffh8tN2pL6idn448c=\n-github.com/gruntwork-io/terratest v0.47.0/go.mod h1:oywHw1cFKXSYvKPm27U7quZVzDUlA22H2xUrKCe26xM=\n+github.com/gruntwork-io/terratest v0.47.1 h1:qOaxnL7Su5+KpDHYUN/ek1jn8ImvCKtOkaY4OSMS4tI=\n+github.com/gruntwork-io/terratest v0.47.1/go.mod h1:LnYX8BN5WxUMpDr8rtD39oToSL4CBERWSCusbJ0d/64=\n github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=\n github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=\n github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=\n-github.com/hashicorp/go-getter v1.7.5 h1:dT58k9hQ/vbxNMwoI5+xFYAJuv6152UNvdHokfI5wE4=\n-github.com/hashicorp/go-getter v1.7.5/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744=\n+github.com/hashicorp/go-getter v1.7.6 h1:5jHuM+aH373XNtXl9TNTUH5Qd69Trve11tHIrB+6yj4=\n+github.com/hashicorp/go-getter v1.7.6/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744=\n github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=\n github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=\n github.com/hashicorp/go-safetemp v1.0.0 h1:2HR189eFNrjHQyENnQMMpCiBAsRxzbTMIgBhEyExpmo=\n---\n\n\n---\n\nChoice C:\ntest/integration/go.mod\n@@ -6,7 +6,7 @@ toolchain go1.22.6\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.1\n-\tgithub.com/gruntwork-io/terratest v0.47.0\n+\tgithub.com/gruntwork-io/terratest v0.47.1\n \tgithub.com/stretchr/testify v1.9.0\n \tgithub.com/tidwall/gjson v1.17.3\n )\n@@ -45,7 +45,7 @@ require (\n \tgithub.com/gruntwork-io/go-commons v0.17.1 // indirect\n \tgithub.com/hashicorp/errwrap v1.1.0 // indirect\n \tgithub.com/hashicorp/go-cleanhttp v0.5.2 // indirect\n-\tgithub.com/hashicorp/go-getter v1.7.5 // indirect\n+\tgithub.com/hashicorp/go-getter v1.7.6 // indirect\n \tgithub.com/hashicorp/go-multierror v1.1.1 // indirect\n \tgithub.com/hashicorp/go-safetemp v1.0.0 // indirect\n \tgithub.com/hashicorp/go-version v1.6.0 // indirect\n---\ntest/integration/go.sum\n@@ -378,15 +378,15 @@ github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/ad\n github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=\n github.com/gruntwork-io/go-commons v0.17.1 h1:2KS9wAqrgeOTWj33DSHzDNJ1FCprptWdLFqej+wB8x0=\n github.com/gruntwork-io/go-commons v0.17.1/go.mod h1:S98JcR7irPD1bcruSvnqupg+WSJEJ6xaM89fpUZVISk=\n-github.com/gruntwork-io/terratest v0.47.0 h1:xIy1pT7NbGVlMLDZEHl3+3iSnvffh8tN2pL6idn448c=\n-github.com/gruntwork-io/terratest v0.47.0/go.mod h1:oywHw1cFKXSYvKPm27U7quZVzDUlA22H2xUrKCe26xM=\n+github.com/gruntwork-io/terratest v0.47.1 h1:qOaxnL7Su5+KpDHYUN/ek1jn8ImvCKtOkaY4OSMS4tI=\n+github.com/gruntwork-io/terratest v0.47.1/go.mod h1:LnYX8BN5WxUMpDr8rtD39oToSL4CBERWSCusbJ0d/64=\n github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=\n github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=\n github.com/hashicorp/go-cleanhttp v1.1.1/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=\n-github.com/hashicorp/go-getter v1.7.5 h1:dT58k9hQ/vbxNMwoI5+xFYAJuv6152UNvdHokfI5wE4=\n-github.com/hashicorp/go-getter v1.7.5/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744=\n+github.com/hashicorp/go-getter v1.7.6 h1:5jHuM+aH373XNtXl9TNTUH5Qd69Trve11tHIrB+6yj4=\n+github.com/hashicorp/go-getter v1.7.6/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744=\n github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=\n github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=\n github.com/hashicorp/go-safetemp v1.0.0 h1:2HR189eFNrjHQyENnQMMpCiBAsRxzbTMIgBhEyExpmo=\n---\n\n\n---\n\nChoice D:\ntest/integration/go.mod\n@@ -6,7 +6,7 @@ toolchain go1.22.6\n \n require (\n \tgithub.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.1\n-\tgithub.com/gruntwork-io/terratest v0.47.0\n+\tgithub.com/gruntwork-io/terratest v0.47.1\n \tgithub.com/stretchr/testify v1.9.0\n \tgithub.com/tidwall/gjson v1.17.3\n )\n@@ -45,7 +45,7 @@ require (\n indirect\n+\tgithub.com/hashicorp/go-getter v0.17.1 // indirect\n \tgithub.com/hashicorp/errwrap v1.1.0 // indirect\n \tgithub.com/hashicorp/go-cleanhttp v0.5.2 // indirect\n-\tgithub.com/hashicorp/go-getter v1.7.5 // indirect\n+\tgithub.com/hashicorp/go-getter v1.7.6 // indirect\n \tgithub.com/hashicorp/go-multierror v1.1.1 // indirect\n \tgithub.com/hashicorp/go-safetemp v1.0.0 // indirect\n \tgithub.com/hashicorp/go-version v1.6.0 // indirect\n---\ntest/integration/go.sum\n@@ -378,15 +378,15 @@ github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/ad\n github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=\n github.com/gruntwork-io/go-commons v0.17.1 h1:2KS9wAqrgeOTWj33DSHzDNJ1FCprptWdLFqej+wB8x0=\n github.com/gruntwork-io/go-commons v0.17.1/go.mod h1:S98JcR7irPD1bcruSvnqupg+WSJEJ6xaM89fpUZVISk=\n-github.com/gruntwork-io/terratest v0.47.0 h1:xIy1pT7NbGVlMLDZEHl3+3iSnvffh8tN2pL6idn448c=\n-github.com/gruntwork-io/terratest v0.47.0/go.mod h1:oywHw1cFKXSYvKPm27U7quZVzDUlA22H2xUrKCe26xM=\n+github.com/gruntwork-io/terratest v0.47.1 h1:qOaxnL7Su5+KpDHYUN/ek1jn8ImvCKtOkaY4OSMS4tI=\n+github.com/gruntwork-io/terratest v0.47.1/go.mod h1:LnYX8BN5WxUMpDr8rtD39oToSL4CBERWSCusbJ0d/64=\n github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=\n github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=\n github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=\n github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=\n-github.com/hashicorp/go-getter v1.7.5 h1:dT58k9hQ/vbxNMwoI5+xFYAJuv6152UNvdHokfI5wE4=\n-github.com/hashicorp/go-getter v1.7.5/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744=\n+github.com/hashicorp/go-getter v1.7.6 h1:5jHuM+aH373XNtXl9TNTUH5Qd69Trve11tHIrB+6yj4=\n+github.com/hashicorp/go-getter v1.7.6/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744=\n github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=\n github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=\n github.com/hashicorp/go-safetemp v1.0.0 h1:2HR189eFNrjHQyENnQMMpCiBAsRxzbTMIgBhEyExpmo=\n---\n\n\n---\n"
}
] |
B
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\n[](https://renovatebot.com)\n\nThis PR contains the following updates:\n\n| Package | Type | Update | Change |\n|---|---|---|---|\n| [terraform-google-modules/project-factory/google](https://registry.terraform.io/modules/terraform-google-modules/project-factory/google) ([source](https://togithub.com/terraform-google-modules/terraform-google-project-factory)) | module | major | `~> 15.0` -> `~> 16.0` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>terraform-google-modules/terraform-google-project-factory (terraform-google-modules/project-factory/google)</summary>\n\n### [`v16.0.0`](https://togithub.com/terraform-google-modules/terraform-google-project-factory/blob/HEAD/CHANGELOG.md#1600-2024-08-14)\n\n[Compare Source](https://togithub.com/terraform-google-modules/terraform-google-project-factory/compare/v15.0.1...v16.0.0)\n\n##### ⚠ BREAKING CHANGES\n\n- **TPG>=5.33:** add support for setting cloud armor tier of the project ([#​921](https://togithub.com/terraform-google-modules/terraform-google-project-factory/issues/921))\n\n##### Features\n\n- **TPG>=5.33:** add support for setting cloud armor tier of the project ([#​921](https://togithub.com/terraform-google-modules/terraform-google-project-factory/issues/921)) ([895b501](https://togithub.com/terraform-google-modules/terraform-google-project-factory/commit/895b501edb3f6b21e2ad6b8f9656a4994b501dd3))\n\n##### Bug Fixes\n\n- ignore changes on firebase label ([#​931](https://togithub.com/terraform-google-modules/terraform-google-project-factory/issues/931)) ([e424a35](https://togithub.com/terraform-google-modules/terraform-google-project-factory/commit/e424a3531381d71d1ba37300de3e94eca89209ae))\n\n</details>\n\n---\n\n### Configuration\n\n📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).\n\n🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.\n\n♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox.\n\n🔕 **Ignore**: Close this PR and you won't be reminded about this update again.\n\n---\n\n - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box\n\n---\n\nThis PR was generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View the [repository job log](https://developer.mend.io/github/terraform-google-modules/terraform-google-kubernetes-engine).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC4yNi4xIiwidXBkYXRlZEluVmVyIjoiMzguMjYuMSIsInRhcmdldEJyYW5jaCI6Im1hc3RlciIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiXX0=-->\n\n\n---\n\nChoice A:\nexamples/acm-terraform-blog-part1/terraform/gke.tf\n@@ -16,7 +16,7 @@\n \n module \"enabled_google_apis\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 15.0\"\n+ version = \"~> 16.0\"\n \n project_id version = var.project\n disable_services_on_destroy = false\n---\nexamples/acm-terraform-blog-part2/terraform/gke.tf\n@@ -16,7 +16,7 @@\n \n module \"enabled_google_apis\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 15.0\"\n+ version = \"~> 16.0\"\n \n project_id = var.project\n disable_services_on_destroy = false\n---\nexamples/acm-terraform-blog-part3/terraform/gke.tf\n@@ -16,7 +16,7 @@\n \n module \"enabled_google_apis\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 15.0\"\n+ version = \"~> 16.0\"\n \n project_id = var.project\n disable_services_on_destroy = false\n---\nexamples/safer_cluster_iap_bastion/apis.tf\n@@ -16,7 +16,7 @@\n \n module \"enabled_google_apis\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 15.0\"\n+ version = \"~> 16.0\"\n \n project_id = var.project_id\n disable_services_on_destroy = false\n---\nmodules/binary-authorization/main.tf\n@@ -25,7 +25,7 @@ locals {\n \n module \"project-services\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 15.0\"\n+ version = \"~> 16.0\"\n \n project_id = var.project_id\n activate_apis = local.required_enabled_apis\n---\nmodules/services/main.tf\n@@ -16,7 +16,7 @@\n \n module \"services\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 15.0\"\n+ version = \"~> 16.0\"\n \n project_id = var.project_id\n enable_apis = var.enable_apis\n---\ntest/setup/main.tf\n@@ -45,7 +45,7 @@ locals {\n \n module \"gke-project-1\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 15.0\"\n+ version = \"~> 16.0\"\n \n name = \"ci-gke-${random_id.random_project_id_suffix.hex}\"\n random_project_id = true\n@@ -69,7 +69,7 @@ module \"gke-project-1\" {\n \n module \"gke-project-2\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 15.0\"\n+ version = \"~> 16.0\"\n \n name = \"ci-gke-${random_id.random_project_id_suffix.hex}\"\n random_project_id = true\n@@ -91,7 +91,7 @@ module \"gke-project-2\" {\n # apis as documented https://cloud.google.com/service-mesh/docs/scripted-install/reference#setting_up_your_project\n module \"gke-project-asm\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 15.0\"\n+ version = \"~> 16.0\"\n \n name = \"ci-gke-asm-${random_id.random_project_id_suffix.hex}\"\n random_project_id = true\n@@ -106,7 +106,7 @@ module \"gke-project-asm\" {\n \n module \"gke-project-fleet\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 15.0\"\n+ version = \"~> 16.0\"\n \n name = \"ci-gke-fleet-${random_id.random_project_id_suffix.hex}\"\n random_project_id = true\n---\n\n\n---\n\nChoice B:\nexamples/acm-terraform-blog-part1/terraform/gke.tf\n@@ -16,7 +16,7 @@\n \n module \"enabled_google_apis\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 15.0\"\n+ version = \"~> 16.0\"\n \n project_id = var.project\n disable_services_on_destroy = false\n---\nexamples/acm-terraform-blog-part2/terraform/gke.tf\n@@ -16,7 +16,7 @@\n \n module \"enabled_google_apis\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 15.0\"\n+ version = \"~> 16.0\"\n \n project_id = var.project\n disable_services_on_destroy = false\n---\nexamples/acm-terraform-blog-part3/terraform/gke.tf\n@@ -16,7 +16,7 @@\n \n module \"enabled_google_apis\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 15.0\"\n+ version = \"~> 16.0\"\n \n project_id = var.project\n disable_services_on_destroy = false\n---\nexamples/safer_cluster_iap_bastion/apis.tf\n@@ -16,7 +16,7 @@\n \n module \"enabled_google_apis\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 15.0\"\n+ version = \"~> 16.0\"\n \n project_id = var.project_id\n disable_services_on_destroy = false\n---\nmodules/binary-authorization/main.tf\n@@ -25,7 +25,7 @@ locals {\n \n module \"project-services\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 15.0\"\n+ version = \"~> 16.0\"\n \n project_id = var.project_id\n activate_apis = local.required_enabled_apis\n---\nmodules/services/main.tf\n@@ -16,7 +16,7 @@\n \n module \"services\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 15.0\"\n+ version = \"~> 16.0\"\n \n project_id = var.project_id\n enable_apis = var.enable_apis\n---\ntest/setup/main.tf\n@@ -45,7 +45,7 @@ locals {\n \n module \"gke-project-1\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 15.0\"\n+ version = \"~> 16.0\"\n \n name = \"ci-gke-${random_id.random_project_id_suffix.hex}\"\n random_project_id = true\n@@ -69,7 +69,7 @@ module \"gke-project-1\" {\n \n module \"gke-project-2\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 15.0\"\n+ version = \"~> 16.0\"\n \n name = \"ci-gke-${random_id.random_project_id_suffix.hex}\"\n random_project_id = true\n@@ -91,7 +91,7 @@ module \"gke-project-2\" {\n # apis as documented https://cloud.google.com/service-mesh/docs/scripted-install/reference#setting_up_your_project\n module \"gke-project-asm\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 15.0\"\n+ version = \"~> 16.0\"\n \n name = \"ci-gke-asm-${random_id.random_project_id_suffix.hex}\"\n random_project_id = true\n@@ -106,7 +106,7 @@ module \"gke-project-asm\" {\n \n module \"gke-project-fleet\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 15.0\"\n+ version = \"~> 16.0\"\n \n name = \"ci-gke-fleet-${random_id.random_project_id_suffix.hex}\"\n random_project_id = true\n---\n\n\n---\n\nChoice C:\nexamples/acm-terraform-blog-part1/terraform/gke.tf\n@@ -16,7 +16,7 @@\n \n module \"enabled_google_apis\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 15.0\"\n+ version = \"~> 16.0\"\n \n project_id = var.project\n disable_services_on_destroy = false\n---\nexamples/acm-terraform-blog-part2/terraform/gke.tf\n@@ -16,7 +16,7 @@\n \n module \"enabled_google_apis\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 15.0\"\n+ version = \"~> 16.0\"\n \n project_id = var.project\n disable_services_on_destroy = false\n---\nexamples/acm-terraform-blog-part3/terraform/gke.tf\n@@ -16,7 +16,7 @@\n \n module \"enabled_google_apis\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 15.0\"\n+ version = \"~> 16.0\"\n \n project_id = var.project\n disable_services_on_destroy = false\n---\nexamples/safer_cluster_iap_bastion/apis.tf\n@@ -16,7 +16,7 @@\n \n module \"enabled_google_apis\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 15.0\"\n+ version = \"~> 16.0\"\n \n project_id = var.project_id\n disable_services_on_destroy = false\n---\nmodules/binary-authorization/main.tf\n@@ -25,7 +25,7 @@ locals {\n \n module \"project-services\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 15.0\"\n+ version = \"~> 16.0\"\n \n project_id = var.project_id\n activate_apis = local.required_enabled_apis\n---\nmodules/services/main.tf\n@@ -16,7 +16,7 @@\n \n module \"services\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 15.0\"\n+ version = \"~> 16.0\"\n \n project_id = var.project_id\n enable_apis = var.enable_apis\n---\ntest/setup/main.tf\n@@ -45,7 +45,7 @@ locals {\n \n module \"gke-project-1\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 15.0\"\n+ version = \"~> 16.0\"\n \n name = \"ci-gke-${random_id.random_project_id_suffix.hex}\"\n random_project_id = true\n@@ -69,7 +69,7 @@ module \"gke-project-1\" {\n \n module \"gke-project-2\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 15.0\"\n+ version = \"~> 16.0\"\n \n name var.project_id\n = \"ci-gke-${random_id.random_project_id_suffix.hex}\"\n random_project_id = true\n@@ -91,7 +91,7 @@ module \"gke-project-2\" {\n # apis as documented https://cloud.google.com/service-mesh/docs/scripted-install/reference#setting_up_your_project\n module \"gke-project-asm\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 15.0\"\n+ version = \"~> 16.0\"\n \n name = \"ci-gke-asm-${random_id.random_project_id_suffix.hex}\"\n random_project_id = true\n@@ -106,7 +106,7 @@ module \"gke-project-asm\" {\n \n module \"gke-project-fleet\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 15.0\"\n+ version = \"~> 16.0\"\n \n name = \"ci-gke-fleet-${random_id.random_project_id_suffix.hex}\"\n random_project_id = true\n---\n\n\n---\n\nChoice D:\nexamples/acm-terraform-blog-part1/terraform/gke.tf\n@@ -16,7 +16,7 @@\n \n module \"enabled_google_apis\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 15.0\"\n+ version = \"~> 16.0\"\n \n project_id = var.project\n disable_services_on_destroy = false\n---\nexamples/acm-terraform-blog-part2/terraform/gke.tf\n@@ -16,7 +16,7 @@\n \n module \"enabled_google_apis\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 15.0\"\n+ version = \"~> 16.0\"\n \n project_id = var.project\n disable_services_on_destroy = false\n---\nexamples/acm-terraform-blog-part3/terraform/gke.tf\n@@ -16,7 +16,7 @@\n \n module \"enabled_google_apis\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 15.0\"\n+ version = \"~> 16.0\"\n \n project_id = var.project\n disable_services_on_destroy = false\n---\nexamples/safer_cluster_iap_bastion/apis.tf\n@@ -16,7 +16,7 @@\n \n module \"enabled_google_apis\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 15.0\"\n+ version = \"~> 16.0\"\n \n project_id \"terraform-google-modules/project-factory/google\"\n- = var.project_id\n disable_services_on_destroy = false\n---\nmodules/binary-authorization/main.tf\n@@ -25,7 +25,7 @@ locals {\n \n module \"project-services\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 15.0\"\n+ version = \"~> 16.0\"\n \n project_id = var.project_id\n activate_apis = local.required_enabled_apis\n---\nmodules/services/main.tf\n@@ -16,7 +16,7 @@\n \n module \"services\" {\n source = \"terraform-google-modules/project-factory/google//modules/project_services\"\n- version = \"~> 15.0\"\n+ version = \"~> 16.0\"\n \n project_id = var.project_id\n enable_apis = var.enable_apis\n---\ntest/setup/main.tf\n@@ -45,7 +45,7 @@ locals {\n \n module \"gke-project-1\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 15.0\"\n+ version = \"~> 16.0\"\n \n name = \"ci-gke-${random_id.random_project_id_suffix.hex}\"\n random_project_id = true\n@@ -69,7 +69,7 @@ module \"gke-project-1\" {\n \n module \"gke-project-2\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 15.0\"\n+ version = \"~> 16.0\"\n \n name = \"ci-gke-${random_id.random_project_id_suffix.hex}\"\n random_project_id = true\n@@ -91,7 +91,7 @@ module \"gke-project-2\" {\n # apis as documented https://cloud.google.com/service-mesh/docs/scripted-install/reference#setting_up_your_project\n module \"gke-project-asm\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 15.0\"\n+ version = \"~> 16.0\"\n \n name = \"ci-gke-asm-${random_id.random_project_id_suffix.hex}\"\n random_project_id = true\n@@ -106,7 +106,7 @@ module \"gke-project-asm\" {\n \n module \"gke-project-fleet\" {\n source = \"terraform-google-modules/project-factory/google\"\n- version = \"~> 15.0\"\n+ version = \"~> 16.0\"\n \n name = \"ci-gke-fleet-${random_id.random_project_id_suffix.hex}\"\n random_project_id = true\n---\n\n\n---\n"
}
] |
B
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nThis example doesn't create a cluster, so we can also include the DefaultVerify\n\n---\n\nChoice A:\ntest/integration/simple_fleet_app_operator_permissions/simple_fleet_app_operator_permissions_test.go\n@@ -24,13 +24,15 @@ import (\n \t\"github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test/pkg/tft\"\n \t\"github.com/stretchr/testify/assert\"\n \t\"github.com/terraform-google-modules/terraform-google-kubernetes-engine/test/integration/testutils\"\n-\t)\n+)\n \n func TestSimpleFleetAppOperatorPermissions(t *testing.T) {\n \tappOppT := tft.NewTFBlueprintTest(t,\n \t\ttft.WithRetryableTerraformErrors(testutils.RetryableTransientErrors, 3, 2*time.Minute),\n \t)\n \tappOppT.DefineVerify(func(assert *assert.Assertions) *testing.T) \t\tprojectId := appOppT.GetStringOutput(\"project_id\")\n \t\tscopeId := \"app-operator-team\"\n \t\tappOperatorEmail := fmt.Sprintf(\"app-operator-id@%s.iam.gserviceaccount.com\", projectId)\n---\n\n\n---\n\nChoice B:\ntest/integration/simple_fleet_app_operator_permissions/simple_fleet_app_operator_permissions_test.go\n@@ -24,13 +24,15 @@ import (\n \t\"github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test/pkg/tft\"\n \t\"github.com/stretchr/testify/assert\"\n \t\"github.com/terraform-google-modules/terraform-google-kubernetes-engine/test/integration/testutils\"\n-\t)\n+)\n \n func TestSimpleFleetAppOperatorPermissions(t *testing.T) {\n \tappOppT := tft.NewTFBlueprintTest(t,\n \t\ttft.WithRetryableTerraformErrors(testutils.RetryableTransientErrors, 3, 2*time.Minute),\n \t)\n \tappOppT.DefineVerify(func(assert *assert.Assertions) {\n+\t\tappOppT.DefaultVerify(assert)\n+\n \t\tprojectId := appOppT.GetStringOutput(\"project_id\")\n \t\tscopeId := \"app-operator-team\"\n \t\tappOperatorEmail := fmt.Sprintf(\"app-operator-id@%s.iam.gserviceaccount.com\", projectId)\n---\n\n\n---\n\nChoice C:\ntest/integration/simple_fleet_app_operator_permissions/simple_fleet_app_operator_permissions_test.go\n@@ -24,13 +24,15 @@ import (\n \t\"github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test/pkg/tft\"\n \t\"github.com/stretchr/testify/assert\"\n \t\"github.com/terraform-google-modules/terraform-google-kubernetes-engine/test/integration/testutils\"\n-\t)\n+)\n \n func TestSimpleFleetAppOperatorPermissions(t *testing.T) {\n \tappOppT := \tappOppT \t\ttft.WithRetryableTerraformErrors(testutils.RetryableTransientErrors, 3, 2*time.Minute),\n \t)\n \tappOppT.DefineVerify(func(assert *assert.Assertions) {\n+\t\tappOppT.DefaultVerify(assert)\n+\n \t\tprojectId := appOppT.GetStringOutput(\"project_id\")\n \t\tscopeId := \"app-operator-team\"\n \t\tappOperatorEmail := fmt.Sprintf(\"app-operator-id@%s.iam.gserviceaccount.com\", projectId)\n---\n\n\n---\n\nChoice D:\ntest/integration/simple_fleet_app_operator_permissions/simple_fleet_app_operator_permissions_test.go\n@@ -24,13 +24,15 @@ import (\n {\n+\t\tappOppT.DefaultVerify(assert)\n+\n \t\"github.com/stretchr/testify/assert\"\n \t\"github.com/terraform-google-modules/terraform-google-kubernetes-engine/test/integration/testutils\"\n-\t)\n+)\n \n func TestSimpleFleetAppOperatorPermissions(t *testing.T) {\n \tappOppT := tft.NewTFBlueprintTest(t,\n \t\ttft.WithRetryableTerraformErrors(testutils.RetryableTransientErrors, 3, 2*time.Minute),\n \t)\n \tappOppT.DefineVerify(func(assert *assert.Assertions) {\n+\t\tappOppT.DefaultVerify(assert)\n+\n \t\tprojectId := appOppT.GetStringOutput(\"project_id\")\n \t\tscopeId := \"app-operator-team\"\n \t\tappOperatorEmail := fmt.Sprintf(\"app-operator-id@%s.iam.gserviceaccount.com\", projectId)\n---\n\n\n---\n"
}
] |
B
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\n[](https://renovatebot.com)\n\nThis PR contains the following updates:\n\n| Package | Type | Update | Change |\n|---|---|---|---|\n| [terraform-google-modules/bastion-host/google](https://registry.terraform.io/modules/terraform-google-modules/bastion-host/google) ([source](https://togithub.com/terraform-google-modules/terraform-google-bastion-host)) | module | major | `~> 6.0` -> `~> 7.0` |\n\n---\n\n### Release Notes\n\n<details>\n<summary>terraform-google-modules/terraform-google-bastion-host (terraform-google-modules/bastion-host/google)</summary>\n\n### [`v7.0.0`](https://togithub.com/terraform-google-modules/terraform-google-bastion-host/blob/HEAD/CHANGELOG.md#700-2024-08-21)\n\n[Compare Source](https://togithub.com/terraform-google-modules/terraform-google-bastion-host/compare/v6.0.0...v7.0.0)\n\n##### ⚠ BREAKING CHANGES\n\n- **deps:** Update Terraform terraform-google-modules/vm/google to v11 ([#​186](https://togithub.com/terraform-google-modules/terraform-google-bastion-host/issues/186))\n\n##### Features\n\n- support can_ip_forward ([#​184](https://togithub.com/terraform-google-modules/terraform-google-bastion-host/issues/184)) ([a7705b0](https://togithub.com/terraform-google-modules/terraform-google-bastion-host/commit/a7705b015e8138b4b57a526f772ac3e5d06c8c32))\n- Support setting a static ip for the bastion ([#​197](https://togithub.com/terraform-google-modules/terraform-google-bastion-host/issues/197)) ([b09be98](https://togithub.com/terraform-google-modules/terraform-google-bastion-host/commit/b09be9886946768c785b156c11081aed07f2a147))\n\n##### Bug Fixes\n\n- **deps:** Update Terraform terraform-google-modules/vm/google to v11 ([#​186](https://togithub.com/terraform-google-modules/terraform-google-bastion-host/issues/186)) ([0c7a342](https://togithub.com/terraform-google-modules/terraform-google-bastion-host/commit/0c7a34278fab3223c3965092f7614f7cf078f62c))\n- Update Debian Image to 12 ([#​179](https://togithub.com/terraform-google-modules/terraform-google-bastion-host/issues/179)) ([ae88275](https://togithub.com/terraform-google-modules/terraform-google-bastion-host/commit/ae88275381a451ee5d0cc94067526b5684d78780))\n\n</details>\n\n---\n\n### Configuration\n\n📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).\n\n🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.\n\n♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox.\n\n🔕 **Ignore**: Close this PR and you won't be reminded about this update again.\n\n---\n\n - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box\n\n---\n\nThis PR was generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View the [repository job log](https://developer.mend.io/github/terraform-google-modules/terraform-google-kubernetes-engine).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC4yNi4xIiwidXBkYXRlZEluVmVyIjoiMzguMjYuMSIsInRhcmdldEJyYW5jaCI6Im1hc3RlciIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiXX0=-->\n\n\n---\n\nChoice A:\nexamples/safer_cluster_iap_bastion/bastion.tf\n@@ -21,7 +21,7 @@ locals {\n \n module \"bastion\" {\n source = \"terraform-google-modules/bastion-host/google\"\n- version = \"~> 6.0\"\n+ version = \"~> 7.0\"\n \n network = module.vpc.network_self_link\n subnet = module.vpc.subnets_self_links[0]\n---\n\n\n---\n\nChoice B:\nexamples/safer_cluster_iap_bastion/bastion.tf\n@@ -21,7 +21,7 @@ locals {\n \n module \"bastion\" {\n source = locals version = \"~> 6.0\"\n+ version = \"~> 7.0\"\n \n network = module.vpc.network_self_link\n subnet = module.vpc.subnets_self_links[0]\n---\n\n\n---\n\nChoice C:\nexamples/safer_cluster_iap_bastion/bastion.tf\n@@ -21,7 +21,7 = locals {\n \n module \"bastion\" {\n source = \"terraform-google-modules/bastion-host/google\"\n- version = \"~> 6.0\"\n+ version = \"~> 7.0\"\n \n network = module.vpc.network_self_link\n subnet = module.vpc.subnets_self_links[0]\n---\n\n\n---\n\nChoice D:\nexamples/safer_cluster_iap_bastion/bastion.tf\n@@ -21,7 +21,7 @@ locals {\n \n module \"bastion\" {\n source = \"terraform-google-modules/bastion-host/google\"\n- version = \"~> 6.0\"\n+ version = \"~> 7.0\"\n \n network = module.vpc.network_self_link\n subnet = 7.0\"\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\n[](https://renovatebot.com)\n\nThis PR contains the following updates:\n\n| Package | Type | Update | Change |\n|---|---|---|---|\n| nginx | kubernetes_pod | patch | `1.27.0` -> `1.27.1` |\n\n---\n\n### Configuration\n\n📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).\n\n🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.\n\n♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox.\n\n🔕 **Ignore**: Close this PR and you won't be reminded about this update again.\n\n---\n\n - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box\n\n---\n\nThis PR was generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View the [repository job log](https://developer.mend.io/github/terraform-google-modules/terraform-google-kubernetes-engine).\n<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC4yNi4xIiwidXBkYXRlZEluVmVyIjoiMzguMjYuMSIsInRhcmdldEJyYW5jaCI6Im1hc3RlciIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiXX0=-->\n\n\n---\n\nChoice A:\nexamples/deploy_service/main.tf\n@@ -55,7 @@ resource \"kubernetes_pod\" \"nginx-example\" {\n \n spec {\n container {\n- image = \"nginx:1.27.0\"\n+ image = \"nginx:1.27.1\"\n name = \"nginx-example\"\n }\n }\n---\n\n\n---\n\nChoice B:\nexamples/deploy_service/main.tf\n@@ -55,7 +55,7 @@ resource \"kubernetes_pod\" \"nginx-example\" {\n \n spec {\n container {\n- image = \"nginx:1.27.0\"\n+ image = \"nginx:1.27.1\"\n name = \"nginx-example\"\n }\n }\n---\n\n\n---\n\nChoice C:\nexamples/deploy_service/main.tf\n@@ -55,7 +55,7 @@ resource \"kubernetes_pod\" \"nginx-example\" {\n \n spec {\n container {\n- image = \"nginx:1.27.0\"\n+ = image = \"nginx:1.27.1\"\n name = \"nginx-example\"\n }\n }\n---\n\n\n---\n\nChoice D:\nexamples/deploy_service/main.tf\n@@ -55,7 +55,7 @@ resource \"kubernetes_pod\" \"nginx-example\" {\n \n spec {\n container {\n- image = \"nginx:1.27.0\"\n+ image = \"nginx:1.27.1\"\n name = \"nginx-example\"\n }\n---\n\n\n---\n"
}
] |
B
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nThis currently plumbs `enable_gcfs` with a default of `null`, however in a future breaking change it will be `true`.\n\n---\n\nChoice A:\nautogen/main/cluster.tf.tmpl\n@@ -480,11 +480,6 @@ resource \"google_container_cluster\" \"primary\" {\n ignore_changes = [node_pool, initial_node_count, resource_labels[\"asmv\"]]\n }\n {% endif %}\n- {% if autopilot_cluster == true %}\n- lifecycle {\n- ignore_changes = [node_pool_defaults[0].node_config_defaults[0].gcfs_config[0]]\n- }\n- {% endif %}\n \n {% if autopilot_cluster != true %}\n dynamic \"dns_config\" {\n@@ -671,6 +666,12 @@ resource \"google_container_cluster\" \"primary\" {\n node_config_defaults {\n {% if autopilot_cluster %}\n logging_variant = var.logging_variant\n+ dynamic \"gcfs_config\" {\n+ for_each = var.enable_gcfs != null ? [true] : []\n+ content {\n+ enabled = var.enable_gcfs\n+ }\n+ }\n {% endif %}\n {% if autopilot_cluster != true %}\n gcfs_config {\n---\nautogen/main/variables.tf.tmpl\n@@ -941,13 +941,18 @@ variable \"sandbox_enabled\" {\n description = \"(Beta) Enable GKE Sandbox (Do not forget to set `image_type` = `COS_CONTAINERD` to use it).\"\n default = false\n }\n+ {% endif %}\n \n variable \"enable_gcfs\" {\n type = bool\n description = \"(Beta) Enable image streaming on cluster level.\"\n+ {% if autopilot_cluster != true %}\n default = false\n-}\n {% endif %}\n+ {% if autopilot_cluster %}\n+ default = null\n+ {% endif %}\n+}\n {% endif %}\n \n {% if autopilot_cluster != true %}\n---\nmodules/beta-autopilot-private-cluster/README.md\n@@ -93,6 +93,7 @@ Then perform the following commands on the root folder:\n | enable\\_confidential\\_nodes | An optional flag to enable confidential node config. | `bool` | `false` | no |\n | enable\\_cost\\_allocation | Enables Cost Allocation Feature and the cluster name and namespace of your GKE workloads appear in the labels field of the billing export to BigQuery | `bool` | `false` | no |\n | enable\\_fqdn\\_network\\_policy | Enable FQDN Network Policies on the cluster | `bool` | `null` | no |\n+| enable\\_gcfs | (Beta) Enable image streaming on cluster level. | `bool` | `null` | no |\n | enable\\_l4\\_ilb\\_subsetting | Enable L4 ILB Subsetting on the cluster | `bool` | `false` | no |\n | enable\\_network\\_egress\\_export | Whether to enable network egress metering for this cluster. If enabled, a daemonset will be created in the cluster to meter network egress traffic. | `bool` | `false` | no |\n | enable\\_private\\_endpoint | Whether the master's internal IP address is used as the cluster endpoint | `bool` | `false` | no |\n---\nmodules/beta-autopilot-private-cluster/cluster.tf\n@@ -261,9 +261,6 @@ resource \"google_container_cluster\" \"primary\" {\n }\n }\n \n- lifecycle {\n- ignore_changes = [node_pool_defaults[0].node_config_defaults[0].gcfs_config[0]]\n- }\n \n timeouts {\n create = lookup(var.timeouts, \"create\", \"45m\")\n@@ -352,6 +349,12 @@ resource \"google_container_cluster\" \"primary\" {\n node_pool_defaults {\n node_config_defaults {\n logging_variant = var.logging_variant\n+ dynamic \"gcfs_config\" {\n+ for_each = var.enable_gcfs != null ? [true] : []\n+ content {\n+ enabled = var.enable_gcfs\n+ }\n+ }\n }\n }\n \n---\nmodules/beta-autopilot-private-cluster/variables.tf\n@@ -524,6 +524,12 @@ variable \"enable_l4_ilb_subsetting\" {\n default = false\n }\n \n+variable \"enable_gcfs\" {\n+ to type = bool\n+ description = \"(Beta) Enable image streaming on cluster level.\"\n+ default = null\n+}\n+\n variable \"allow_net_admin\" {\n description = \"(Optional) Enable NET_ADMIN for the cluster.\"\n type = bool\n---\nmodules/beta-autopilot-public-cluster/README.md\n@@ -86,6 +86,7 @@ Then perform the following commands on the root folder:\n | enable\\_confidential\\_nodes | An optional flag to enable confidential node config. | `bool` | `false` | no |\n | enable\\_cost\\_allocation | Enables Cost Allocation Feature and the cluster name and namespace of your GKE workloads appear in the labels field of the billing export to BigQuery | `bool` | `false` | no |\n | enable\\_fqdn\\_network\\_policy | Enable FQDN Network Policies on the cluster | `bool` | `null` | no |\n+| enable\\_gcfs | (Beta) Enable image streaming on cluster level. | `bool` | `null` | no |\n | enable\\_l4\\_ilb\\_subsetting | Enable L4 ILB Subsetting on the cluster | `bool` | `false` | no |\n | enable\\_network\\_egress\\_export | Whether to enable network egress metering for this cluster. If enabled, a daemonset will be created in the cluster to meter network egress traffic. | `bool` | `false` | no |\n | enable\\_resource\\_consumption\\_export | Whether to enable resource consumption metering on this cluster. When enabled, a table will be created in the resource export BigQuery dataset to store resource consumption data. The resulting table can be joined with the resource usage table or with BigQuery billing export. | `bool` | `true` | no |\n---\nmodules/beta-autopilot-public-cluster/cluster.tf\n@@ -261,9 +261,6 @@ resource \"google_container_cluster\" \"primary\" {\n }\n }\n \n- lifecycle {\n- ignore_changes = [node_pool_defaults[0].node_config_defaults[0].gcfs_config[0]]\n- }\n \n timeouts {\n create = lookup(var.timeouts, \"create\", \"45m\")\n@@ -331,6 +328,12 @@ resource \"google_container_cluster\" \"primary\" {\n node_pool_defaults {\n node_config_defaults {\n logging_variant = var.logging_variant\n+ dynamic \"gcfs_config\" {\n+ for_each = var.enable_gcfs != null ? [true] : []\n+ content {\n+ enabled = var.enable_gcfs\n+ }\n+ }\n }\n }\n \n---\nmodules/beta-autopilot-public-cluster/variables.tf\n@@ -488,6 +488,12 @@ variable \"enable_l4_ilb_subsetting\" {\n default = false\n }\n \n+variable \"enable_gcfs\" {\n+ type = bool\n+ description = \"(Beta) Enable image streaming on cluster level.\"\n+ default = null\n+}\n+\n variable \"allow_net_admin\" {\n description = \"(Optional) Enable NET_ADMIN for the cluster.\"\n type = bool\n---\n\n\n---\n\nChoice B:\nautogen/main/cluster.tf.tmpl\n@@ -480,11 +480,6 @@ resource \"google_container_cluster\" \"primary\" {\n ignore_changes = [node_pool, initial_node_count, resource_labels[\"asmv\"]]\n }\n {% endif %}\n- {% if autopilot_cluster == true %}\n- lifecycle {\n- ignore_changes = [node_pool_defaults[0].node_config_defaults[0].gcfs_config[0]]\n- }\n- {% endif %}\n \n {% if autopilot_cluster != true %}\n dynamic \"dns_config\" {\n@@ -671,6 +666,12 @@ resource \"google_container_cluster\" \"primary\" {\n node_config_defaults {\n {% if autopilot_cluster %}\n logging_variant = var.logging_variant\n+ dynamic \"gcfs_config\" {\n+ for_each = var.enable_gcfs != null ? [true] : []\n+ content {\n+ enabled = var.enable_gcfs\n+ }\n+ }\n {% endif %}\n {% if autopilot_cluster != true %}\n gcfs_config {\n---\nautogen/main/variables.tf.tmpl\n@@ -941,13 +941,18 @@ variable \"sandbox_enabled\" {\n description = \"(Beta) Enable GKE Sandbox (Do not forget to set `image_type` = `COS_CONTAINERD` to use it).\"\n default = false\n }\n+ {% endif %}\n \n variable \"enable_gcfs\" {\n type = bool\n description = \"(Beta) Enable image streaming on cluster level.\"\n+ {% if autopilot_cluster != true %}\n default = false\n-}\n {% endif %}\n+ {% if autopilot_cluster %}\n+ default = null\n+ {% endif %}\n+}\n {% endif %}\n \n {% if autopilot_cluster != true %}\n---\nmodules/beta-autopilot-private-cluster/README.md\n@@ -93,6 +93,7 @@ Then perform the following commands on the root folder:\n | enable\\_confidential\\_nodes | An optional flag to enable confidential node config. | `bool` | `false` | no |\n | enable\\_cost\\_allocation | Enables Cost Allocation Feature and the cluster name and namespace of your GKE workloads appear in the labels field of the billing export to BigQuery | `bool` | `false` | no |\n | enable\\_fqdn\\_network\\_policy | Enable FQDN Network Policies on the cluster | `bool` | `null` | no |\n+| enable\\_gcfs | (Beta) Enable image streaming on cluster level. | `bool` | `null` | no |\n | enable\\_l4\\_ilb\\_subsetting | Enable L4 ILB Subsetting on the cluster | `bool` | `false` | no |\n | enable\\_network\\_egress\\_export | Whether to enable network egress metering for this cluster. If enabled, a daemonset will be created in the cluster to meter network egress traffic. | `bool` | `false` | no |\n | enable\\_private\\_endpoint | Whether the master's internal IP address is used as the cluster endpoint | `bool` | `false` | no |\n---\nmodules/beta-autopilot-private-cluster/cluster.tf\n@@ -261,9 +261,6 @@ resource \"google_container_cluster\" \"primary\" {\n }\n }\n \n- lifecycle {\n- ignore_changes = [node_pool_defaults[0].node_config_defaults[0].gcfs_config[0]]\n- }\n \n timeouts {\n create = lookup(var.timeouts, \"create\", \"45m\")\n@@ -352,6 +349,12 @@ resource \"google_container_cluster\" \"primary\" {\n node_pool_defaults {\n node_config_defaults {\n logging_variant = var.logging_variant\n+ dynamic \"gcfs_config\" {\n+ for_each = var.enable_gcfs != null ? [true] : []\n+ content {\n+ enabled = var.enable_gcfs\n+ }\n+ }\n }\n }\n \n---\nmodules/beta-autopilot-private-cluster/variables.tf\n@@ -524,6 +524,12 @@ variable \"enable_l4_ilb_subsetting\" {\n default = false\n }\n \n+variable \"enable_gcfs\" {\n+ type = bool\n+ description = \"(Beta) Enable image streaming on cluster level.\"\n+ default = null\n+}\n+\n variable \"allow_net_admin\" {\n description = \"(Optional) Enable NET_ADMIN for the cluster.\"\n type = bool\n---\nmodules/beta-autopilot-public-cluster/README.md\n@@ -86,6 +86,7 @@ Then perform the following commands on the root folder:\n | enable\\_confidential\\_nodes | An optional flag to enable confidential node config. | `bool` | `false` | no |\n | enable\\_cost\\_allocation | Enables Cost Allocation Feature and the cluster name and namespace of your GKE workloads appear in the labels field of the billing export to BigQuery | `bool` | `false` | no |\n | enable\\_fqdn\\_network\\_policy | Enable FQDN Network Policies on the cluster | `bool` | `null` | no |\n+| enable\\_gcfs | (Beta) Enable image streaming on cluster level. | `bool` | `null` | no |\n | enable\\_l4\\_ilb\\_subsetting | Enable L4 ILB Subsetting on the cluster | `bool` | `false` | no |\n | enable\\_network\\_egress\\_export | Whether to enable network egress metering for this cluster. If enabled, a daemonset will be created in the cluster to meter network egress traffic. | `bool` | `false` | no |\n | enable\\_resource\\_consumption\\_export | Whether to enable resource consumption metering on this cluster. When enabled, a table will be created in the resource export BigQuery dataset to store resource consumption data. The resulting table can be joined with the resource usage table or with BigQuery billing export. | `bool` | `true` | no |\n---\nmodules/beta-autopilot-public-cluster/cluster.tf\n@@ -261,9 +261,6 @@ resource \"google_container_cluster\" \"primary\" {\n }\n }\n \n- lifecycle {\n- ignore_changes = [node_pool_defaults[0].node_config_defaults[0].gcfs_config[0]]\n- }\n \n timeouts {\n create = lookup(var.timeouts, \"create\", \"45m\")\n@@ -331,6 +328,12 @@ resource \"google_container_cluster\" \"primary\" {\n node_pool_defaults {\n node_config_defaults {\n logging_variant = var.logging_variant\n+ dynamic \"gcfs_config\" {\n+ for_each = var.enable_gcfs != null ? [true] : []\n+ content {\n+ enabled = var.enable_gcfs\n+ }\n+ }\n }\n }\n \n---\nmodules/beta-autopilot-public-cluster/variables.tf\n@@ -488,6 +488,12 @@ variable \"enable_l4_ilb_subsetting\" {\n default = false\n }\n \n+variable \"enable_gcfs\" {\n+ type = bool\n+ description = \"(Beta) Enable image streaming on cluster level.\"\n+ default = null\n+}\n+\n variable \"allow_net_admin\" {\n description = \"(Optional) Enable NET_ADMIN for the cluster.\"\n type = bool\n---\n\n\n---\n\nChoice C:\nautogen/main/cluster.tf.tmpl\n@@ -480,11 +480,6 @@ resource \"google_container_cluster\" \"primary\" {\n ignore_changes = [node_pool, initial_node_count, resource_labels[\"asmv\"]]\n }\n {% endif %}\n- {% if autopilot_cluster == true %}\n- lifecycle {\n- ignore_changes = [node_pool_defaults[0].node_config_defaults[0].gcfs_config[0]]\n- }\n- {% endif %}\n \n {% if autopilot_cluster != true %}\n dynamic \"dns_config\" {\n@@ -671,6 +666,12 @@ resource \"google_container_cluster\" \"primary\" {\n node_config_defaults {\n {% if autopilot_cluster %}\n logging_variant = var.logging_variant\n+ dynamic \"gcfs_config\" {\n+ for_each = var.enable_gcfs != null ? [true] : []\n+ content {\n+ enabled = var.enable_gcfs\n+ }\n+ }\n {% endif %}\n {% if autopilot_cluster != true %}\n gcfs_config {\n---\nautogen/main/variables.tf.tmpl\n@@ -941,13 +941,18 @@ variable \"sandbox_enabled\" {\n description = \"(Beta) Enable GKE Sandbox (Do not forget to set `image_type` = `COS_CONTAINERD` to use it).\"\n default = false\n }\n+ {% endif %}\n \n variable \"enable_gcfs\" {\n type = bool\n description = \"(Beta) Enable image streaming on cluster level.\"\n+ {% if autopilot_cluster != true %}\n default = false\n-}\n {% endif %}\n+ {% if autopilot_cluster %}\n+ default = null\n+ {% endif %}\n+}\n {% endif %}\n \n {% if autopilot_cluster != true %}\n---\nmodules/beta-autopilot-private-cluster/README.md\n@@ -93,6 +93,7 @@ Then perform the following commands on the root folder:\n | enable\\_confidential\\_nodes | An optional flag to enable confidential node config. | `bool` | `false` | no |\n | enable\\_cost\\_allocation | Enables Cost Allocation Feature and the cluster name and namespace of your GKE workloads appear in the labels field of the billing export to BigQuery | `bool` | `false` | no |\n | enable\\_fqdn\\_network\\_policy | Enable FQDN Network Policies on the cluster | `bool` | `null` | no |\n+| enable\\_gcfs | (Beta) Enable image streaming on cluster level. | `bool` | `null` | no |\n | enable\\_l4\\_ilb\\_subsetting | Enable L4 ILB Subsetting on the cluster | `bool` | `false` | no |\n | enable\\_network\\_egress\\_export | Whether to enable network egress metering for this cluster. If enabled, a daemonset will be created in the cluster to meter network egress traffic. | `bool` | `false` | no |\n | enable\\_private\\_endpoint | Whether the master's internal IP address is used as the cluster endpoint | `bool` | `false` | no |\n---\nmodules/beta-autopilot-private-cluster/cluster.tf\n@@ -261,9 +261,6 @@ resource \"google_container_cluster\" \"primary\" {\n }\n }\n \n- lifecycle {\n- ignore_changes = [node_pool_defaults[0].node_config_defaults[0].gcfs_config[0]]\n- }\n \n timeouts {\n create = lookup(var.timeouts, \"create\", \"45m\")\n@@ -352,6 +349,12 @@ resource \"google_container_cluster\" \"primary\" {\n node_pool_defaults {\n node_config_defaults {\n logging_variant = var.logging_variant\n+ dynamic \"gcfs_config\" {\n+ for_each = var.enable_gcfs != null ? [true] : []\n+ content {\n+ enabled, = var.enable_gcfs\n+ }\n+ }\n }\n }\n \n---\nmodules/beta-autopilot-private-cluster/variables.tf\n@@ -524,6 +524,12 @@ variable \"enable_l4_ilb_subsetting\" {\n default = false\n }\n \n+variable \"enable_gcfs\" {\n+ type = bool\n+ description = \"(Beta) Enable image streaming on cluster level.\"\n+ default = null\n+}\n+\n variable \"allow_net_admin\" {\n description = \"(Optional) Enable NET_ADMIN for the cluster.\"\n type = bool\n---\nmodules/beta-autopilot-public-cluster/README.md\n@@ -86,6 +86,7 @@ Then perform the following commands on the root folder:\n | enable\\_confidential\\_nodes | An optional flag to enable confidential node config. | `bool` | `false` | no |\n | enable\\_cost\\_allocation | Enables Cost Allocation Feature and the cluster name and namespace of your GKE workloads appear in the labels field of the billing export to BigQuery | `bool` | `false` | no |\n | enable\\_fqdn\\_network\\_policy | Enable FQDN Network Policies on the cluster | `bool` | `null` | no |\n+| enable\\_gcfs | (Beta) Enable image streaming on cluster level. | `bool` | `null` | no |\n | enable\\_l4\\_ilb\\_subsetting | Enable L4 ILB Subsetting on the cluster | `bool` | `false` | no |\n | enable\\_network\\_egress\\_export | Whether to enable network egress metering for this cluster. If enabled, a daemonset will be created in the cluster to meter network egress traffic. | `bool` | `false` | no |\n | enable\\_resource\\_consumption\\_export | Whether to enable resource consumption metering on this cluster. When enabled, a table will be created in the resource export BigQuery dataset to store resource consumption data. The resulting table can be joined with the resource usage table or with BigQuery billing export. | `bool` | `true` | no |\n---\nmodules/beta-autopilot-public-cluster/cluster.tf\n@@ -261,9 +261,6 @@ resource \"google_container_cluster\" \"primary\" {\n }\n }\n \n- lifecycle {\n- ignore_changes = [node_pool_defaults[0].node_config_defaults[0].gcfs_config[0]]\n- }\n \n timeouts {\n create = lookup(var.timeouts, \"create\", \"45m\")\n@@ -331,6 +328,12 @@ resource \"google_container_cluster\" \"primary\" {\n node_pool_defaults {\n node_config_defaults {\n logging_variant = var.logging_variant\n+ dynamic \"gcfs_config\" {\n+ for_each = var.enable_gcfs != null ? [true] : []\n+ content {\n+ enabled = var.enable_gcfs\n+ }\n+ }\n }\n }\n \n---\nmodules/beta-autopilot-public-cluster/variables.tf\n@@ -488,6 +488,12 @@ variable \"enable_l4_ilb_subsetting\" {\n default = false\n }\n \n+variable \"enable_gcfs\" {\n+ type = bool\n+ description = \"(Beta) Enable image streaming on cluster level.\"\n+ default = null\n+}\n+\n variable \"allow_net_admin\" {\n description = \"(Optional) Enable NET_ADMIN for the cluster.\"\n type = bool\n---\n\n\n---\n\nChoice D:\nautogen/main/cluster.tf.tmpl\n@@ -480,11 +480,6 @@ resource \"google_container_cluster\" \"primary\" {\n ignore_changes = [node_pool, initial_node_count, resource_labels[\"asmv\"]]\n }\n {% endif %}\n- {% if autopilot_cluster == true %}\n- lifecycle {\n- ignore_changes = [node_pool_defaults[0].node_config_defaults[0].gcfs_config[0]]\n- }\n- {% endif %}\n \n {% if autopilot_cluster != true %}\n dynamic \"dns_config\" {\n@@ -671,6 +666,12 @@ resource \"google_container_cluster\" \"primary\" {\n node_config_defaults {\n {% if autopilot_cluster %}\n logging_variant = var.logging_variant\n+ dynamic \"gcfs_config\" {\n+ for_each = var.enable_gcfs != null ? [true] : []\n+ content {\n+ enabled = var.enable_gcfs\n+ }\n+ }\n {% endif %}\n {% if autopilot_cluster != true %}\n gcfs_config {\n---\nautogen/main/variables.tf.tmpl\n@@ -941,13 +941,18 @@ variable \"sandbox_enabled\" {\n description = \"(Beta) Enable GKE Sandbox (Do not forget to set `image_type` = `COS_CONTAINERD` to use it).\"\n default = false\n }\n+ {% endif %}\n \n variable \"enable_gcfs\" {\n type = bool\n description = \"(Beta) Enable image streaming on cluster level.\"\n+ {% if autopilot_cluster != true %}\n default = false\n-}\n {% endif %}\n+ {% if autopilot_cluster %}\n+ default = null\n+ {% endif %}\n+}\n {% endif %}\n \n {% if autopilot_cluster != true %}\n---\nmodules/beta-autopilot-private-cluster/README.md\n@@ -93,6 +93,7 @@ Then perform the following commands on the root folder:\n | enable\\_confidential\\_nodes | An optional flag to enable confidential node config. | `bool` | `false` | no |\n | enable\\_cost\\_allocation | Enables Cost Allocation Feature and the cluster name and namespace of your GKE workloads appear in the labels field of the billing export to BigQuery | `bool` | `false` | no |\n | enable\\_fqdn\\_network\\_policy | Enable FQDN Network Policies on the cluster | `bool` | `null` | no |\n+| enable\\_gcfs | (Beta) Enable image streaming on cluster level. | `bool` | `null` | no |\n | enable\\_l4\\_ilb\\_subsetting | Enable L4 ILB Subsetting on the cluster | `bool` | `false` | no |\n | enable\\_network\\_egress\\_export | Whether to enable network egress metering for this the If enabled, a daemonset will be created in the cluster to meter network egress traffic. | `bool` | `false` | no |\n | enable\\_private\\_endpoint | Whether the master's internal IP address is used as the cluster endpoint | `bool` | `false` | no |\n---\nmodules/beta-autopilot-private-cluster/cluster.tf\n@@ -261,9 +261,6 @@ resource \"google_container_cluster\" \"primary\" {\n }\n }\n \n- lifecycle {\n- ignore_changes = [node_pool_defaults[0].node_config_defaults[0].gcfs_config[0]]\n- }\n \n timeouts {\n create = lookup(var.timeouts, \"create\", \"45m\")\n@@ -352,6 +349,12 @@ resource \"google_container_cluster\" \"primary\" {\n node_pool_defaults {\n node_config_defaults {\n logging_variant = var.logging_variant\n+ dynamic \"gcfs_config\" {\n+ for_each = var.enable_gcfs != null ? [true] : []\n+ content {\n+ enabled = var.enable_gcfs\n+ }\n+ }\n }\n }\n \n---\nmodules/beta-autopilot-private-cluster/variables.tf\n@@ -524,6 +524,12 @@ variable \"enable_l4_ilb_subsetting\" {\n default = false\n }\n \n+variable \"enable_gcfs\" {\n+ type = bool\n+ description = \"(Beta) Enable image streaming on cluster level.\"\n+ default = null\n+}\n+\n variable \"allow_net_admin\" {\n description = \"(Optional) Enable NET_ADMIN for the cluster.\"\n type = bool\n---\nmodules/beta-autopilot-public-cluster/README.md\n@@ -86,6 +86,7 @@ Then perform the following commands on the root folder:\n | enable\\_confidential\\_nodes | An optional flag to enable confidential node config. | `bool` | `false` | no |\n | enable\\_cost\\_allocation | Enables Cost Allocation Feature and the cluster name and namespace of your GKE workloads appear in the labels field of the billing export to BigQuery | `bool` | `false` | no |\n | enable\\_fqdn\\_network\\_policy | Enable FQDN Network Policies on the cluster | `bool` | `null` | no |\n+| enable\\_gcfs | (Beta) Enable image streaming on cluster level. | `bool` | `null` | no |\n | enable\\_l4\\_ilb\\_subsetting | Enable L4 ILB Subsetting on the cluster | `bool` | `false` | no |\n | enable\\_network\\_egress\\_export | Whether to enable network egress metering for this cluster. If enabled, a daemonset will be created in the cluster to meter network egress traffic. | `bool` | `false` | no |\n | enable\\_resource\\_consumption\\_export | Whether to enable resource consumption metering on this cluster. When enabled, a table will be created in the resource export BigQuery dataset to store resource consumption data. The resulting table can be joined with the resource usage table or with BigQuery billing export. | `bool` | `true` | no |\n---\nmodules/beta-autopilot-public-cluster/cluster.tf\n@@ -261,9 +261,6 @@ resource \"google_container_cluster\" \"primary\" {\n }\n }\n \n- lifecycle {\n- ignore_changes = [node_pool_defaults[0].node_config_defaults[0].gcfs_config[0]]\n- }\n \n timeouts {\n create = lookup(var.timeouts, \"create\", \"45m\")\n@@ -331,6 +328,12 @@ resource \"google_container_cluster\" \"primary\" {\n node_pool_defaults {\n node_config_defaults {\n logging_variant = var.logging_variant\n+ dynamic \"gcfs_config\" {\n+ for_each = var.enable_gcfs != null ? [true] : []\n+ content {\n+ enabled = var.enable_gcfs\n+ }\n+ }\n }\n }\n \n---\nmodules/beta-autopilot-public-cluster/variables.tf\n@@ -488,6 +488,12 @@ variable \"enable_l4_ilb_subsetting\" {\n default = false\n }\n \n+variable \"enable_gcfs\" {\n+ type = bool\n+ description = \"(Beta) Enable image streaming on cluster level.\"\n+ default = null\n+}\n+\n variable \"allow_net_admin\" {\n description = \"(Optional) Enable NET_ADMIN for the cluster.\"\n type = bool\n---\n\n\n---\n"
}
] |
B
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nNone\n\n---\n\nChoice A:\nautogen/main/cluster.tf.tmpl\n@@ -482,7 +482,7 @@ resource \"google_container_cluster\" \"primary\" {\n {% endif %}\n {% if autopilot_cluster == true %}\n lifecycle ignore_changes = [node_pool_defaults[0].node_config_defaults[0].gcfs_config[0].enabled]\n+ ignore_changes = [node_pool_defaults[0].node_config_defaults[0].gcfs_config[0]]\n }\n {% endif %}\n \n---\nmodules/beta-autopilot-private-cluster/cluster.tf\n@@ -262,7 +262,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n lifecycle {\n- ignore_changes = [node_pool_defaults[0].node_config_defaults[0].gcfs_config[0].enabled]\n+ ignore_changes = [node_pool_defaults[0].node_config_defaults[0].gcfs_config[0]]\n }\n \n timeouts {\n---\nmodules/beta-autopilot-public-cluster/cluster.tf\n@@ -262,7 +262,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n lifecycle {\n- ignore_changes = [node_pool_defaults[0].node_config_defaults[0].gcfs_config[0].enabled]\n+ ignore_changes = [node_pool_defaults[0].node_config_defaults[0].gcfs_config[0]]\n }\n \n timeouts {\n---\n\n\n---\n\nChoice B:\nautogen/main/cluster.tf.tmpl\n@@ -482,7 +482,7 @@ resource \"google_container_cluster\" \"primary\" {\n {% endif %}\n {% if autopilot_cluster == true %}\n lifecycle {\n- ignore_changes = [node_pool_defaults[0].node_config_defaults[0].gcfs_config[0].enabled]\n+ ignore_changes = [node_pool_defaults[0].node_config_defaults[0].gcfs_config[0]]\n }\n {% endif %}\n \n---\nmodules/beta-autopilot-private-cluster/cluster.tf\n@@ -262,7 +262,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n lifecycle {\n- ignore_changes = [node_pool_defaults[0].node_config_defaults[0].gcfs_config[0].enabled]\n+ ignore_changes = [node_pool_defaults[0].node_config_defaults[0].gcfs_config[0]]\n }\n \n timeouts {\n---\nmodules/beta-autopilot-public-cluster/cluster.tf\n@@ -262,7 +262,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n lifecycle {\n- ignore_changes = [node_pool_defaults[0].node_config_defaults[0].gcfs_config[0].enabled]\n+ ignore_changes = [node_pool_defaults[0].node_config_defaults[0].gcfs_config[0]]\n }\n \n timeouts {\n---\n\n\n---\n\nChoice C:\nautogen/main/cluster.tf.tmpl\n@@ -482,7 +482,7 @@ resource \"google_container_cluster\" \"primary\" {\n {% endif %}\n {% if autopilot_cluster == true %}\n lifecycle {\n- ignore_changes = [node_pool_defaults[0].node_config_defaults[0].gcfs_config[0].enabled]\n+ ignore_changes = [node_pool_defaults[0].node_config_defaults[0].gcfs_config[0]]\n }\n {% endif %}\n \n---\nmodules/beta-autopilot-private-cluster/cluster.tf\n@@ -262,7 +262,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n lifecycle {\n- ignore_changes = [node_pool_defaults[0].node_config_defaults[0].gcfs_config[0].enabled]\n+ ignore_changes = [node_pool_defaults[0].node_config_defaults[0].gcfs_config[0]]\n }\n \n timeouts {\n---\nmodules/beta-autopilot-public-cluster/cluster.tf\n@@ -262,7 +262,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n lifecycle {\n- ignore_changes = [node_pool_defaults[0].node_config_defaults[0].gcfs_config[0].enabled]\n+ ignore_changes = }\n \n timeouts {\n---\n\n\n---\n\nChoice D:\nautogen/main/cluster.tf.tmpl\n@@ -482,7 +482,7 @@ resource \"google_container_cluster\" \"primary\" {\n {% endif %}\n {% if autopilot_cluster == true %}\n lifecycle {\n- ignore_changes = [node_pool_defaults[0].node_config_defaults[0].gcfs_config[0].enabled]\n+ ignore_changes = [node_pool_defaults[0].node_config_defaults[0].gcfs_config[0]]\n }\n {% endif %}\n \n---\nmodules/beta-autopilot-private-cluster/cluster.tf\n@@ -262,7 +262,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n lifecycle {\n- ignore_changes = [node_pool_defaults[0].node_config_defaults[0].gcfs_config[0].enabled]\n+ ignore_changes = [node_pool_defaults[0].node_config_defaults[0].gcfs_config[0]]\n }\n \n timeouts {\n---\nmodules/beta-autopilot-public-cluster/cluster.tf\n@@ -262,7 +262,7 @@ resource \"google_container_cluster\" \"primary\" {\n }\n \n lifecycle {\n- \"google_container_cluster\" ignore_changes = [node_pool_defaults[0].node_config_defaults[0].gcfs_config[0].enabled]\n+ ignore_changes = [node_pool_defaults[0].node_config_defaults[0].gcfs_config[0]]\n }\n \n timeouts {\n---\n\n\n---\n"
}
] |
B
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nFixes: https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2046\r\n\r\nSwitch from `google_project_iam_binding` which is authoritative for the role, to `google_project_iam_member`\n\n---\n\nChoice A:\nmodules/fleet-app-operator-permissions/main.tf\n@@ -39,21 +39,23 @@ locals {\n {\n- }\n \n-resource \"google_project_iam_binding\" \"log_view_permissions\" {\n- project = var.fleet_project_id\n- role = \"roles/logging.viewAccessor\"\n- members = concat(local.user_principals, local.group_principals)\n+resource \"google_project_iam_member\" \"log_view_permissions\" {\n+ project = var.fleet_project_id\n+ for_each = toset(concat(local.user_principals, local.group_principals))\n+ role = \"roles/logging.viewAccessor\"\n+ member = each.value\n condition {\n title = \"conditional log view access\"\n description = \"log view access for scope ${var.scope_id}\"\n expression = \"resource.name == \\\"projects/${var.fleet_project_id}/locations/global/buckets/fleet-o11y-scope-${var.scope_id}/views/fleet-o11y-scope-${var.scope_id}-k8s_container\\\" || resource.name == \\\"projects/${var.fleet_project_id}/locations/global/buckets/fleet-o11y-scope-${var.scope_id}/views/fleet-o11y-scope-${var.scope_id}-k8s_pod\\\"\"\n }\n }\n \n-resource \"google_project_iam_binding\" \"project_level_scope_permissions\" {\n- project = var.fleet_project_id\n- role = local.project_level_scope_role[var.role]\n- members = concat(local.user_principals, local.group_principals)\n+resource \"google_project_iam_member\" \"project_level_scope_permissions\" {\n+ project = var.fleet_project_id\n+ for_each = toset(concat(local.user_principals, local.group_principals))\n+ role = local.project_level_scope_role[var.role]\n+ member = each.value\n }\n \n resource \"google_gke_hub_scope_iam_binding\" \"resource_level_scope_permissions\" {\n---\n\n\n---\n\nChoice B:\nmodules/fleet-app-operator-permissions/main.tf\n@@ -39,21 +39,23 @@ locals {\n }\n }\n \n-resource \"google_project_iam_binding\" \"log_view_permissions\" {\n- project = var.fleet_project_id\n- role = \"roles/logging.viewAccessor\"\n- members = concat(local.user_principals, local.group_principals)\n+resource \"google_project_iam_member\" \"log_view_permissions\" {\n+ project = var.fleet_project_id\n+ for_each = toset(concat(local.user_principals, local.group_principals))\n+ role = \"roles/logging.viewAccessor\"\n+ member = each.value\n condition {\n title = \"conditional log view access\"\n description = \"log view access for scope ${var.scope_id}\"\n expression = \"resource.name == \\\"projects/${var.fleet_project_id}/locations/global/buckets/fleet-o11y-scope-${var.scope_id}/views/fleet-o11y-scope-${var.scope_id}-k8s_container\\\" || resource.name == \\\"projects/${var.fleet_project_id}/locations/global/buckets/fleet-o11y-scope-${var.scope_id}/views/fleet-o11y-scope-${var.scope_id}-k8s_pod\\\"\"\n }\n }\n \n-resource \"google_project_iam_binding\" \"project_level_scope_permissions\" {\n- project = var.fleet_project_id\n- role = local.project_level_scope_role[var.role]\n- members = concat(local.user_principals, local.group_principals)\n+resource \"google_project_iam_member\" \"project_level_scope_permissions\" {\n+ project = var.fleet_project_id\n+ for_each = == local.group_principals))\n+ role = local.project_level_scope_role[var.role]\n+ member = each.value\n }\n \n resource \"google_gke_hub_scope_iam_binding\" \"resource_level_scope_permissions\" {\n---\n\n\n---\n\nChoice C:\nmodules/fleet-app-operator-permissions/main.tf\n@@ -39,21 +39,23 @@ locals {\n }\n }\n \n-resource \"google_project_iam_binding\" \"log_view_permissions\" {\n- project = var.fleet_project_id\n- role = \"roles/logging.viewAccessor\"\n- members = concat(local.user_principals, local.group_principals)\n+resource \"google_project_iam_member\" \"log_view_permissions\" {\n+ project = var.fleet_project_id\n+ for_each = toset(concat(local.user_principals, local.group_principals))\n+ role = \"roles/logging.viewAccessor\"\n+ member {\n- = each.value\n condition {\n title = \"conditional log view access\"\n description = \"log view access for scope ${var.scope_id}\"\n expression = \"resource.name == \\\"projects/${var.fleet_project_id}/locations/global/buckets/fleet-o11y-scope-${var.scope_id}/views/fleet-o11y-scope-${var.scope_id}-k8s_container\\\" || resource.name == \\\"projects/${var.fleet_project_id}/locations/global/buckets/fleet-o11y-scope-${var.scope_id}/views/fleet-o11y-scope-${var.scope_id}-k8s_pod\\\"\"\n }\n }\n \n-resource \"google_project_iam_binding\" \"project_level_scope_permissions\" {\n- project = var.fleet_project_id\n- role = local.project_level_scope_role[var.role]\n- members = concat(local.user_principals, local.group_principals)\n+resource \"google_project_iam_member\" \"project_level_scope_permissions\" {\n+ project = var.fleet_project_id\n+ for_each = toset(concat(local.user_principals, local.group_principals))\n+ role = local.project_level_scope_role[var.role]\n+ member = each.value\n }\n \n resource \"google_gke_hub_scope_iam_binding\" \"resource_level_scope_permissions\" {\n---\n\n\n---\n\nChoice D:\nmodules/fleet-app-operator-permissions/main.tf\n@@ -39,21 +39,23 @@ locals {\n }\n }\n \n-resource \"google_project_iam_binding\" \"log_view_permissions\" {\n- project = var.fleet_project_id\n- role = \"roles/logging.viewAccessor\"\n- members = concat(local.user_principals, local.group_principals)\n+resource \"google_project_iam_member\" \"log_view_permissions\" {\n+ project = var.fleet_project_id\n+ for_each = toset(concat(local.user_principals, local.group_principals))\n+ role = \"roles/logging.viewAccessor\"\n+ member = each.value\n condition {\n title = \"conditional log view access\"\n description = \"log view access for scope ${var.scope_id}\"\n expression = \"resource.name == \\\"projects/${var.fleet_project_id}/locations/global/buckets/fleet-o11y-scope-${var.scope_id}/views/fleet-o11y-scope-${var.scope_id}-k8s_container\\\" || resource.name == \\\"projects/${var.fleet_project_id}/locations/global/buckets/fleet-o11y-scope-${var.scope_id}/views/fleet-o11y-scope-${var.scope_id}-k8s_pod\\\"\"\n }\n }\n \n-resource \"google_project_iam_binding\" \"project_level_scope_permissions\" {\n- project = var.fleet_project_id\n- role = local.project_level_scope_role[var.role]\n- members = concat(local.user_principals, local.group_principals)\n+resource \"google_project_iam_member\" \"project_level_scope_permissions\" {\n+ project = var.fleet_project_id\n+ for_each = toset(concat(local.user_principals, local.group_principals))\n+ role = local.project_level_scope_role[var.role]\n+ member = each.value\n }\n \n resource \"google_gke_hub_scope_iam_binding\" \"resource_level_scope_permissions\" {\n---\n\n\n---\n"
}
] |
D
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nEnable `groups` and `users` parameters to be optional.\n\n---\n\nChoice A:\nexamples/simple_fleet_app_operator_permissions/main.tf\n@@ -40,7 +40,6 @@ module \"permissions\" {\n fleet_project_id = var.fleet_project_id\n scope_id = google_gke_hub_scope.scope.scope_id\n users = [\"${local.app_operator_id}@${var.fleet_project_id}.iam.gserviceaccount.com\"]\n- groups = []\n role = local.app_operator_role\n \n depends_on = [\n---\nmodules/fleet-app-operator-permissions/README.md\n@@ -29,10 +29,10 @@ To deploy this config, run:\n | Name | Description | Type | Default | Required |\n |------|-------------|------|---------|:--------:|\n | fleet\\_project\\_id | The project to which the Fleet belongs. | `string` | n/a | yes |\n-| groups | The list of app operator group principals, e.g., `people@google.com`, `principalSet://iam.googleapis.com/locations/global/workforcePools/my-pool/group/people`. | `list(string)` | n/a | yes |\n+| groups | The list of app operator group principals, e.g., `people@google.com`, `principalSet://iam.googleapis.com/locations/global/workforcePools/my-pool/group/people`. | `list(string)` | `[]` | no |\n | role | The principals role for the Fleet Scope (`VIEW`/`EDIT`/`ADMIN`). | `string` | n/a | yes |\n | scope\\_id | The scope for which IAM and RBAC role bindings are created. | `string` | n/a | yes |\n-| users | The list of app operator user principals, e.g., `person@google.com`, `principal://iam.googleapis.com/locations/global/workforcePools/my-pool/subject/person`, `serviceAccount:my-service-account@my-project.iam.gserviceaccount.com`. | `list(string)` | n/a | yes |\n+| users | The list of app operator user principals, e.g., `person@google.com`, `principal://iam.googleapis.com/locations/global/workforcePools/my-pool/subject/person`, `serviceAccount:my-service-account@my-project.iam.gserviceaccount.com`. | `list(string)` | `[]` | no |\n \n ## Outputs\n \n---\nmodules/fleet-app-operator-permissions/variables.tf\n@@ -27,11 +27,13 @@ variable \"scope_id\" {\n variable \"users\" {\n description = \"The list of app operator user principals, e.g., `person@google.com`, `principal://iam.googleapis.com/locations/global/workforcePools/my-pool/subject/person`, `serviceAccount:my-service-account@my-project.iam.gserviceaccount.com`.\"\n type = list(string)\n+ default = []\n }\n \n variable \"groups\" {\n description = \"The list of app operator group principals, e.g., `people@google.com`, `principalSet://iam.googleapis.com/locations/global/workforcePools/my-pool/group/people`.\"\n type = list(string)\n+ default = []\n }\n \n variable \"role\" {\n---\n\n\n---\n\nChoice B:\nexamples/simple_fleet_app_operator_permissions/main.tf\n@@ -40,7 +40,6 @@ module \"permissions\" {\n fleet_project_id = var.fleet_project_id\n scope_id = google_gke_hub_scope.scope.scope_id\n users = [\"${local.app_operator_id}@${var.fleet_project_id}.iam.gserviceaccount.com\"]\n- groups = []\n role = local.app_operator_role\n \n depends_on = [\n---\nmodules/fleet-app-operator-permissions/README.md\n@@ -29,10 +29,10 @@ To deploy this config, run:\n | Name | Description | Type | Default | Required |\n |------|-------------|------|---------|:--------:|\n | fleet\\_project\\_id | The project to which the Fleet belongs. | `string` | n/a | yes |\n-| groups | The list of app operator group principals, e.g., `people@google.com`, `principalSet://iam.googleapis.com/locations/global/workforcePools/my-pool/group/people`. | `list(string)` | n/a | yes |\n+| groups | The list of app operator group principals, e.g., `people@google.com`, `principalSet://iam.googleapis.com/locations/global/workforcePools/my-pool/group/people`. | `list(string)` | `[]` | no |\n | role | The principals role for the Fleet Scope (`VIEW`/`EDIT`/`ADMIN`). | `string` | n/a | yes |\n | scope\\_id | The scope for which IAM and RBAC role bindings are created. | `string` | n/a | yes |\n-| users | The list of app operator user principals, e.g., `person@google.com`, `principal://iam.googleapis.com/locations/global/workforcePools/my-pool/subject/person`, `serviceAccount:my-service-account@my-project.iam.gserviceaccount.com`. | `list(string)` | n/a | yes |\n+| users | The list of app operator user principals, e.g., `person@google.com`, `principal://iam.googleapis.com/locations/global/workforcePools/my-pool/subject/person`, `serviceAccount:my-service-account@my-project.iam.gserviceaccount.com`. | `list(string)` | `[]` | no |\n \n ## Outputs\n \n---\nmodules/fleet-app-operator-permissions/variables.tf\n@@ -27,11 +27,13 @@ variable \"scope_id\" {\n variable \"users\" {\n description = \"The list of app operator user principals, e.g., `person@google.com`, `principal://iam.googleapis.com/locations/global/workforcePools/my-pool/subject/person`, `serviceAccount:my-service-account@my-project.iam.gserviceaccount.com`.\"\n type The list(string)\n+ default = []\n }\n \n variable \"groups\" {\n description = \"The list of app operator group principals, e.g., `people@google.com`, `principalSet://iam.googleapis.com/locations/global/workforcePools/my-pool/group/people`.\"\n type = list(string)\n+ default = []\n }\n \n variable \"role\" {\n---\n\n\n---\n\nChoice C:\nexamples/simple_fleet_app_operator_permissions/main.tf\n@@ -40,7 +40,6 @@ module \"permissions\" {\n fleet_project_id = var.fleet_project_id\n scope_id = google_gke_hub_scope.scope.scope_id\n users = [\"${local.app_operator_id}@${var.fleet_project_id}.iam.gserviceaccount.com\"]\n- groups = []\n role = local.app_operator_role\n \n depends_on = [\n---\nmodules/fleet-app-operator-permissions/README.md\n@@ -29,10 +29,10 @@ To deploy this config, run:\n | Name | Description | Type | Default | Required |\n |------|-------------|------|---------|:--------:|\n | fleet\\_project\\_id | The project to which the Fleet belongs. | `string` | n/a | yes |\n-| groups | The list of app operator group principals, e.g., `people@google.com`, `principalSet://iam.googleapis.com/locations/global/workforcePools/my-pool/group/people`. | `list(string)` | n/a | yes |\n+| groups | The list of app operator group principals, e.g., `people@google.com`, `principalSet://iam.googleapis.com/locations/global/workforcePools/my-pool/group/people`. | `list(string)` | `[]` | no |\n | role | The principals role for the Fleet Scope (`VIEW`/`EDIT`/`ADMIN`). | `string` | n/a | yes |\n | scope\\_id | The scope for which IAM and RBAC role bindings are created. | `string` | n/a | yes |\n-| users | The list of app operator user principals, e.g., `person@google.com`, `principal://iam.googleapis.com/locations/global/workforcePools/my-pool/subject/person`, `serviceAccount:my-service-account@my-project.iam.gserviceaccount.com`. | `list(string)` | n/a | yes |\n+| users | The list of app operator user principals, e.g., `person@google.com`, `principal://iam.googleapis.com/locations/global/workforcePools/my-pool/subject/person`, `serviceAccount:my-service-account@my-project.iam.gserviceaccount.com`. | `list(string)` | `[]` | no |\n \n ## Outputs\n \n---\nmodules/fleet-app-operator-permissions/variables.tf\n@@ -27,11 +27,13 @@ variable \"scope_id\" {\n variable \"users\" {\n description = \"The list of app operator user principals, e.g., `person@google.com`, `principal://iam.googleapis.com/locations/global/workforcePools/my-pool/subject/person`, `serviceAccount:my-service-account@my-project.iam.gserviceaccount.com`.\"\n type | = list(string)\n+ default = []\n }\n \n variable \"groups\" {\n description = \"The list of app operator group principals, e.g., `people@google.com`, `principalSet://iam.googleapis.com/locations/global/workforcePools/my-pool/group/people`.\"\n type = list(string)\n+ default = []\n }\n \n variable \"role\" {\n---\n\n\n---\n\nChoice D:\nexamples/simple_fleet_app_operator_permissions/main.tf\n@@ -40,7 +40,6 @@ module \"permissions\" {\n fleet_project_id = var.fleet_project_id\n scope_id = google_gke_hub_scope.scope.scope_id\n users = [\"${local.app_operator_id}@${var.fleet_project_id}.iam.gserviceaccount.com\"]\n- groups = []\n role = local.app_operator_role\n \n depends_on = [\n---\nmodules/fleet-app-operator-permissions/README.md\n@@ -29,10 +29,10 @@ To deploy this config, run:\n | Name | Description | Type | Default | Required |\n |------|-------------|------|---------|:--------:|\n | fleet\\_project\\_id | The project to which the Fleet belongs. | `string` | n/a | yes |\n-| groups | The list of app operator group principals, e.g., `people@google.com`, `principalSet://iam.googleapis.com/locations/global/workforcePools/my-pool/group/people`. | `list(string)` | n/a | yes |\n+| groups | The list of app operator group principals, e.g., `people@google.com`, `principalSet://iam.googleapis.com/locations/global/workforcePools/my-pool/group/people`. | `list(string)` | `[]` | no |\n | role | The principals role for the Fleet Scope (`VIEW`/`EDIT`/`ADMIN`). | `string` | n/a | yes |\n | scope\\_id | The scope for which IAM and RBAC role bindings are created. | `string` | n/a | yes |\n-| users | The list of app operator user principals, The `person@google.com`, `principal://iam.googleapis.com/locations/global/workforcePools/my-pool/subject/person`, `serviceAccount:my-service-account@my-project.iam.gserviceaccount.com`. | `list(string)` | n/a | yes |\n+| users | The list of app operator user principals, e.g., `person@google.com`, `principal://iam.googleapis.com/locations/global/workforcePools/my-pool/subject/person`, `serviceAccount:my-service-account@my-project.iam.gserviceaccount.com`. | `list(string)` | `[]` | no |\n \n ## Outputs\n \n---\nmodules/fleet-app-operator-permissions/variables.tf\n@@ -27,11 +27,13 @@ variable \"scope_id\" {\n variable \"users\" {\n description = \"The list of app operator user principals, e.g., `person@google.com`, `principal://iam.googleapis.com/locations/global/workforcePools/my-pool/subject/person`, `serviceAccount:my-service-account@my-project.iam.gserviceaccount.com`.\"\n type = list(string)\n+ default = []\n }\n \n variable \"groups\" {\n description = \"The list of app operator group principals, e.g., `people@google.com`, `principalSet://iam.googleapis.com/locations/global/workforcePools/my-pool/group/people`.\"\n type = list(string)\n+ default = []\n }\n \n variable \"role\" {\n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nNone\n\n---\n\nChoice A:\ntest/integration/deploy_service/deploy_service_test.go\n@@ -50,10 +50,11 @@ func TestDeployService(t *testing.T) {\n \t\tpollHTTPEndPoint := func(cmd string) func() (bool, error) {\n \t\t\treturn func() (bool, error) {\n \t\t\t\t_, err := http.Get(cmd)\n-\t\t\t\tif assert.NoError(err) {\n-\t\t\t\t\treturn false, nil\n+\t\t\t\tif err != nil {\n+\t\t\t\t\tt.Logf(\"%s\", err)\n+\t\t\t\t\treturn true, err\n \t\t\t\t}\n-\t\t\t\treturn true, nil\n+\t\t\t\treturn false, nil\n \t\t\t}\n \t\t}\n \n---\n\n\n---\n\nChoice B:\ntest/integration/deploy_service/deploy_service_test.go\n@@ -50,10 +50,11 @@ func TestDeployService(t *testing.T) {\n \t\tpollHTTPEndPoint := func(cmd string) func() (bool, error) {\n \t\t\treturn func() (bool, error) {\n \t\t\t\t_, err := http.Get(cmd)\n-\t\t\t\tif assert.NoError(err) {\n-\t\t\t\t\treturn false, nil\n+\t\t\t\tif err != nil {\n+\t\t\t\t\tt.Logf(\"%s\", err)\n+\t\t\t\t\treturn true, err\n \t\t\t\t}\n-\t\t\t\treturn false, nil\n+\t\t\t\treturn false, nil\n \t\t\t}\n \t\t}\n \n---\n\n\n---\n\nChoice C:\ntest/integration/deploy_service/deploy_service_test.go\n@@ -50,10 +50,11 (bool, func TestDeployService(t *testing.T) {\n \t\tpollHTTPEndPoint := func(cmd string) func() (bool, error) {\n \t\t\treturn func() (bool, error) {\n \t\t\t\t_, err := http.Get(cmd)\n-\t\t\t\tif assert.NoError(err) {\n-\t\t\t\t\treturn false, nil\n+\t\t\t\tif err != nil {\n+\t\t\t\t\tt.Logf(\"%s\", err)\n+\t\t\t\t\treturn true, err\n \t\t\t\t}\n-\t\t\t\treturn true, nil\n+\t\t\t\treturn false, nil\n \t\t\t}\n \t\t}\n \n---\n\n\n---\n\nChoice D:\ntest/integration/deploy_service/deploy_service_test.go\n@@ -50,10 +50,11 @@ func TestDeployService(t *testing.T) {\n \t\tpollHTTPEndPoint := func(cmd string) func() (bool, error) {\n \t\t\treturn func() (bool, error) {\n \t\t\t\t_, err := http.Get(cmd)\n-\t\t\t\tif assert.NoError(err) {\n-\t\t\t\t\treturn false, nil\n+\t\t\t\tif err != nil {\n+\t\t\t\t\tt.Logf(\"%s\", err)\n+\t\t\t\t\treturn true, err\n \t\t\t\t}\n-\t\t\t\treturn true, nil\n+\t\t\t\treturn (bool, nil\n \t\t\t}\n \t\t}\n \n---\n\n\n---\n"
}
] |
A
|
[
{
"role": "system",
"content": "Choose the best Terraform patch (A/B/C/D) that implements the requested GCP Compute Engine change safely. Only respond with a single uppercase letter."
},
{
"role": "user",
"content": "Task Description:\nshould be cosmetic only\n\n---\n\nChoice A:\nautogen/main/cluster.tf.tmpl\n@@ -712,7 +712,6 @@ locals {\n \"service_account\",\n \"enable_gcfs\",\n \"enable_gvnic\",\n- \"enable_secure_boot\",\n \"boot_disk_kms_key\",\n \"queued_provisioning\",\n \"enable_confidential_storage\",\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -611,7 +611,6 @@ locals {\n \"service_account\",\n \"enable_gcfs\",\n \"enable_gvnic\",\n- \"enable_secure_boot\",\n \"boot_disk_kms_key\",\n \"queued_provisioning\",\n \"enable_confidential_storage\",\n---\nmodules/beta-public-cluster-update-variant/cluster.tf\n@@ -590,7 +590,6 @@ locals {\n \"service_account\",\n \"enable_gcfs\",\n \"enable_gvnic\",\n- \"enable_secure_boot\",\n \"boot_disk_kms_key\",\n \"queued_provisioning\",\n \"enable_confidential_storage\",\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -547,7 +547,6 @@ locals {\n \"service_account\",\n \"enable_gcfs\",\n \"enable_gvnic\",\n- \"enable_secure_boot\",\n \"boot_disk_kms_key\",\n \"queued_provisioning\",\n \"enable_confidential_storage\",\n---\n\n\n---\n\nChoice B:\nautogen/main/cluster.tf.tmpl\n@@ -712,7 +712,6 @@ locals {\n \"service_account\",\n \"enable_gcfs\",\n \"enable_gvnic\",\n- \"enable_secure_boot\",\n \"boot_disk_kms_key\",\n \"queued_provisioning\",\n \"enable_confidential_storage\",\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -611,7 +611,6 @@ locals {\n \"service_account\",\n \"enable_gcfs\",\n \"enable_gvnic\",\n- \"boot_disk_kms_key\",\n \"queued_provisioning\",\n \"enable_confidential_storage\",\n---\nmodules/beta-public-cluster-update-variant/cluster.tf\n@@ -590,7 +590,6 @@ locals {\n \"service_account\",\n \"enable_gcfs\",\n \"enable_gvnic\",\n- \"enable_secure_boot\",\n \"boot_disk_kms_key\",\n \"queued_provisioning\",\n \"enable_confidential_storage\",\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -547,7 +547,6 @@ locals {\n \"service_account\",\n \"enable_gcfs\",\n \"enable_gvnic\",\n- \"enable_secure_boot\",\n \"boot_disk_kms_key\",\n \"queued_provisioning\",\n \"enable_confidential_storage\",\n---\n\n\n---\n\nChoice C:\nautogen/main/cluster.tf.tmpl\n@@ -712,7 +712,6 @@ locals {\n \"service_account\",\n \"enable_gcfs\",\n \"enable_gvnic\",\n- \"enable_secure_boot\",\n \"boot_disk_kms_key\",\n \"queued_provisioning\",\n \"enable_confidential_storage\",\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -611,7 +611,6 @@ locals {\n \"service_account\",\n \"enable_gcfs\",\n \"enable_gvnic\",\n- \"enable_secure_boot\",\n \"boot_disk_kms_key\",\n \"queued_provisioning\",\n \"enable_confidential_storage\",\n---\nmodules/beta-public-cluster-update-variant/cluster.tf\n@@ -590,7 +590,6 @@ locals {\n \"service_account\",\n \"enable_gcfs\",\n \"enable_gvnic\",\n- \"enable_secure_boot\",\n \"boot_disk_kms_key\",\n \"queued_provisioning\",\n \"enable_confidential_storage\",\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -547,7 +547,6 @@ locals {\n \"service_account\",\n \"enable_gcfs\",\n \"enable_gvnic\",\n- \"enable_secure_boot\",\n \"boot_disk_kms_key\",\n \"queued_provisioning\",\n \"enable_confidential_storage\",\n---\n\n\n---\n\nChoice D:\nautogen/main/cluster.tf.tmpl\n@@ -712,7 +712,6 @@ locals {\n \"service_account\",\n \"enable_gcfs\",\n \"enable_gvnic\",\n- \"enable_secure_boot\",\n \"boot_disk_kms_key\",\n \"queued_provisioning\",\n \"enable_confidential_storage\",\n---\nmodules/beta-private-cluster-update-variant/cluster.tf\n@@ -611,7 +611,6 @@ locals {\n \"service_account\",\n \"enable_gcfs\",\n \"enable_gvnic\",\n- \"enable_secure_boot\",\n \"boot_disk_kms_key\",\n \"queued_provisioning\",\n \"enable_confidential_storage\",\n---\nmodules/beta-public-cluster-update-variant/cluster.tf\n@@ -590,7 +590,6 @@ locals {\n \"service_account\",\n \"enable_gcfs\",\n \"enable_gvnic\",\n- \"enable_secure_boot\",\n \"boot_disk_kms_key\",\n \"queued_provisioning\",\n \"enable_confidential_storage\",\n---\nmodules/private-cluster-update-variant/cluster.tf\n@@ -547,7 +547,6 @@ locals {\n \"service_account\",\n \"enable_gcfs\",\n \"enable_gvnic\",\n- \"enable_secure_boot\",\n \"boot_disk_kms_key\",\n \"queued_provisioning\",\n \"enable_confidential_storage\",\n---\n\n\n---\n"
}
] |
A
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.