expose custom Kubernetes CA expanders (#841)

d-honeybadger · web-flow · commit 05290b86a521 · 2025-05-27T14:04:43.000-04:00
diff --git a/kubernetes.go b/kubernetes.go
@@ -283,6 +283,7 @@ type KubernetesRoutingAgent struct {
 type KubernetesClusterAutoscalerConfiguration struct {
 	ScaleDownUtilizationThreshold *float64 `json:"scale_down_utilization_threshold"`
 	ScaleDownUnneededTime         *string  `json:"scale_down_unneeded_time"`
+	Expanders                     []string `json:"expanders"`
 }
 
 // KubernetesMaintenancePolicyDay represents the possible days of a maintenance
diff --git a/kubernetes_test.go b/kubernetes_test.go
@@ -598,6 +598,7 @@ func TestKubernetesClusters_Create(t *testing.T) {
 		ClusterAutoscalerConfiguration: &KubernetesClusterAutoscalerConfiguration{
 			ScaleDownUtilizationThreshold: &scaleDownUtilizationThreshold,
 			ScaleDownUnneededTime:         &scaleDownUnneededTime,
+			Expanders:                     []string{"random"},
 		},
 	}
 	createRequest := &KubernetesClusterCreateRequest{
@@ -673,9 +674,10 @@ func TestKubernetesClusters_Create(t *testing.T) {
 			]
 		},
 		"cluster_autoscaler_configuration": {
-      "scale_down_utilization_threshold": 0.5,
-      "scale_down_unneeded_time": "1m30s"
-    }
+			"scale_down_utilization_threshold": 0.5,
+			"scale_down_unneeded_time": "1m30s",
+			"expanders": ["random"]
+		}
 	}
 }`
 
@@ -864,6 +866,7 @@ func TestKubernetesClusters_Update(t *testing.T) {
 		ClusterAutoscalerConfiguration: &KubernetesClusterAutoscalerConfiguration{
 			ScaleDownUtilizationThreshold: &scaleDownUtilizationThreshold,
 			ScaleDownUnneededTime:         &scaleDownUnneededTime,
+			Expanders:                     []string{}, // need to be able to remove all expander customizations by passing an empty slice
 		},
 		RoutingAgent: &KubernetesRoutingAgent{
 			Enabled: PtrTo(true),
@@ -920,7 +923,7 @@ func TestKubernetesClusters_Update(t *testing.T) {
 	}
 }`
 
-	expectedReqJSON := `{"name":"antoine-test-cluster","tags":["cluster-tag-1","cluster-tag-2"],"maintenance_policy":{"start_time":"00:00","duration":"","day":"monday"},"surge_upgrade":true,"control_plane_firewall":{"enabled":true,"allowed_addresses":["1.2.3.4/32"]},"cluster_autoscaler_configuration":{"scale_down_utilization_threshold":0.2,"scale_down_unneeded_time":"1m27s"},"routing_agent":{"enabled":true}}
+	expectedReqJSON := `{"name":"antoine-test-cluster","tags":["cluster-tag-1","cluster-tag-2"],"maintenance_policy":{"start_time":"00:00","duration":"","day":"monday"},"surge_upgrade":true,"control_plane_firewall":{"enabled":true,"allowed_addresses":["1.2.3.4/32"]},"cluster_autoscaler_configuration":{"scale_down_utilization_threshold":0.2,"scale_down_unneeded_time":"1m27s","expanders":[]},"routing_agent":{"enabled":true}}
 `
 
 	mux.HandleFunc("/v2/kubernetes/clusters/8d91899c-0739-4a1a-acc5-deadbeefbb8f", func(w http.ResponseWriter, r *http.Request) {

Original file line number	Diff line number	Diff line change
`@@ -283,6 +283,7 @@ type KubernetesRoutingAgent struct {`
`283`	`283`	`type KubernetesClusterAutoscalerConfiguration struct {`
`284`	`284`	ScaleDownUtilizationThreshold *float64 `json:"scale_down_utilization_threshold"`
`285`	`285`	ScaleDownUnneededTime *string `json:"scale_down_unneeded_time"`
	`286`	+ Expanders []string `json:"expanders"`
`286`	`287`	`}`
`287`	`288`
`288`	`289`	`// KubernetesMaintenancePolicyDay represents the possible days of a maintenance`