allow customizing cluster autoscaler expanders in kubernetes clusters (#1391)

Author: d-honeybadger

digitalocean/kubernetes/datasource_kubernetes_cluster.go

@@ -152,6 +152,13 @@ func DataSourceDigitalOceanKubernetesCluster() *schema.Resource {
 							Type:     schema.TypeString,
 							Optional: true,
 						},
+						"expanders": {
+							Type:     schema.TypeList,
+							Optional: true,
+							Elem: &schema.Schema{
+								Type: schema.TypeString,
+							},
+						},
 					},
 				},
 			},

digitalocean/kubernetes/datasource_kubernetes_cluster_test.go

@@ -53,6 +53,7 @@ data "digitalocean_kubernetes_cluster" "foobar" {
 					resource.TestCheckResourceAttrSet("data.digitalocean_kubernetes_cluster.foobar", "maintenance_policy.0.duration"),
 					resource.TestCheckResourceAttr("data.digitalocean_kubernetes_cluster.foobar", "cluster_autoscaler_configuration.0.scale_down_utilization_threshold", "0.5"),
 					resource.TestCheckResourceAttr("data.digitalocean_kubernetes_cluster.foobar", "cluster_autoscaler_configuration.0.scale_down_unneeded_time", "1m30s"),
+					resource.TestCheckResourceAttr("data.digitalocean_kubernetes_cluster.foobar", "cluster_autoscaler_configuration.0.expanders.0", "priority"),
 					resource.TestCheckResourceAttr("data.digitalocean_kubernetes_cluster.foobar", "routing_agent.0.enabled", "true"),
 				),
 			},
@@ -87,6 +88,7 @@ resource "digitalocean_kubernetes_cluster" "foo" {
   cluster_autoscaler_configuration {
     scale_down_utilization_threshold = 0.5
     scale_down_unneeded_time         = "1m30s"
+    expanders                        = ["priority"]
   }
 
   routing_agent {

digitalocean/kubernetes/kubernetes.go

@@ -452,6 +452,45 @@ func expandCAConfigOpts(config []interface{}) *godo.KubernetesClusterAutoscalerC
 		caConfig.ScaleDownUnneededTime = godo.PtrTo(v.(string))
 	}
 
+	if v, ok := configMap["expanders"]; ok {
+		caConfig.Expanders = []string{}
+		for _, e := range v.([]interface{}) {
+			caConfig.Expanders = append(caConfig.Expanders, e.(string))
+		}
+	}
+
+	return caConfig
+}
+
+func expandCAConfigOptsForUpdate(config []interface{}) *godo.KubernetesClusterAutoscalerConfiguration {
+	caConfig := &godo.KubernetesClusterAutoscalerConfiguration{
+		// in terraform, the updated resource should be the source of truth, so if a field is removed (set to null)
+		// we should remove it from the DO resource rather than skip updating this field
+		ScaleDownUtilizationThreshold: godo.PtrTo(0.0),
+		ScaleDownUnneededTime:         godo.PtrTo(""),
+		Expanders:                     []string{},
+	}
+
+	if len(config) == 0 {
+		return caConfig
+	}
+
+	configMap := config[0].(map[string]interface{})
+
+	if v, ok := configMap["scale_down_utilization_threshold"]; ok {
+		caConfig.ScaleDownUtilizationThreshold = godo.PtrTo(v.(float64))
+	}
+
+	if v, ok := configMap["scale_down_unneeded_time"]; ok {
+		caConfig.ScaleDownUnneededTime = godo.PtrTo(v.(string))
+	}
+
+	if v, ok := configMap["expanders"]; ok {
+		for _, e := range v.([]interface{}) {
+			caConfig.Expanders = append(caConfig.Expanders, e.(string))
+		}
+	}
+
 	return caConfig
 }
 
@@ -464,6 +503,7 @@ func flattenCAConfigOpts(opts *godo.KubernetesClusterAutoscalerConfiguration) []
 	item := make(map[string]interface{})
 	item["scale_down_utilization_threshold"] = opts.ScaleDownUtilizationThreshold
 	item["scale_down_unneeded_time"] = opts.ScaleDownUnneededTime
+	item["expanders"] = opts.Expanders
 	result = append(result, item)
 
 	return result

digitalocean/kubernetes/resource_kubernetes_cluster.go

@@ -177,6 +177,13 @@ func ResourceDigitalOceanKubernetesCluster() *schema.Resource {
 							Type:     schema.TypeString,
 							Optional: true,
 						},
+						"expanders": {
+							Type:     schema.TypeList,
+							Optional: true,
+							Elem: &schema.Schema{
+								Type: schema.TypeString,
+							},
+						},
 					},
 				},
 			},
