diff --git a/.changelog/6282.txt b/.changelog/6282.txt new file mode 100644 index 0000000000..3f83fe56ad --- /dev/null +++ b/.changelog/6282.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +container: added update support for `authenticator_groups_config` in `google_container_cluster` +``` diff --git a/google-beta/resource_container_cluster.go b/google-beta/resource_container_cluster.go index f4b8120d69..98f6f57976 100755 --- a/google-beta/resource_container_cluster.go +++ b/google-beta/resource_container_cluster.go @@ -620,7 +620,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{ @@ -628,7 +627,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.`, }, }, @@ -2351,6 +2349,21 @@ func resourceContainerClusterUpdate(d *schema.ResourceData, meta interface{}) er log.Printf("[INFO] GKE cluster %s L4 ILB Subsetting has been updated to %v", d.Id(), enabled) } + 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{ @@ -3817,6 +3830,18 @@ func expandContainerClusterTpuConfig(configured interface{}) *container.TpuConfi } } +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/google-beta/resource_container_cluster_test.go b/google-beta/resource_container_cluster_test.go index 8eb1b653a7..40780dde0a 100755 --- a/google-beta/resource_container_cluster_test.go +++ b/google-beta/resource_container_cluster_test.go @@ -350,7 +350,6 @@ func TestAccContainerCluster_withMasterAuthConfig_NoCert(t *testing.T) { func TestAccContainerCluster_withAuthenticatorGroupsConfig(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", randString(t, 10)) - containerNetName := fmt.Sprintf("tf-test-container-net-%s", randString(t, 10)) orgDomain := getTestOrgDomainFromEnv(t) vcrTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -358,10 +357,38 @@ func TestAccContainerCluster_withAuthenticatorGroupsConfig(t *testing.T) { CheckDestroy: testAccCheckContainerClusterDestroyProducer(t), Steps: []resource.TestStep{ { - Config: testAccContainerCluster_withAuthenticatorGroupsConfig(containerNetName, clusterName, orgDomain), + Config: testAccContainerCluster_basic(clusterName), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckNoResourceAttr("google_container_cluster.primary", + "authenticator_groups_config.0.enabled"), + ), }, { - ResourceName: "google_container_cluster.with_authenticator_groups", + ResourceName: "google_container_cluster.primary", + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccContainerCluster_withAuthenticatorGroupsConfigUpdate(clusterName, orgDomain), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr("google_container_cluster.primary", + "authenticator_groups_config.0.security_group", fmt.Sprintf("gke-security-groups@%s", orgDomain)), + ), + }, + { + ResourceName: "google_container_cluster.primary", + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccContainerCluster_withAuthenticatorGroupsConfigUpdate2(clusterName), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckNoResourceAttr("google_container_cluster.primary", + "authenticator_groups_config.0.enabled"), + ), + }, + { + ResourceName: "google_container_cluster.primary", ImportState: true, ImportStateVerify: true, }, @@ -3341,49 +3368,32 @@ resource "google_container_cluster" "with_network_policy_enabled" { `, clusterName) } -func testAccContainerCluster_withAuthenticatorGroupsConfig(containerNetName string, clusterName string, orgDomain string) string { +func testAccContainerCluster_withAuthenticatorGroupsConfigUpdate(name string, orgDomain 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" - } +resource "google_container_cluster" "primary" { + name = "%s" + location = "us-central1-a" + initial_node_count = 1 - secondary_ip_range { - range_name = "svc" - ip_cidr_range = "10.0.32.0/22" - } + authenticator_groups_config { + security_group = "gke-security-groups@%s" + } +} +`, name, orgDomain) } -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 - - authenticator_groups_config { - security_group = "gke-security-groups@%s" - } +func testAccContainerCluster_withAuthenticatorGroupsConfigUpdate2(name string) string { + return fmt.Sprintf(` +resource "google_container_cluster" "primary" { + name = "%s" + location = "us-central1-a" + initial_node_count = 1 - 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 - } + authenticator_groups_config { + security_group = "" + } } -`, containerNetName, clusterName, orgDomain) +`, name) } func testAccContainerCluster_withMasterAuthorizedNetworksConfig(clusterName string, cidrs []string, emptyValue string) string {