DevFW-CICD/garm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Ensure scale set exists

Browse source 
Github will remove inactive scale sets after 7 days. This change
ensures the scale set exists in github before spinning up the listener.

Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>
This commit is contained in:
Gabriel Adrian Samfira 2025-08-23 00:02:11 +00:00
parent c48bb50f2a
commit 39003f006a
14 changed files with 333 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

38
util/github/client.go
View file

@ -28,6 +28,7 @@ import (
"github.com/google/go-github/v72/github"
runnerErrors "github.com/cloudbase/garm-provider-common/errors"
"github.com/cloudbase/garm/cache"
"github.com/cloudbase/garm/metrics"
"github.com/cloudbase/garm/params"
"github.com/cloudbase/garm/runner/common"
@ -419,22 +420,35 @@ func (g *githubClient) getEnterpriseRunnerGroupIDByName(ctx context.Context, ent
return 0, runnerErrors.NewNotFoundError("runner group not found")
}
func (g *githubClient) GetEntityJITConfig(ctx context.Context, instance string, pool params.Pool, labels []string) (jitConfigMap map[string]string, runner *github.Runner, err error) {
// If no runner group is set, use the default runner group ID. This is also the default for
// repository level runners.
func (g *githubClient) GetEntityRunnerGroupIDByName(ctx context.Context, runnerGroupName string) (int64, error) {
var rgID int64 = 1
var ok bool
var err error
// attempt to get the runner group ID from cache. Cache will invalidate after 1 hour.
if runnerGroupName != "" && !strings.EqualFold(runnerGroupName, "default") {
rgID, ok = cache.GetEntityRunnerGroup(g.entity.ID, runnerGroupName)
if !ok {
switch g.entity.EntityType {
case params.ForgeEntityTypeOrganization:
rgID, err = g.getOrganizationRunnerGroupIDByName(ctx, g.entity, runnerGroupName)
case params.ForgeEntityTypeEnterprise:
rgID, err = g.getEnterpriseRunnerGroupIDByName(ctx, g.entity, runnerGroupName)
}
if pool.GitHubRunnerGroup != "" {
switch g.entity.EntityType {
case params.ForgeEntityTypeOrganization:
rgID, err = g.getOrganizationRunnerGroupIDByName(ctx, g.entity, pool.GitHubRunnerGroup)
case params.ForgeEntityTypeEnterprise:
rgID, err = g.getEnterpriseRunnerGroupIDByName(ctx, g.entity, pool.GitHubRunnerGroup)
if err != nil {
return 0, fmt.Errorf("getting runner group ID: %w", err)
}
}
// set cache. Avoid getting the same runner group for more than once an hour.
cache.SetEntityRunnerGroup(g.entity.ID, runnerGroupName, rgID)
}
return rgID, nil
}
if err != nil {
return nil, nil, fmt.Errorf("getting runner group ID: %w", err)
}
func (g *githubClient) GetEntityJITConfig(ctx context.Context, instance string, pool params.Pool, labels []string) (jitConfigMap map[string]string, runner *github.Runner, err error) {
rgID, err := g.GetEntityRunnerGroupIDByName(ctx, pool.GitHubRunnerGroup)
if err != nil {
return nil, nil, fmt.Errorf("failed to get runner group: %w", err)
}
req := github.GenerateJITConfigRequest{

9
util/github/scalesets/client.go
View file

@ -57,6 +57,15 @@ func (s *ScaleSetClient) SetGithubClient(cli common.GithubClient) {
s.ghCli = cli
}
func (s *ScaleSetClient) GetGithubClient() (common.GithubClient, error) {
s.mux.Lock()
defer s.mux.Unlock()
if s.ghCli == nil {
return nil, fmt.Errorf("github client is not set in scaleset client")
}
return s.ghCli, nil
}
func (s *ScaleSetClient) Do(req *http.Request) (*http.Response, error) {
if s.httpClient == nil {
return nil, fmt.Errorf("http client is not initialized")