From 5e3e91dcceb6c2e28eef959dc97ae4bde55f411d Mon Sep 17 00:00:00 2001 From: Nathan McKinley Date: Fri, 4 Oct 2019 13:28:09 -0700 Subject: [PATCH 1/7] max_pods_per_node is GA now. --- .../resource_container_cluster.go.erb | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/third_party/terraform/resources/resource_container_cluster.go.erb b/third_party/terraform/resources/resource_container_cluster.go.erb index c8f45d09a391..a543ac364680 100644 --- a/third_party/terraform/resources/resource_container_cluster.go.erb +++ b/third_party/terraform/resources/resource_container_cluster.go.erb @@ -711,6 +711,13 @@ func resourceContainerCluster() *schema.Resource { Elem: &schema.Schema{Type: schema.TypeString}, }, + "default_max_pods_per_node": { + Type: schema.TypeInt, + Optional: true, + ForceNew: true, + Computed: true, + }, + <% unless version == 'ga' -%> "vertical_pod_autoscaling": { Type: schema.TypeList, @@ -745,13 +752,6 @@ func resourceContainerCluster() *schema.Resource { Type: schema.TypeString, }, - "default_max_pods_per_node": { - Type: schema.TypeInt, - Optional: true, - ForceNew: true, - Computed: true, - }, - "database_encryption": { Type: schema.TypeList, MaxItems: 1, @@ -961,11 +961,9 @@ func resourceContainerClusterCreate(d *schema.ResourceData, meta interface{}) er ResourceLabels: expandStringMap(d, "resource_labels"), } -<% unless version == 'ga' -%> if v, ok := d.GetOk("default_max_pods_per_node"); ok { cluster.DefaultMaxPodsConstraint = expandDefaultMaxPodsConstraint(v) } -<% end -%> // Only allow setting node_version on create if it's set to the equivalent master version, // since `InitialClusterVersion` only accepts valid master-style versions. @@ -1208,9 +1206,6 @@ func resourceContainerClusterRead(d *schema.ResourceData, meta interface{}) erro if err := d.Set("cluster_autoscaling", flattenClusterAutoscaling(cluster.Autoscaling)); err != nil { return err } - if cluster.DefaultMaxPodsConstraint != nil { - d.Set("default_max_pods_per_node", cluster.DefaultMaxPodsConstraint.MaxPodsPerNode) - } if err := d.Set("authenticator_groups_config", flattenAuthenticatorGroupsConfig(cluster.AuthenticatorGroupsConfig)); err != nil { return err } @@ -1220,6 +1215,9 @@ func resourceContainerClusterRead(d *schema.ResourceData, meta interface{}) erro return err } <% end -%> + if cluster.DefaultMaxPodsConstraint != nil { + d.Set("default_max_pods_per_node", cluster.DefaultMaxPodsConstraint.MaxPodsPerNode) + } if err := d.Set("node_config", flattenNodeConfig(cluster.NodeConfig)); err != nil { return err } From 13179d1218f22ef4f6f49bcaca52a0fe5510e921 Mon Sep 17 00:00:00 2001 From: Nathan McKinley Date: Fri, 4 Oct 2019 13:39:47 -0700 Subject: [PATCH 2/7] one more function to move. --- .../terraform/resources/resource_container_cluster.go.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/terraform/resources/resource_container_cluster.go.erb b/third_party/terraform/resources/resource_container_cluster.go.erb index a543ac364680..6f59edef0cce 100644 --- a/third_party/terraform/resources/resource_container_cluster.go.erb +++ b/third_party/terraform/resources/resource_container_cluster.go.erb @@ -2383,7 +2383,6 @@ func expandPodSecurityPolicyConfig(configured interface{}) *containerBeta.PodSec <% end -%> } -<% unless version == 'ga' -%> func expandDefaultMaxPodsConstraint(v interface{}) *containerBeta.MaxPodsConstraint { if v == nil { return nil @@ -2394,6 +2393,7 @@ func expandDefaultMaxPodsConstraint(v interface{}) *containerBeta.MaxPodsConstra } } +<% unless version == 'ga' -%> func expandResourceUsageExportConfig(configured interface{}) *containerBeta.ResourceUsageExportConfig { l := configured.([]interface{}) if len(l) == 0 || l[0] == nil { From 47b7b5eb4c7f379b4c54d7f7d5cc8bcc2a57eec4 Mon Sep 17 00:00:00 2001 From: Nathan McKinley Date: Fri, 4 Oct 2019 13:59:47 -0700 Subject: [PATCH 3/7] Also remove from node_pool. --- .../resources/resource_container_node_pool.go.erb | 7 ------- 1 file changed, 7 deletions(-) diff --git a/third_party/terraform/resources/resource_container_node_pool.go.erb b/third_party/terraform/resources/resource_container_node_pool.go.erb index 733131f42e83..5f5630ca446f 100644 --- a/third_party/terraform/resources/resource_container_node_pool.go.erb +++ b/third_party/terraform/resources/resource_container_node_pool.go.erb @@ -99,9 +99,6 @@ var schemaNodePool = map[string]*schema.Schema{ }, "max_pods_per_node": &schema.Schema{ -<% if version.nil? || version == 'ga' -%> - Removed: "This field is in beta. Use it in the the google-beta provider instead. See https://terraform.io/docs/providers/google/provider_versions.html for more details.", -<% end -%> Type: schema.TypeInt, Optional: true, ForceNew: true, @@ -516,13 +513,11 @@ func expandNodePool(d *schema.ResourceData, prefix string) (*containerBeta.NodeP } } - <% unless version == 'ga' -%> if v, ok := d.GetOk(prefix + "max_pods_per_node"); ok { np.MaxPodsConstraint = &containerBeta.MaxPodsConstraint{ MaxPodsPerNode: int64(v.(int)), } } - <% end -%> if v, ok := d.GetOk(prefix + "management"); ok { managementConfig := v.([]interface{})[0].(map[string]interface{}) @@ -583,11 +578,9 @@ func flattenNodePool(d *schema.ResourceData, config *Config, np *containerBeta.N } } - <% unless version == 'ga' -%> if np.MaxPodsConstraint != nil { nodePool["max_pods_per_node"] = np.MaxPodsConstraint.MaxPodsPerNode } - <% end -%> nodePool["management"] = []map[string]interface{}{ { From c6b4460530a9603d573b0a65866003db8804a02c Mon Sep 17 00:00:00 2001 From: Nathan McKinley Date: Fri, 4 Oct 2019 14:01:26 -0700 Subject: [PATCH 4/7] also remove from tests. --- .../resource_container_node_pool_test.go.erb | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/third_party/terraform/tests/resource_container_node_pool_test.go.erb b/third_party/terraform/tests/resource_container_node_pool_test.go.erb index 66b05cf1c3f0..25f2b146fece 100644 --- a/third_party/terraform/tests/resource_container_node_pool_test.go.erb +++ b/third_party/terraform/tests/resource_container_node_pool_test.go.erb @@ -28,7 +28,6 @@ func TestAccContainerNodePool_basic(t *testing.T) { ResourceName: "google_container_node_pool.np", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"max_pods_per_node"}, }, }, }) @@ -53,7 +52,6 @@ func TestAccContainerNodePool_nodeLocations(t *testing.T) { ResourceName: "google_container_node_pool.np", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"max_pods_per_node"}, }, }, }) @@ -79,7 +77,6 @@ func TestAccContainerNodePool_maxPodsPerNode(t *testing.T) { ResourceName: "google_container_node_pool.np", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"max_pods_per_node"}, }, }, }) @@ -103,7 +100,7 @@ func TestAccContainerNodePool_namePrefix(t *testing.T) { ResourceName: "google_container_node_pool.np", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"name_prefix", "max_pods_per_node"}, + ImportStateVerifyIgnore: []string{"name_prefix"}, }, }, }) @@ -126,7 +123,6 @@ func TestAccContainerNodePool_noName(t *testing.T) { ResourceName: "google_container_node_pool.np", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"max_pods_per_node"}, }, }, }) @@ -152,7 +148,7 @@ func TestAccContainerNodePool_withNodeConfig(t *testing.T) { ImportStateVerify: true, // autoscaling.# = 0 is equivalent to no autoscaling at all, // but will still cause an import diff - ImportStateVerifyIgnore: []string{"autoscaling.#", "max_pods_per_node"}, + ImportStateVerifyIgnore: []string{"autoscaling.#"}, }, resource.TestStep{ Config: testAccContainerNodePool_withNodeConfigUpdate(cluster, nodePool), @@ -163,7 +159,7 @@ func TestAccContainerNodePool_withNodeConfig(t *testing.T) { ImportStateVerify: true, // autoscaling.# = 0 is equivalent to no autoscaling at all, // but will still cause an import diff - ImportStateVerifyIgnore: []string{"autoscaling.#", "max_pods_per_node"}, + ImportStateVerifyIgnore: []string{"autoscaling.#"}, }, }, }) @@ -190,7 +186,7 @@ func TestAccContainerNodePool_withNodeConfigTaints(t *testing.T) { ImportStateVerify: true, // autoscaling.# = 0 is equivalent to no autoscaling at all, // but will still cause an import diff - ImportStateVerifyIgnore: []string{"autoscaling.#", "max_pods_per_node"}, + ImportStateVerifyIgnore: []string{"autoscaling.#"}, }, // Once taints are in GA, consider merging this test with the _withNodeConfig test. }, @@ -222,7 +218,6 @@ func TestAccContainerNodePool_withWorkloadMetadataConfig(t *testing.T) { ImportStateVerifyIgnore: []string{ "node_config.0.workload_metadata_config.#", "node_config.0.workload_metadata_config.0.node_metadata", - "max_pods_per_node", }, }, }, @@ -782,7 +777,6 @@ resource "google_container_node_pool" "np" { } <% end -%> -<% unless version == 'ga' -%> func testAccContainerNodePool_maxPodsPerNode(cluster, np string) string { return fmt.Sprintf(` resource "google_compute_network" "container_network" { @@ -838,7 +832,6 @@ resource "google_container_node_pool" "np" { initial_node_count = 2 }`, cluster, cluster, np) } -<% end -%> func testAccContainerNodePool_regionalClusters(cluster, np string) string { return fmt.Sprintf(` From cac5874fe4366ebb12f7a268e49d404b25573be1 Mon Sep 17 00:00:00 2001 From: Nathan McKinley Date: Mon, 7 Oct 2019 12:22:55 -0700 Subject: [PATCH 5/7] remove max_pods_per_node exclude from remaining tests. --- .../resource_container_node_pool_test.go.erb | 22 ++----------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/third_party/terraform/tests/resource_container_node_pool_test.go.erb b/third_party/terraform/tests/resource_container_node_pool_test.go.erb index 25f2b146fece..15f13f4ad069 100644 --- a/third_party/terraform/tests/resource_container_node_pool_test.go.erb +++ b/third_party/terraform/tests/resource_container_node_pool_test.go.erb @@ -290,7 +290,6 @@ func TestAccContainerNodePool_withGPU(t *testing.T) { ResourceName: "google_container_node_pool.np_with_gpu", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"max_pods_per_node"}, }, }, }) @@ -327,7 +326,6 @@ func TestAccContainerNodePool_withManagement(t *testing.T) { ResourceName: "google_container_node_pool.np_with_management", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"max_pods_per_node"}, }, resource.TestStep{ Config: testAccContainerNodePool_withManagement(cluster, nodePool, management), @@ -344,7 +342,6 @@ func TestAccContainerNodePool_withManagement(t *testing.T) { ResourceName: "google_container_node_pool.np_with_management", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"max_pods_per_node"}, }, }, }) @@ -365,7 +362,6 @@ func TestAccContainerNodePool_withNodeConfigScopeAlias(t *testing.T) { ResourceName: "google_container_node_pool.np_with_node_config_scope_alias", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"max_pods_per_node"}, }, }, }) @@ -394,7 +390,6 @@ func TestAccContainerNodePool_regionalAutoscaling(t *testing.T) { ResourceName: "google_container_node_pool.np", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"max_pods_per_node"}, }, resource.TestStep{ Config: testAccContainerNodePool_updateAutoscaling(cluster, np), @@ -407,7 +402,6 @@ func TestAccContainerNodePool_regionalAutoscaling(t *testing.T) { ResourceName: "google_container_node_pool.np", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"max_pods_per_node"}, }, resource.TestStep{ Config: testAccContainerNodePool_basic(cluster, np), @@ -422,7 +416,7 @@ func TestAccContainerNodePool_regionalAutoscaling(t *testing.T) { ImportStateVerify: true, // autoscaling.# = 0 is equivalent to no autoscaling at all, // but will still cause an import diff - ImportStateVerifyIgnore: []string{"autoscaling.#", "max_pods_per_node"}, + ImportStateVerifyIgnore: []string{"autoscaling.#"}, }, }, }) @@ -450,7 +444,6 @@ func TestAccContainerNodePool_autoscaling(t *testing.T) { ResourceName: "google_container_node_pool.np", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"max_pods_per_node"}, }, resource.TestStep{ Config: testAccContainerNodePool_updateAutoscaling(cluster, np), @@ -463,7 +456,6 @@ func TestAccContainerNodePool_autoscaling(t *testing.T) { ResourceName: "google_container_node_pool.np", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"max_pods_per_node"}, }, resource.TestStep{ Config: testAccContainerNodePool_basic(cluster, np), @@ -478,7 +470,7 @@ func TestAccContainerNodePool_autoscaling(t *testing.T) { ImportStateVerify: true, // autoscaling.# = 0 is equivalent to no autoscaling at all, // but will still cause an import diff - ImportStateVerifyIgnore: []string{"autoscaling.#", "max_pods_per_node"}, + ImportStateVerifyIgnore: []string{"autoscaling.#"}, }, }, }) @@ -505,7 +497,6 @@ func TestAccContainerNodePool_resize(t *testing.T) { ResourceName: "google_container_node_pool.np", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"max_pods_per_node"}, }, { Config: testAccContainerNodePool_resize(cluster, np), @@ -517,7 +508,6 @@ func TestAccContainerNodePool_resize(t *testing.T) { ResourceName: "google_container_node_pool.np", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"max_pods_per_node"}, }, }, }) @@ -541,7 +531,6 @@ func TestAccContainerNodePool_version(t *testing.T) { ResourceName: "google_container_node_pool.np", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"max_pods_per_node"}, }, { Config: testAccContainerNodePool_updateVersion(cluster, np), @@ -550,7 +539,6 @@ func TestAccContainerNodePool_version(t *testing.T) { ResourceName: "google_container_node_pool.np", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"max_pods_per_node"}, }, { Config: testAccContainerNodePool_version(cluster, np), @@ -559,7 +547,6 @@ func TestAccContainerNodePool_version(t *testing.T) { ResourceName: "google_container_node_pool.np", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"max_pods_per_node"}, }, }, }) @@ -583,7 +570,6 @@ func TestAccContainerNodePool_regionalClusters(t *testing.T) { ResourceName: "google_container_node_pool.np", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"max_pods_per_node"}, }, }, }) @@ -607,7 +593,6 @@ func TestAccContainerNodePool_012_ConfigModeAttr(t *testing.T) { ResourceName: "google_container_node_pool.np", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"max_pods_per_node"}, }, { Config: testAccContainerNodePool_012_ConfigModeAttr2(cluster, np), @@ -616,7 +601,6 @@ func TestAccContainerNodePool_012_ConfigModeAttr(t *testing.T) { ResourceName: "google_container_node_pool.np", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"max_pods_per_node"}, }, }, }) @@ -641,7 +625,6 @@ func TestAccContainerNodePool_EmptyGuestAccelerator(t *testing.T) { ResourceName: "google_container_node_pool.np", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"max_pods_per_node"}, }, { // Test alternative way to specify an empty node pool @@ -651,7 +634,6 @@ func TestAccContainerNodePool_EmptyGuestAccelerator(t *testing.T) { ResourceName: "google_container_node_pool.np", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"max_pods_per_node"}, }, { // Assert that changes in count from 1 result in a diff From 33a472a1274502568f2248f3ada6e390525fa0e2 Mon Sep 17 00:00:00 2001 From: Nathan McKinley Date: Mon, 7 Oct 2019 15:02:01 -0700 Subject: [PATCH 6/7] Add back in relevant test. --- .../terraform/tests/resource_container_node_pool_test.go.erb | 2 -- 1 file changed, 2 deletions(-) diff --git a/third_party/terraform/tests/resource_container_node_pool_test.go.erb b/third_party/terraform/tests/resource_container_node_pool_test.go.erb index 15f13f4ad069..20e000c5d3fe 100644 --- a/third_party/terraform/tests/resource_container_node_pool_test.go.erb +++ b/third_party/terraform/tests/resource_container_node_pool_test.go.erb @@ -58,7 +58,6 @@ func TestAccContainerNodePool_nodeLocations(t *testing.T) { } <% end -%> -<% unless version == 'ga' -%> func TestAccContainerNodePool_maxPodsPerNode(t *testing.T) { t.Parallel() @@ -81,7 +80,6 @@ func TestAccContainerNodePool_maxPodsPerNode(t *testing.T) { }, }) } -<% end -%> func TestAccContainerNodePool_namePrefix(t *testing.T) { t.Parallel() From 606281a5a7a7589611be5fbbdc7a7705ee231017 Mon Sep 17 00:00:00 2001 From: Modular Magician Date: Tue, 8 Oct 2019 00:01:54 +0000 Subject: [PATCH 7/7] Update tracked submodules -> HEAD on Tue Oct 8 00:01:54 UTC 2019 Tracked submodules are build/terraform-beta build/terraform-mapper build/terraform build/ansible build/inspec. --- build/terraform | 2 +- build/terraform-beta | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/terraform b/build/terraform index 96aa72c6cd3a..95e30b9ca4f5 160000 --- a/build/terraform +++ b/build/terraform @@ -1 +1 @@ -Subproject commit 96aa72c6cd3ac197fbd796ed3ce5d6ea7e9c5bbb +Subproject commit 95e30b9ca4f56e44109f378a46be95a918c2ab57 diff --git a/build/terraform-beta b/build/terraform-beta index 03a4b662a5c2..e2ec8bf6745f 160000 --- a/build/terraform-beta +++ b/build/terraform-beta @@ -1 +1 @@ -Subproject commit 03a4b662a5c21caa39733f9852d6f3f8adab1bd5 +Subproject commit e2ec8bf6745f56520f485b8b35a142c044d8f297