add routing_agent option to kubernetes cluster (#1344)

* add routing_agent option to kubernetes cluster

* fix wrong terraform notation

* run make terrafmt

Author: m3co-code

digitalocean/kubernetes/datasource_kubernetes_cluster.go

@@ -61,6 +61,21 @@ func DataSourceDigitalOceanKubernetesCluster() *schema.Resource {
 				},
 			},
 
+			routingAgentField: {
+				Type:     schema.TypeList,
+				Computed: true,
+				Optional: true,
+				MaxItems: 1,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"enabled": {
+							Type:     schema.TypeBool,
+							Computed: true,
+						},
+					},
+				},
+			},
+
 			"version": {
 				Type:     schema.TypeString,
 				Computed: true,

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("digitalocean_kubernetes_cluster.foobar", "cluster_autoscaler_configuration.0.scale_down_utilization_threshold", "0.5"),
 					resource.TestCheckResourceAttr("digitalocean_kubernetes_cluster.foobar", "cluster_autoscaler_configuration.0.scale_down_unneeded_time", "1m30s"),
+					resource.TestCheckResourceAttr("data.digitalocean_kubernetes_cluster.foobar", "routing_agent.0.enabled", "true"),
 				),
 			},
 		},
@@ -87,6 +88,10 @@ resource "digitalocean_kubernetes_cluster" "foo" {
     scale_down_utilization_threshold = 0.5
     scale_down_unneeded_time         = "1m30s"
   }
