public_git
/
actions-runner-controller
mirror of https://github.com/actions-runner-controller/actions-runner-controller.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix regression that prevented default organizational runner group from being scale target 

Fixes #1131
This commit is contained in:
Yusuke Kuoka 2022-02-19 05:32:05 +00:00
parent eb0a4a9603
commit fcf4778bac
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
controllers/horizontal_runner_autoscaler_webhook.go
View File

@ -614,11 +614,7 @@ func (autoscaler *HorizontalRunnerAutoscalerGitHubWebhook) getManagedRunnerGroup
return nil, fmt.Errorf("unsupported scale target kind: %v", kind) return nil, fmt.Errorf("unsupported scale target kind: %v", kind)
} }
if g == "" { if g != "" && e == "" && o == "" {
continue
}
if e == "" && o == "" {
autoscaler.Log.V(1).Info( autoscaler.Log.V(1).Info(
"invalid runner group config in scale target: spec.group must be set along with either spec.enterprise or spec.organization", "invalid runner group config in scale target: spec.group must be set along with either spec.enterprise or spec.organization",
"scaleTargetKind", kind, "scaleTargetKind", kind,
@ -631,6 +627,16 @@ func (autoscaler *HorizontalRunnerAutoscalerGitHubWebhook) getManagedRunnerGroup
} }
if e != enterprise && o != org { if e != enterprise && o != org {
autoscaler.Log.V(1).Info(
"Skipped scale target irrelevant to event",
"eventOrganization", org,
"eventEnterprise", enterprise,
"scaleTargetKind", kind,
"scaleTargetGroup", g,
"scaleTargetEnterprise", e,
"scaleTargetOrganization", o,
)
continue continue
} }