runner-controller: do not delete runner if it is busy

controllers/runner_controller.go

@@ -203,12 +203,16 @@ func (r *RunnerReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
  return ctrl.Result{}, err
  }
 
- if pod.Spec.Containers[0].Image != newPod.Spec.Containers[0].Image {
- restart = true
+ runnerBusy, err := r.isRunnerBusy(ctx, runner.Spec.Organization, runner.Spec.Repository, runner.Name)
+ if err != nil {
+ log.Error(err, "Failed to check if runner is busy")
+ return ctrl.Result{}, nil
  }
- if !reflect.DeepEqual(pod.Spec.Containers[0].Env, newPod.Spec.Containers[0].Env) {
+
+ if !runnerBusy && (!reflect.DeepEqual(pod.Spec.Containers[0].Env, newPod.Spec.Containers[0].Env) || pod.Spec.Containers[0].Image != newPod.Spec.Containers[0].Image) {
  restart = true
  }
+
  if !restart {
  return ctrl.Result{}, err
  }
@@ -225,6 +229,21 @@ func (r *RunnerReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
  return ctrl.Result{}, nil
 }
 
+func (r *RunnerReconciler) isRunnerBusy(ctx context.Context, org, repo, name string) (bool, error) {
+ runners, err := r.GitHubClient.ListRunners(ctx, org, repo)
+ if err != nil {
+ return false, err
+ }
+
+ for _, runner := range runners {
+ if runner.GetName() == name {
+ return runner.GetBusy(), nil
+ }
+ }
+
+ return false, fmt.Errorf("runner not found")
+}
+
 func (r *RunnerReconciler) unregisterRunner(ctx context.Context, org, repo, name string) (bool, error) {
  runners, err := r.GitHubClient.ListRunners(ctx, org, repo)
  if err != nil {

github/github.go

@@ -9,7 +9,7 @@ import (
  "time"
 
  "github.com/bradleyfalzon/ghinstallation"
- "github.com/google/go-github/v31/github"
+ "github.com/google/go-github/v32/github"
  "golang.org/x/oauth2"
 )
 
@@ -85,7 +85,7 @@ func (c *Client) GetRegistrationToken(ctx context.Context, org, repo, name strin
  return rt, nil
 }
 
-// RemoveRunner removes a runner with specified runner ID from repocitory.
+// RemoveRunner removes a runner with specified runner ID from repository.
 func (c *Client) RemoveRunner(ctx context.Context, org, repo string, runnerID int64) error {
  owner, repo, err := getOwnerAndRepo(org, repo)
 

github/github_beta.go

@@ -10,7 +10,7 @@ import (
  "net/url"
  "reflect"
 
- "github.com/google/go-github/v31/github"
+ "github.com/google/go-github/v32/github"
  "github.com/google/go-querystring/query"
 )
 

github/github_test.go

@@ -7,7 +7,7 @@ import (
  "testing"
  "time"
 
- "github.com/google/go-github/v31/github"
+ "github.com/google/go-github/v32/github"
  "github.com/summerwind/actions-runner-controller/github/fake"
 )
 

go.mod

@@ -6,7 +6,7 @@ require (
  github.com/bradleyfalzon/ghinstallation v1.1.1
  github.com/davecgh/go-spew v1.1.1
  github.com/go-logr/logr v0.1.0
- github.com/google/go-github/v31 v31.0.0
+ github.com/google/go-github/v32 v32.1.1-0.20200822031813-d57a3a84ba04
  github.com/google/go-querystring v1.0.0
  github.com/onsi/ginkgo v1.8.0
  github.com/onsi/gomega v1.5.0
@@ -15,6 +15,5 @@ require (
  k8s.io/api v0.0.0-20190918155943-95b840bb6a1f
  k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655
  k8s.io/client-go v0.0.0-20190918160344-1fbdaa4c8d90
- k8s.io/klog v0.4.0
  sigs.k8s.io/controller-runtime v0.4.0
 )

go.sum

@@ -116,11 +116,12 @@ github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-github v17.0.0+incompatible h1:N0LgJ1j65A7kfXrZnUDaYCs/Sf4rEjNlfyDHW9dolSY=
 github.com/google/go-github/v29 v29.0.2 h1:opYN6Wc7DOz7Ku3Oh4l7prmkOMwEcQxpFtxdU8N8Pts=
 github.com/google/go-github/v29 v29.0.2/go.mod h1:CHKiKKPHJ0REzfwc14QMklvtHwCveD0PxlMjLlzAM5E=
-github.com/google/go-github/v31 v31.0.0 h1:JJUxlP9lFK+ziXKimTCprajMApV1ecWD4NB6CCb0plo=
-github.com/google/go-github/v31 v31.0.0/go.mod h1:NQPZol8/1sMoWYGN2yaALIBytu17gAWfhbweiEed3pM=
+github.com/google/go-github/v32 v32.1.0 h1:GWkQOdXqviCPx7Q7Fj+KyPoGm4SwHRh8rheoPhd27II=
+github.com/google/go-github/v32 v32.1.0/go.mod h1:rIEpZD9CTDQwDK9GDrtMTycQNA4JU3qBsCizh3q2WCI=
+github.com/google/go-github/v32 v32.1.1-0.20200822031813-d57a3a84ba04 h1:wEYk2h/GwOhImcVjiTIceP88WxVbXw2F+ARYUQMEsfg=
+github.com/google/go-github/v32 v32.1.1-0.20200822031813-d57a3a84ba04/go.mod h1:rIEpZD9CTDQwDK9GDrtMTycQNA4JU3qBsCizh3q2WCI=
 github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk=
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
 github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI=