From 7f31ad0bf93b9b46e63064e6012f80772bc233fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20Desch=C3=AAnes?= Date: Fri, 24 Apr 2026 09:20:34 -0400 Subject: [PATCH] Override scaleset client timeout to avoid long controller stalls --- controllers/actions.github.com/multiclient/multi_client.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/controllers/actions.github.com/multiclient/multi_client.go b/controllers/actions.github.com/multiclient/multi_client.go index 64483550bc..5759abb371 100644 --- a/controllers/actions.github.com/multiclient/multi_client.go +++ b/controllers/actions.github.com/multiclient/multi_client.go @@ -9,6 +9,7 @@ import ( "net/url" "strconv" "sync" + "time" "github.com/actions/actions-runner-controller/apis/actions.github.com/v1alpha1/appconfig" "github.com/actions/actions-runner-controller/build" @@ -135,7 +136,10 @@ func (o *ClientForOptions) newClient() (*scaleset.Client, error) { Subsystem: "gha-scale-set-controller", } - var options []scaleset.HTTPOption + options := []scaleset.HTTPOption{ + scaleset.WithTimeout(30 * time.Second), + scaleset.WithRetryMax(2), + } if o.RootCAs != nil { options = append(options, scaleset.WithRootCAs(o.RootCAs)) }