container: allow updating gvnic in place for node_pool (#13660) (#22421)

[upstream:5e3b8726fa9f24f0f9d6bd6f36a7cdeef240aa75]

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/13660.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+container: allow updating `gvnic` in place for `google_container_node_pool`
+```

google/services/container/node_config.go

@@ -321,13 +321,11 @@ func schemaNodeConfig() *schema.Schema {
 					Optional:    true,
 					MaxItems:    1,
 					Description: `Enable or disable gvnic in the node pool.`,
-					ForceNew:    true,
 					Elem: &schema.Resource{
 						Schema: map[string]*schema.Schema{
 							"enabled": {
 								Type:        schema.TypeBool,
 								Required:    true,
-								ForceNew:    true,
 								Description: `Whether or not gvnic is enabled`,
 							},
 						},
@@ -2484,6 +2482,39 @@ func nodePoolNodeConfigUpdate(d *schema.ResourceData, config *transport_tpg.Conf
 			log.Printf("[INFO] Updated gcfs_config for node pool %s", name)
 		}
 
+		if d.HasChange(prefix + "node_config.0.gvnic") {
+			gvnicEnabled := bool(d.Get(prefix + "node_config.0.gvnic.0.enabled").(bool))
+			req := &container.UpdateNodePoolRequest{
+				NodePoolId: name,
+				Gvnic: &container.VirtualNIC{
+					Enabled: gvnicEnabled,
+				},
+			}
+			updateF := func() error {
+				clusterNodePoolsUpdateCall := config.NewContainerClient(userAgent).Projects.Locations.Clusters.NodePools.Update(nodePoolInfo.fullyQualifiedName(name), req)
+				if config.UserProjectOverride {
+					clusterNodePoolsUpdateCall.Header().Add("X-Goog-User-Project", nodePoolInfo.project)
+				}
+				op, err := clusterNodePoolsUpdateCall.Do()
+				if err != nil {
+					return err
+				}
+
+				// Wait until it's updated
+				return ContainerOperationWait(config, op,
+					nodePoolInfo.project,
+					nodePoolInfo.location,
+					"updating GKE node pool gvnic", userAgent,
+					timeout)
+			}
+
+			if err := retryWhileIncompatibleOperation(timeout, npLockKey, updateF); err != nil {
+				return err
+			}
+
+			log.Printf("[INFO] Updated gvnic for node pool %s", name)
+		}
+
 		if d.HasChange(prefix + "node_config.0.kubelet_config") {
 			req := &container.UpdateNodePoolRequest{
 				NodePoolId: name,

google/services/container/resource_container_node_pool_test.go

@@ -1749,7 +1749,23 @@ func TestAccContainerNodePool_gvnic(t *testing.T) {
 		CheckDestroy:             testAccCheckContainerNodePoolDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
-				Config: testAccContainerNodePool_gvnic(cluster, np, networkName, subnetworkName),
+				Config: testAccContainerNodePool_gvnic(cluster, np, networkName, subnetworkName, true),
+			},
+			{
+				ResourceName:      "google_container_node_pool.np",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+			{
+				Config: testAccContainerNodePool_gvnic(cluster, np, networkName, subnetworkName, false),
+			},
+			{
+				ResourceName:      "google_container_node_pool.np",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+			{
+				Config: testAccContainerNodePool_gvnic(cluster, np, networkName, subnetworkName, true),
 			},
 			{
 				ResourceName:      "google_container_node_pool.np",
@@ -1760,15 +1776,15 @@ func TestAccContainerNodePool_gvnic(t *testing.T) {
 	})
 }
 
-func testAccContainerNodePool_gvnic(cluster, np, networkName, subnetworkName string) string {
+func testAccContainerNodePool_gvnic(cluster, np, networkName, subnetworkName string, enabled bool) string {
 	return fmt.Sprintf(`
 resource "google_container_cluster" "cluster" {
-  name               = "%s"
-  location           = "us-central1-a"
-  initial_node_count = 1
+  name                = "%s"
+  location            = "us-central1-a"
+  initial_node_count  = 1
   deletion_protection = false
-  network    = "%s"
-  subnetwork    = "%s"
+  network             = "%s"
+  subnetwork          = "%s"
 }
 
 resource "google_container_node_pool" "np" {
@@ -1779,13 +1795,13 @@ resource "google_container_node_pool" "np" {
 
   node_config {
     machine_type = "n1-standard-8"
-    image_type = "COS_CONTAINERD"
+    image_type   = "COS_CONTAINERD"
     gvnic {
-      enabled = true
+      enabled = "%t"
     }
   }
 }
-`, cluster, networkName, subnetworkName, np)
+`, cluster, networkName, subnetworkName, np, enabled)
 }
 
 func TestAccContainerNodePool_fastSocket(t *testing.T) {