From 2a5e374ae66af44238c0bd44777c7b4ad429bc20 Mon Sep 17 00:00:00 2001 From: Gabriel Adrian Samfira Date: Fri, 2 May 2025 12:26:48 +0000 Subject: [PATCH] Remove unused field Signed-off-by: Gabriel Adrian Samfira --- database/sql/util.go | 2 -- params/params.go | 11 ----------- workers/provider/instance_manager.go | 4 ++-- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/database/sql/util.go b/database/sql/util.go index 12513ede..62f22179 100644 --- a/database/sql/util.go +++ b/database/sql/util.go @@ -76,13 +76,11 @@ func (s *sqlDatabase) sqlToParamsInstance(instance Instance) (params.Instance, e if instance.ScaleSetFkID != nil { ret.ScaleSetID = *instance.ScaleSetFkID ret.ProviderName = instance.ScaleSet.ProviderName - ret.RunnerBootstrapTimeout = instance.ScaleSet.RunnerBootstrapTimeout } if instance.PoolID != nil { ret.PoolID = instance.PoolID.String() ret.ProviderName = instance.Pool.ProviderName - ret.RunnerBootstrapTimeout = instance.Pool.RunnerBootstrapTimeout } if ret.ScaleSetID == 0 && ret.PoolID == "" { diff --git a/params/params.go b/params/params.go index 5653e386..2c1ed042 100644 --- a/params/params.go +++ b/params/params.go @@ -243,10 +243,6 @@ type Instance struct { // Job is the current job that is being serviced by this runner. Job *Job `json:"job,omitempty"` - // RunnerBootstrapTimeout is the timeout in minutes after which the runner deployment - // will be considered failed. This value is caried over from the pool or scale set. - RunnerBootstrapTimeout uint `json:"runner_bootstrap_timeout,omitempty"` - // Do not serialize sensitive info. CallbackURL string `json:"-"` MetadataURL string `json:"-"` @@ -264,13 +260,6 @@ func (i Instance) GetID() string { return i.ID } -func (i Instance) RunnerTimeout() uint { - if i.RunnerBootstrapTimeout == 0 { - return appdefaults.DefaultRunnerBootstrapTimeout - } - return i.RunnerBootstrapTimeout -} - // used by swagger client generated code type Instances []Instance diff --git a/workers/provider/instance_manager.go b/workers/provider/instance_manager.go index 506e6ef1..95d29f69 100644 --- a/workers/provider/instance_manager.go +++ b/workers/provider/instance_manager.go @@ -149,9 +149,9 @@ func (i *instanceManager) handleCreateInstanceInProvider(instance params.Instanc if err != nil { return fmt.Errorf("getting entity: %w", err) } - jwtValidity := instance.RunnerTimeout() + token, err := i.helper.InstanceTokenGetter().NewInstanceJWTToken( - instance, entity.String(), entity.EntityType, jwtValidity) + instance, entity.String(), entity.EntityType, i.scaleSet.RunnerBootstrapTimeout) if err != nil { return fmt.Errorf("creating instance token: %w", err) }