feat: Copy slowStartConfig for Gloo upstreams

Signed-off-by: Nick Caballero <[email protected]>
fluxcd · Jul 5, 2023 · 66d5a94 · 66d5a94
1 parent 4c2de0c
commit 66d5a94
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 0 deletions.
diff --git a/pkg/apis/gloo/gloo/v1/types.go b/pkg/apis/gloo/gloo/v1/types.go
@@ -22,6 +22,7 @@ type UpstreamSpec struct {
 	SslConfig                   *UpstreamSslConfig    `json:"sslConfig,omitempty"`
 	CircuitBreakers             *CircuitBreakerConfig `json:"circuitBreakers,omitempty"`
 	ConnectionConfig            *ConnectionConfig     `json:"connectionConfig,omitempty"`
+	LoadBalancerConfig          *LoadBalancerConfig   `json:"loadBalancerConfig,omitempty"`
 	UseHttp2                    bool                  `json:"useHttp2,omitempty"`
 	InitialStreamWindowSize     uint32                `json:"initialStreamWindowSize,omitempty"`
 	InitialConnectionWindowSize uint32                `json:"initialConnectionWindowSize,omitempty"`
@@ -109,11 +110,35 @@ type ConnectionConfig_HttpProtocolOptions struct {
 	HeadersWithUnderscoresAction uint32    `json:"headersWithUnderscoresAction,omitempty"`
 }
 
+type LoadBalancerConfig struct {
+	RoundRobin   *LoadBalancerConfig_RoundRobin   `json:"roundRobin,omitempty"`
+	LeastRequest *LoadBalancerConfig_LeastRequest `json:"leastRequest,omitempty"`
+}
+
+type LoadBalancerConfig_RoundRobin struct {
+	SlowStartConfig *SlowStartConfig `json:"slowStartConfig,omitempty"`
+}
+
+type LoadBalancerConfig_LeastRequest struct {
+	SlowStartConfig *SlowStartConfig `json:"slowStartConfig,omitempty"`
+	ChoiceCount     uint32           `json:"choiceCount,omitempty"`
+}
+
+type SlowStartConfig struct {
+	SlowStartWindow  *Duration    `json:"slowStartWindow,omitempty"`
+	Aggression       *DoubleValue `json:"aggression,omitempty"`
+	MinWeightPercent *DoubleValue `json:"minWeightPercent,omitempty"`
+}
+
 type Duration struct {
 	Seconds int64 `json:"seconds,omitempty"`
 	Nanos   int32 `json:"nanos,omitempty"`
 }
 
+type DoubleValue struct {
+	Value float64 `json:"value,omitempty"`
+}
+
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 // UpstreamList is a list of Upstream resources

diff --git a/pkg/router/gloo.go b/pkg/router/gloo.go
@@ -296,6 +296,7 @@ func (gr *GlooRouter) getGlooUpstreamKubeService(canary *flaggerv1.Canary, svc *
 			SslConfig:                   configSpec.SslConfig,
 			CircuitBreakers:             configSpec.CircuitBreakers,
 			ConnectionConfig:            configSpec.ConnectionConfig,
+			LoadBalancerConfig:          configSpec.LoadBalancerConfig,
 			UseHttp2:                    configSpec.UseHttp2,
 			InitialStreamWindowSize:     configSpec.InitialStreamWindowSize,
 			InitialConnectionWindowSize: configSpec.InitialConnectionWindowSize,

diff --git a/test/gloo/test-canary.sh b/test/gloo/test-canary.sh
@@ -40,6 +40,11 @@ spec:
       port: 80
   connectionConfig:
     maxRequestsPerConnection: 51
+  loadBalancerConfig:
+    roundRobin:
+      slowStartConfig:
+        slowStartWindow: 2m
+        minWeightPercent: 5
 EOF
 
 cat <<EOF | kubectl apply -f -