@@ -533,13 +540,14 @@ func resourceDigitalOceanKubernetesClusterUpdate(ctx context.Context, d *schema.
 	if d.HasChanges("name", "tags", "auto_upgrade", "surge_upgrade", "maintenance_policy", "ha", controlPlaneFirewallField, "cluster_autoscaler_configuration", routingAgentField) {
 
 		opts := &godo.KubernetesClusterUpdateRequest{
-			Name:                 d.Get("name").(string),
-			Tags:                 tag.ExpandTags(d.Get("tags").(*schema.Set).List()),
-			AutoUpgrade:          godo.PtrTo(d.Get("auto_upgrade").(bool)),
-			SurgeUpgrade:         d.Get("surge_upgrade").(bool),
-			HA:                   godo.PtrTo(d.Get("ha").(bool)),
-			ControlPlaneFirewall: expandControlPlaneFirewallOpts(d.Get(controlPlaneFirewallField).([]interface{})),
-			RoutingAgent:         expandRoutingAgentOpts(d.Get(routingAgentField).([]interface{})),
+			Name:                           d.Get("name").(string),
+			Tags:                           tag.ExpandTags(d.Get("tags").(*schema.Set).List()),
+			AutoUpgrade:                    godo.PtrTo(d.Get("auto_upgrade").(bool)),
+			SurgeUpgrade:                   d.Get("surge_upgrade").(bool),
+			HA:                             godo.PtrTo(d.Get("ha").(bool)),
+			ControlPlaneFirewall:           expandControlPlaneFirewallOpts(d.Get(controlPlaneFirewallField).([]interface{})),
+			RoutingAgent:                   expandRoutingAgentOpts(d.Get(routingAgentField).([]interface{})),
+			ClusterAutoscalerConfiguration: expandCAConfigOptsForUpdate(d.Get("cluster_autoscaler_configuration").([]interface{})),
 		}
 
 		if maint, ok := d.GetOk("maintenance_policy"); ok {
@@ -550,10 +558,6 @@ func resourceDigitalOceanKubernetesClusterUpdate(ctx context.Context, d *schema.
 			opts.MaintenancePolicy = maintPolicy
 		}
 
-		if caConfig, ok := d.GetOk("cluster_autoscaler_configuration"); ok {
-			opts.ClusterAutoscalerConfiguration = expandCAConfigOpts(caConfig.([]interface{}))
-		}
-
 		_, resp, err := client.Kubernetes.Update(context.Background(), d.Id(), opts)
 		if err != nil {
 			if resp != nil && resp.StatusCode == 404 {

digitalocean/kubernetes/resource_kubernetes_cluster_test.go

@@ -436,6 +436,14 @@ func TestAccDigitalOceanKubernetesCluster_ClusterAutoscalerConfiguration(t *test
 `
 
 	updatedClusterAutoscalerConfiguration := `
+	cluster_autoscaler_configuration {
+		scale_down_utilization_threshold = 0.8
+		scale_down_unneeded_time = "2m"
+		expanders = ["priority"]
+	}
+`
+
+	updatedClusterAutoscalerConfigurationUnsetExpanders := `
 	cluster_autoscaler_configuration {
 		scale_down_utilization_threshold = 0.8
 		scale_down_unneeded_time = "2m"
@@ -471,6 +479,17 @@ func TestAccDigitalOceanKubernetesCluster_ClusterAutoscalerConfiguration(t *test
 					resource.TestCheckResourceAttr("digitalocean_kubernetes_cluster.foobar", "name", rName),
 					resource.TestCheckResourceAttr("digitalocean_kubernetes_cluster.foobar", "cluster_autoscaler_configuration.0.scale_down_utilization_threshold", "0.8"),
 					resource.TestCheckResourceAttr("digitalocean_kubernetes_cluster.foobar", "cluster_autoscaler_configuration.0.scale_down_unneeded_time", "2m"),
+					resource.TestCheckResourceAttr("digitalocean_kubernetes_cluster.foobar", "cluster_autoscaler_configuration.0.expanders.0", "priority"),
+				),
+			},
+			{
+				Config: testAccDigitalOceanKubernetesConfigClusterAutoscalerConfiguration(testClusterVersionLatest, rName, updatedClusterAutoscalerConfigurationUnsetExpanders),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					testAccCheckDigitalOceanKubernetesClusterExists("digitalocean_kubernetes_cluster.foobar", &k8s),
+					resource.TestCheckResourceAttr("digitalocean_kubernetes_cluster.foobar", "name", rName),
+					resource.TestCheckResourceAttr("digitalocean_kubernetes_cluster.foobar", "cluster_autoscaler_configuration.0.scale_down_utilization_threshold", "0.8"),
+					resource.TestCheckResourceAttr("digitalocean_kubernetes_cluster.foobar", "cluster_autoscaler_configuration.0.scale_down_unneeded_time", "2m"),
+					resource.TestCheckNoResourceAttr("digitalocean_kubernetes_cluster.foobar", "cluster_autoscaler_configuration.0.expanders.0"),
 				),
 			},
 		},