From b0e74bebabcc8aacacfc5262e8c322933521ff63 Mon Sep 17 00:00:00 2001 From: Hidetake Iwata Date: Sat, 20 Feb 2021 21:25:23 +0900 Subject: [PATCH] Fix index key to find HRA in GitHub webhook handler --- controllers/horizontal_runner_autoscaler_webhook.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/controllers/horizontal_runner_autoscaler_webhook.go b/controllers/horizontal_runner_autoscaler_webhook.go index 6b1920e9..2819bdea 100644 --- a/controllers/horizontal_runner_autoscaler_webhook.go +++ b/controllers/horizontal_runner_autoscaler_webhook.go @@ -303,17 +303,20 @@ func (autoscaler *HorizontalRunnerAutoscalerGitHubWebhook) getScaleTarget(ctx co } func (autoscaler *HorizontalRunnerAutoscalerGitHubWebhook) getScaleUpTarget(ctx context.Context, repoNameFromWebhook, orgNameFromWebhook string, f func(v1alpha1.ScaleUpTrigger) bool) (*ScaleTarget, error) { - if target, err := autoscaler.getScaleTarget(ctx, repoNameFromWebhook, f); err != nil { + repositoryRunnerKey := orgNameFromWebhook + "/" + repoNameFromWebhook + autoscaler.Log.Info("finding repository-wide runner", "repository", repositoryRunnerKey) + if target, err := autoscaler.getScaleTarget(ctx, repositoryRunnerKey, f); err != nil { return nil, err } else if target != nil { autoscaler.Log.Info("scale up target is repository-wide runners", "repository", repoNameFromWebhook) return target, nil } + autoscaler.Log.Info("finding organizational runner", "organization", orgNameFromWebhook) if target, err := autoscaler.getScaleTarget(ctx, orgNameFromWebhook, f); err != nil { return nil, err } else if target != nil { - autoscaler.Log.Info("scale up target is organizational runners", "repository", orgNameFromWebhook) + autoscaler.Log.Info("scale up target is organizational runners", "organization", orgNameFromWebhook) return target, nil }