Adding traffic_distribution field

.changelog/2625.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+Added the `traffic_distribution` field to the `kubernetes_service_v1` resource
+```

docs/data-sources/service.md

@@ -50,6 +50,7 @@ Read-Only:
 - `external_ips` (Set of String)
 - `external_name` (String)
 - `external_traffic_policy` (String)
+- `traffic_distribution` (String)
 - `health_check_node_port` (Number)
 - `internal_traffic_policy` (String)
 - `ip_families` (List of String)

docs/data-sources/service_v1.md

@@ -50,6 +50,7 @@ Read-Only:
 - `external_ips` (Set of String)
 - `external_name` (String)
 - `external_traffic_policy` (String)
+- `traffic_distribution` (String)
 - `health_check_node_port` (Number)
 - `internal_traffic_policy` (String)
 - `ip_families` (List of String)

docs/resources/service.md

@@ -56,6 +56,7 @@ Optional:
 - `external_ips` (Set of String) A list of IP addresses for which nodes in the cluster will also accept traffic for this service. These IPs are not managed by Kubernetes. The user is responsible for ensuring that traffic arrives at a node with this IP.  A common example is external load-balancers that are not part of the Kubernetes system.
 - `external_name` (String) The external reference that kubedns or equivalent will return as a CNAME record for this service. No proxying will be involved. Must be a valid DNS name and requires `type` to be `ExternalName`.
 - `external_traffic_policy` (String) Denotes if this Service desires to route external traffic to node-local or cluster-wide endpoints. `Local` preserves the client source IP and avoids a second hop for LoadBalancer and Nodeport type services, but risks potentially imbalanced traffic spreading. `Cluster` obscures the client source IP and may cause a second hop to another node, but should have good overall load-spreading. More info: https://kubernetes.io/docs/tutorials/services/source-ip/
+- `traffic_distribution` (String) Specifies the preferred strategy for distributing traffic to Service endpoints. When set to PreferClose, the Kubernetes will prioritize routing traffic to endpoints that are topologically closer
 - `health_check_node_port` (Number) Specifies the Healthcheck NodePort for the service. Only effects when type is set to `LoadBalancer` and external_traffic_policy is set to `Local`.
 - `internal_traffic_policy` (String) Specifies if the cluster internal traffic should be routed to all endpoints or node-local endpoints only. `Cluster` routes internal traffic to a Service to all endpoints. `Local` routes traffic to node-local endpoints only, traffic is dropped if no node-local endpoints are ready. The default value is `Cluster`.
 - `ip_families` (List of String) IPFamilies is a list of IP families (e.g. IPv4, IPv6) assigned to this service. This field is usually assigned automatically based on cluster configuration and the ipFamilyPolicy field. If this field is specified manually, the requested family is available in the cluster, and ipFamilyPolicy allows it, it will be used; otherwise creation of the service will fail. This field is conditionally mutable: it allows for adding or removing a secondary IP family, but it does not allow changing the primary IP family of the Service.

docs/resources/service_v1.md

@@ -56,6 +56,7 @@ Optional:
 - `external_ips` (Set of String) A list of IP addresses for which nodes in the cluster will also accept traffic for this service. These IPs are not managed by Kubernetes. The user is responsible for ensuring that traffic arrives at a node with this IP.  A common example is external load-balancers that are not part of the Kubernetes system.
 - `external_name` (String) The external reference that kubedns or equivalent will return as a CNAME record for this service. No proxying will be involved. Must be a valid DNS name and requires `type` to be `ExternalName`.
 - `external_traffic_policy` (String) Denotes if this Service desires to route external traffic to node-local or cluster-wide endpoints. `Local` preserves the client source IP and avoids a second hop for LoadBalancer and Nodeport type services, but risks potentially imbalanced traffic spreading. `Cluster` obscures the client source IP and may cause a second hop to another node, but should have good overall load-spreading. More info: https://kubernetes.io/docs/tutorials/services/source-ip/
+- `traffic_distribution` (String) Specifies the preferred strategy for distributing traffic to Service endpoints. When set to PreferClose, the Kubernetes will prioritize routing traffic to endpoints that are topologically closer
 - `health_check_node_port` (Number) Specifies the Healthcheck NodePort for the service. Only effects when type is set to `LoadBalancer` and external_traffic_policy is set to `Local`.
 - `internal_traffic_policy` (String) Specifies if the cluster internal traffic should be routed to all endpoints or node-local endpoints only. `Cluster` routes internal traffic to a Service to all endpoints. `Local` routes traffic to node-local endpoints only, traffic is dropped if no node-local endpoints are ready. The default value is `Cluster`.
 - `ip_families` (List of String) IPFamilies is a list of IP families (e.g. IPv4, IPv6) assigned to this service. This field is usually assigned automatically based on cluster configuration and the ipFamilyPolicy field. If this field is specified manually, the requested family is available in the cluster, and ipFamilyPolicy allows it, it will be used; otherwise creation of the service will fail. This field is conditionally mutable: it allows for adding or removing a secondary IP family, but it does not allow changing the primary IP family of the Service.

kubernetes/resource_kubernetes_service_v1.go

@@ -268,6 +268,14 @@ func resourceKubernetesServiceSchemaV1() map[string]*schema.Schema {
 							},
 						},
 					},
+					"traffic_distribution": {
+						Type:        schema.TypeString,
+						Description: "Specifies the preferred strategy for distributing traffic to Service endpoints. When set to PreferClose, the Kubernetes will prioritize routing traffic to endpoints that are topologically closer",
+						Optional:    true,
+						ValidateFunc: validation.StringInSlice([]string{
+							"PreferClose",
+						}, false),
+					},
 					"type": {
 						Type:        schema.TypeString,
 						Description: "Determines how the service is exposed. Defaults to `ClusterIP`. Valid options are `ExternalName`, `ClusterIP`, `NodePort`, and `LoadBalancer`. `ExternalName` maps to the specified `external_name`. More info: https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types",

kubernetes/resource_kubernetes_service_v1_test.go

@@ -819,6 +819,36 @@ func TestAccKubernetesServiceV1_ipFamilies(t *testing.T) {
 	})
 }
 
+func TestAccKubernetesServiceV1_trafficDistribution(t *testing.T) {
+	var conf corev1.Service
+	name := acctest.RandomWithPrefix("tf-acc-test")
+	resourceName := "kubernetes_service_v1.test"
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:          func() { testAccPreCheck(t) },
+		IDRefreshIgnore:   []string{"metadata.0.resource_version"},
+		ProviderFactories: testAccProviderFactories,
+		CheckDestroy:      testAccCheckKubernetesServiceV1Destroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccKubernetesServiceV1Config_trafficDistribution(name, "PreferClose"),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					testAccCheckKubernetesServiceV1Exists(resourceName, &conf),
+					resource.TestCheckResourceAttr(resourceName, "metadata.0.name", name),
+					resource.TestCheckResourceAttr(resourceName, "spec.#", "1"),
+					resource.TestCheckResourceAttr(resourceName, "spec.0.traffic_distribution", "PreferClose"),
+				),
+			},
+			{
+				ResourceName:            resourceName,
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"metadata.0.resource_version", "wait_for_load_balancer"},
+			},
+		},
+	})
+}
+
 func testAccCheckServiceV1Ports(svc *corev1.Service, expected []corev1.ServicePort) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		if len(expected) == 0 && len(svc.Spec.Ports) == 0 {
@@ -1417,3 +1447,26 @@ func testAccKubernetesServiceV1ConfigV1_ipFamilies(prefix string) string {
 }
 `, prefix)
 }