+
+  routing_agent {
+    enabled = true
+  }
 }`, version, rName)
 }
 

digitalocean/kubernetes/kubernetes.go

@@ -263,6 +263,34 @@ func expandAllowedAddresses(addrs []interface{}) []string {
 	return expandedAddrs
 }
 
+func expandRoutingAgentOpts(raw []interface{}) *godo.KubernetesRoutingAgent {
+	if len(raw) == 0 || raw[0] == nil {
+		return &godo.KubernetesRoutingAgent{}
+	}
+
+	rawRoutingAgentObj := raw[0].(map[string]interface{})
+
+	routingAgent := &godo.KubernetesRoutingAgent{
+		Enabled: godo.PtrTo(rawRoutingAgentObj["enabled"].(bool)),
+	}
+
+	return routingAgent
+}
+
+func flattenRoutingAgentOpts(opts *godo.KubernetesRoutingAgent) []map[string]interface{} {
+	result := make([]map[string]interface{}, 0)
+	if opts == nil {
+		return result
+	}
+
+	item := make(map[string]interface{})
+	item["enabled"] = opts.Enabled
+
+	result = append(result, item)
+
+	return result
+}
+
 func flattenMaintPolicyOpts(opts *godo.KubernetesMaintenancePolicy) []map[string]interface{} {
 	result := make([]map[string]interface{}, 0)
 	item := make(map[string]interface{})

digitalocean/kubernetes/resource_kubernetes_cluster.go

@@ -25,6 +25,7 @@ var (
 
 const (
 	controlPlaneFirewallField = "control_plane_firewall"
+	routingAgentField         = "routing_agent"
 )
 
 func ResourceDigitalOceanKubernetesCluster() *schema.Resource {
@@ -240,6 +241,21 @@ func ResourceDigitalOceanKubernetesCluster() *schema.Resource {
 					},
 				},
 			},
+
+			routingAgentField: {
+				Type:     schema.TypeList,
+				Optional: true,
+				Computed: true,
+				MaxItems: 1,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"enabled": {
+							Type:     schema.TypeBool,
+							Required: true,
+						},
+					},
+				},
+			},
 		},
 
 		Timeouts: &schema.ResourceTimeout{
@@ -372,10 +388,15 @@ func resourceDigitalOceanKubernetesClusterCreate(ctx context.Context, d *schema.
 	if controlPlaneFirewall, ok := d.GetOk(controlPlaneFirewallField); ok {
 		opts.ControlPlaneFirewall = expandControlPlaneFirewallOpts(controlPlaneFirewall.([]interface{}))
 	}
+
 	if caConfig, ok := d.GetOk("cluster_autoscaler_configuration"); ok {
 		opts.ClusterAutoscalerConfiguration = expandCAConfigOpts(caConfig.([]interface{}))
 	}
 
+	if routingAgent, ok := d.GetOk(routingAgentField); ok {
+		opts.RoutingAgent = expandRoutingAgentOpts(routingAgent.([]interface{}))
+	}
+
 	cluster, _, err := client.Kubernetes.Create(context.Background(), opts)
 	if err != nil {
 		return diag.Errorf("Error creating Kubernetes cluster: %s", err)
@@ -443,6 +464,10 @@ func digitaloceanKubernetesClusterRead(
 		return diag.Errorf("[DEBUG] Error setting %s - error: %#v", controlPlaneFirewallField, err)
 	}
 
+	if err := d.Set(routingAgentField, flattenRoutingAgentOpts(cluster.RoutingAgent)); err != nil {
+		return diag.Errorf("[DEBUG] Error setting %s - error: %#v", routingAgentField, err)
+	}
+
 	if err := d.Set("maintenance_policy", flattenMaintPolicyOpts(cluster.MaintenancePolicy)); err != nil {
 		return diag.Errorf("[DEBUG] Error setting maintenance_policy - error: %#v", err)
 	}
@@ -505,7 +530,7 @@ func resourceDigitalOceanKubernetesClusterUpdate(ctx context.Context, d *schema.
 	client := meta.(*config.CombinedConfig).GodoClient()
 
 	// Figure out the changes and then call the appropriate API methods
-	if d.HasChanges("name", "tags", "auto_upgrade", "surge_upgrade", "maintenance_policy", "ha", controlPlaneFirewallField, "cluster_autoscaler_configuration") {
+	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),
@@ -514,6 +539,7 @@ func resourceDigitalOceanKubernetesClusterUpdate(ctx context.Context, d *schema.
 			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{})),
 		}
 
 		if maint, ok := d.GetOk("maintenance_policy"); ok {

digitalocean/kubernetes/resource_kubernetes_cluster_test.go

@@ -96,6 +96,7 @@ func TestAccDigitalOceanKubernetesCluster_Basic(t *testing.T) {
 					resource.TestCheckResourceAttr("digitalocean_kubernetes_cluster.foobar", "destroy_all_associated_resources", "false"),
 					resource.TestCheckResourceAttrSet("digitalocean_kubernetes_cluster.foobar", "cluster_autoscaler_configuration.0.scale_down_utilization_threshold"),
 					resource.TestCheckResourceAttrSet("digitalocean_kubernetes_cluster.foobar", "cluster_autoscaler_configuration.0.scale_down_unneeded_time"),
+					resource.TestCheckResourceAttr("digitalocean_kubernetes_cluster.foobar", "routing_agent.0.enabled", "false"),
 				),
 			},
 			// Update: remove default node_pool taints
@@ -893,6 +894,26 @@ func TestAccDigitalOceanKubernetesCluster_VPCNative(t *testing.T) {
 	})
 }
 
+func TestAccDigitalOceanKubernetesCluster_RoutingAgentEnabled(t *testing.T) {
+	rName := acceptance.RandomTestName()
+	var k8s godo.KubernetesCluster
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:          func() { acceptance.TestAccPreCheck(t) },
+		ProviderFactories: acceptance.TestAccProviderFactories,
+		CheckDestroy:      testAccCheckDigitalOceanKubernetesClusterDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccDigitalOceanKubernetesConfigRoutingAgentEnabled(testClusterVersionPrevious, rName),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					testAccCheckDigitalOceanKubernetesClusterExists("digitalocean_kubernetes_cluster.foobar", &k8s),
+					resource.TestCheckResourceAttr("digitalocean_kubernetes_cluster.foobar", "routing_agent.0.enabled", "true"),
+				),
+			},
+		},
+	})
+}
+
 func testAccDigitalOceanKubernetesConfigBasic(testClusterVersion string, rName string) string {
 	return fmt.Sprintf(`%s
 
@@ -1171,6 +1192,25 @@ func testAccCheckDigitalOceanKubernetesClusterDestroy(s *terraform.State) error
 	return nil
 }
 
+func testAccDigitalOceanKubernetesConfigRoutingAgentEnabled(testClusterVersion string, rName string) string {
+	return fmt.Sprintf(`%s
+
+resource "digitalocean_kubernetes_cluster" "foobar" {
+  name    = "%s"
+  region  = "nyc1"
+  version = data.digitalocean_kubernetes_versions.test.latest_version
+  routing_agent {
+    enabled = true
+  }
+  node_pool {
+    name       = "default"
+    size       = "s-1vcpu-2gb"
+    node_count = 1
+  }
+}
+`, testClusterVersion, rName)
+}
+
 func testAccCheckDigitalOceanKubernetesClusterExists(n string, cluster *godo.KubernetesCluster) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		rs, ok := s.RootModule().Resources[n]