fix: remove GKE enable logic (#2000)

Author: HarrisonWAffel

aspell_custom.txt

@@ -29,5 +29,6 @@ IPv4
 IPv6
 json
 backport
+GKE
 PDB
 PC

rancher2/config.go

@@ -1002,55 +1002,6 @@ func (c *Config) GetUserIDByName(name string) (string, error) {
 	return user.ID, nil
 }
 
-func (c *Config) activateDriver(id string, interval time.Duration) error {
-	if id == googleConfigDriver {
-		return c.activateKontainerDriver(id, interval)
-	}
-
-	return c.activateNodeDriver(id, interval)
-}
-
-func (c *Config) activateKontainerDriver(id string, interval time.Duration) error {
-	if id == "" {
-		return fmt.Errorf("[ERROR] Node Driver id is nil")
-	}
-
-	client, err := c.ManagementClient()
-	if err != nil {
-		return err
-	}
-
-	ctx, cancel := context.WithTimeout(context.Background(), interval)
-	defer cancel()
-	for updated := false; ; {
-		driver, err := client.KontainerDriver.ByID(id)
-		if err != nil && !IsServerError(err) && !IsUnknownSchemaType(err) && !IsNotFound(err) && !IsForbidden(err) {
-			return fmt.Errorf("[ERROR] Getting Node Driver %s: %v", id, err)
-		}
-		if driver != nil {
-			if driver.State == "active" {
-				return nil
-			}
-
-			if !updated {
-				err = client.KontainerDriver.ActionActivate(driver)
-				if err == nil {
-					updated = true
-					continue
-				}
-				if !IsServerError(err) && !IsUnknownSchemaType(err) {
-					return fmt.Errorf("[ERROR] Activating Node Driver %s: %v", id, err)
-				}
-			}
-		}
-		select {
-		case <-time.After(rancher2RetriesWait * time.Second):
-		case <-ctx.Done():
-			return fmt.Errorf("Timeout activating Node Driver %s: %v", id, err)
-		}
-	}
-}
-
 func (c *Config) activateNodeDriver(id string, interval time.Duration) error {
 	if id == "" {
 		return fmt.Errorf("[ERROR] Node Driver id is nil")

rancher2/resource_rancher2_cloud_credential.go

@@ -50,7 +50,7 @@ func resourceRancher2CloudCredentialCreate(d *schema.ResourceData, meta interfac
 	}
 
 	if nodeDriver, ok := d.Get("driver").(string); ok && nodeDriver != s3ConfigDriver {
-		err = meta.(*Config).activateDriver(nodeDriver, d.Timeout(schema.TimeoutCreate))
+		err = meta.(*Config).activateNodeDriver(nodeDriver, d.Timeout(schema.TimeoutCreate))
 		if err != nil {
 			return err
 		}
@@ -127,14 +127,21 @@ func resourceRancher2CloudCredentialUpdate(d *schema.ResourceData, meta interfac
 		"labels":      toMapString(d.Get("labels").(map[string]interface{})),
 	}
 
-	switch driver := d.Get("driver").(string); driver {
+	driver := d.Get("driver").(string)
+	// migrate google cloud credential to node driver format, not GKE.
+	if driver == oldGoogleConfigKontainerDriver {
+		driver = googleConfigNodeDriver
+		d.Set("driver", driver)
+	}
+
+	switch driver {
 	case amazonec2ConfigDriver:
 		update["amazonec2credentialConfig"] = expandCloudCredentialAmazonec2(d.Get("amazonec2_credential_config").([]interface{}))
 	case azureConfigDriver:
 		update["azurecredentialConfig"] = expandCloudCredentialAzure(d.Get("azure_credential_config").([]interface{}))
 	case digitaloceanConfigDriver:
 		update["digitaloceancredentialConfig"] = expandCloudCredentialDigitalocean(d.Get("digitalocean_credential_config").([]interface{}))
-	case googleConfigDriver:
+	case googleConfigNodeDriver:
 		update["googlecredentialConfig"] = expandCloudCredentialGoogle(d.Get("google_credential_config").([]interface{}))
 	case harvesterConfigDriver:
 		update["harvestercredentialConfig"] = expandCloudCredentialHarvester(d.Get("harvester_credential_config").([]interface{}))

rancher2/schema_cloud_credential_google.go

@@ -7,7 +7,17 @@ import (
 )
 
 const (
-	googleConfigDriver = "googlekubernetesengine"
+	// Before Rancher v2.12 only the GKE Kontainer driver was supported,
+	// and the provider would automatically enable that driver when
+	// a google cloud credential was created. Rancher v2.13 dropped support
+	// for automatically enabling kontainer drivers, so we should migrate existing
+	// google cloud credentials to use the google node driver instead.
+	//
+	// This is done to ensure that terraform state files have a uniform driver value
+	// across all google cloud credentials, both old and new.
+
+	oldGoogleConfigKontainerDriver = "googlekubernetesengine"
+	googleConfigNodeDriver         = "google"
 )
 
 //Types

rancher2/structure_cloud_credential.go

@@ -20,6 +20,12 @@ func flattenCloudCredential(d *schema.ResourceData, in *CloudCredential) error {
 	}
 
 	driver := d.Get("driver").(string)
+	// migrate google cloud credential to node driver format, not GKE.
+	if driver == oldGoogleConfigKontainerDriver {
+		driver = googleConfigNodeDriver
+		d.Set("driver", driver)
+	}
+
 	switch driver {
 	case amazonec2ConfigDriver:
 		v, ok := d.Get("amazonec2_credential_config").([]interface{})
@@ -48,7 +54,7 @@ func flattenCloudCredential(d *schema.ResourceData, in *CloudCredential) error {
 		if err != nil {
 			return err
 		}
-	case googleConfigDriver:
+	case googleConfigNodeDriver:
 		v, ok := d.Get("google_credential_config").([]interface{})
 		if !ok {
 			v = []interface{}{}
@@ -157,7 +163,7 @@ func expandCloudCredential(in *schema.ResourceData) *CloudCredential {
 
 	if v, ok := in.Get("google_credential_config").([]interface{}); ok && len(v) > 0 {
 		obj.GoogleCredentialConfig = expandCloudCredentialGoogle(v)
-		in.Set("driver", googleConfigDriver)
+		in.Set("driver", googleConfigNodeDriver)
 	}
 
 	if v, ok := in.Get("harvester_credential_config").([]interface{}); ok && len(v) > 0 {