+
+func testAccKubernetesServiceV1Config_trafficDistribution(name, trafficDistribution string) string {
+	return fmt.Sprintf(`
+resource "kubernetes_service_v1" "test" {
+  metadata {
+    name = "%s"
+  }
+
+  spec {
+    traffic_distribution = "%s"
+
+    port {
+      port        = 8080
+      target_port = 80
+    }
+
+    selector = {
+      app = "MyApp"
+    }
+  }
+}
+`, name, trafficDistribution)
+}

kubernetes/structure_service_spec.go

@@ -116,6 +116,9 @@ func flattenServiceSpec(in v1.ServiceSpec) []interface{} {
 	if in.ExternalTrafficPolicy != "" {
 		att["external_traffic_policy"] = string(in.ExternalTrafficPolicy)
 	}
+	if in.TrafficDistribution != nil {
+		att["traffic_distribution"] = *in.TrafficDistribution
+	}
 
 	att["health_check_node_port"] = int(in.HealthCheckNodePort)
 
@@ -281,7 +284,9 @@ func expandServiceSpec(l []interface{}) v1.ServiceSpec {
 	if v, ok := in["health_check_node_port"].(int); ok {
 		obj.HealthCheckNodePort = int32(v)
 	}
-
+	if v, ok := in["traffic_distribution"].(string); ok && v != "" {
+		obj.TrafficDistribution = &v
+	}
 	return obj
 }
 
@@ -427,5 +432,12 @@ func patchServiceSpec(keyPrefix, pathPrefix string, d *schema.ResourceData, kv *
 			Value: int32(d.Get(keyPrefix + "health_check_node_port").(int)),
 		})
 	}
+	if d.HasChange(keyPrefix + "traffic_distribution") {
+		ops = append(ops, &ReplaceOperation{
+			Path:  pathPrefix + "trafficDistribution",
+			Value: d.Get(keyPrefix + "traffic_distribution").(string),
+		})
+	}
+
 	return ops
 }