From f10ed1bc777e0f32183b0b05527db9a971348e96 Mon Sep 17 00:00:00 2001 From: Edward Sun Date: Sat, 16 Jul 2022 17:19:32 -0700 Subject: [PATCH] removed forceNew --- .../resource_container_cluster.go.erb | 29 +++++++- .../resource_container_cluster_test.go.erb | 68 +++++++++++++++++-- 2 files changed, 90 insertions(+), 7 deletions(-) diff --git a/mmv1/third_party/terraform/resources/resource_container_cluster.go.erb b/mmv1/third_party/terraform/resources/resource_container_cluster.go.erb index 06ad364839f2..7b281a6f9ee9 100644 --- a/mmv1/third_party/terraform/resources/resource_container_cluster.go.erb +++ b/mmv1/third_party/terraform/resources/resource_container_cluster.go.erb @@ -635,7 +635,6 @@ func resourceContainerCluster() *schema.Resource { Type: schema.TypeList, Optional: true, Computed: true, - ForceNew: true, MaxItems: 1, Description: `Configuration for the Google Groups for GKE feature.`, Elem: &schema.Resource{ @@ -643,7 +642,6 @@ func resourceContainerCluster() *schema.Resource { "security_group": { Type: schema.TypeString, Required: true, - ForceNew: true, Description: `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.`, }, }, @@ -2381,6 +2379,21 @@ func resourceContainerClusterUpdate(d *schema.ResourceData, meta interface{}) er } <% end -%> + if d.HasChange("authenticator_groups_config") { + req := &container.UpdateClusterRequest{ + Update: &container.ClusterUpdate{ + DesiredAuthenticatorGroupsConfig: expandContainerClusterAuthenticatorGroupsConfig(d.Get("authenticator_groups_config")), + }, + } + updateF := updateFunc(req, "updating GKE cluster authenticator groups config") + // Call update serially. + if err := lockedCall(lockKey, updateF); err != nil { + return err + } + + log.Printf("[INFO] GKE cluster %s authenticator groups config has been updated", d.Id()) + } + if d.HasChange("default_snat_status") { req := &container.UpdateClusterRequest{ Update: &container.ClusterUpdate{ @@ -3829,6 +3842,18 @@ func expandContainerClusterTpuConfig(configured interface{}) *container.TpuConfi } <% end -%> +func expandContainerClusterAuthenticatorGroupsConfig(configured interface{}) *container.AuthenticatorGroupsConfig { + l := configured.([]interface{}) + if len(l) == 0 || l[0] == nil { + return nil + } + + config := l[0].(map[string]interface{}) + return &container.AuthenticatorGroupsConfig{ + SecurityGroup: config["security_group"].(string), + } +} + func flattenNotificationConfig(c *container.NotificationConfig) []map[string]interface{} { if c == nil { return nil diff --git a/mmv1/third_party/terraform/tests/resource_container_cluster_test.go.erb b/mmv1/third_party/terraform/tests/resource_container_cluster_test.go.erb index 0f7b57c7d059..3c058bc45772 100644 --- a/mmv1/third_party/terraform/tests/resource_container_cluster_test.go.erb +++ b/mmv1/third_party/terraform/tests/resource_container_cluster_test.go.erb @@ -361,12 +361,28 @@ func TestAccContainerCluster_withAuthenticatorGroupsConfig(t *testing.T) { CheckDestroy: testAccCheckContainerClusterDestroyProducer(t), Steps: []resource.TestStep{ { - Config: testAccContainerCluster_withAuthenticatorGroupsConfig(containerNetName, clusterName, orgDomain), + Config: testAccContainerCluster_withAuthenticatorGroupsConfig(containerNetName, clusterName), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckNoResourceAttr("google_container_cluster.with_authenticator_groups", + "authenticator_groups_config.0.enabled"), + ), }, { - ResourceName: "google_container_cluster.with_authenticator_groups", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_container_cluster.with_authenticator_groups", + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccContainerCluster_withAuthenticatorGroupsConfigUpdate(containerNetName, clusterName, orgDomain), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr("google_container_cluster.with_authenticator_groups", + "authenticator_groups_config.0.security_group", fmt.Sprintf("gke-security-groups@%s", orgDomain)), + ), + }, + { + ResourceName: "google_container_cluster.with_authenticator_groups", + ImportState: true, + ImportStateVerify: true, }, }, }) @@ -3307,7 +3323,48 @@ resource "google_container_cluster" "with_network_policy_enabled" { `, clusterName) } -func testAccContainerCluster_withAuthenticatorGroupsConfig(containerNetName string, clusterName string, orgDomain string) string { +func testAccContainerCluster_withAuthenticatorGroupsConfig(containerNetName string, clusterName string) string { + return fmt.Sprintf(` +resource "google_compute_network" "container_network" { + name = "%s" + auto_create_subnetworks = false +} + +resource "google_compute_subnetwork" "container_subnetwork" { + name = google_compute_network.container_network.name + network = google_compute_network.container_network.name + ip_cidr_range = "10.0.36.0/24" + region = "us-central1" + private_ip_google_access = true + + secondary_ip_range { + range_name = "pod" + ip_cidr_range = "10.0.0.0/19" + } + + secondary_ip_range { + range_name = "svc" + ip_cidr_range = "10.0.32.0/22" + } +} + +resource "google_container_cluster" "with_authenticator_groups" { + name = "%s" + location = "us-central1-a" + initial_node_count = 1 + network = google_compute_network.container_network.name + subnetwork = google_compute_subnetwork.container_subnetwork.name + + networking_mode = "VPC_NATIVE" + ip_allocation_policy { + cluster_secondary_range_name = google_compute_subnetwork.container_subnetwork.secondary_ip_range[0].range_name + services_secondary_range_name = google_compute_subnetwork.container_subnetwork.secondary_ip_range[1].range_name + } +} +`, containerNetName, clusterName) +} + +func testAccContainerCluster_withAuthenticatorGroupsConfigUpdate(containerNetName string, clusterName string, orgDomain string) string { return fmt.Sprintf(` resource "google_compute_network" "container_network" { name = "%s" @@ -3352,6 +3409,7 @@ resource "google_container_cluster" "with_authenticator_groups" { `, containerNetName, clusterName, orgDomain) } + func testAccContainerCluster_withMasterAuthorizedNetworksConfig(clusterName string, cidrs []string, emptyValue string) string { cidrBlocks := emptyValue