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 delete pod when runner failed to register

This commit is contained in:
Reinier Timmer 2020-04-28 16:31:05 +02:00 committed by KUOKA Yusuke
parent 7df119e470
commit b96979888c
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
controllers/runner_controller.go
View File

@ -88,16 +88,20 @@ func (r *RunnerReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
} }
} else { } else {
finalizers, removed := removeFinalizer(runner.ObjectMeta.Finalizers) finalizers, removed := removeFinalizer(runner.ObjectMeta.Finalizers)
if removed { if removed {
ok, err := r.unregisterRunner(ctx, runner.Spec.Organization, runner.Spec.Repository, runner.Name) if len(runner.Status.Registration.Token) > 0 {
if err != nil { ok, err := r.unregisterRunner(ctx, runner.Spec.Organization, runner.Spec.Repository, runner.Name)
log.Error(err, "Failed to unregister runner") if err != nil {
return ctrl.Result{}, err log.Error(err, "Failed to unregister runner")
} return ctrl.Result{}, err
}
if !ok { if !ok {
log.V(1).Info("Runner no longer exists on GitHub") log.V(1).Info("Runner no longer exists on GitHub")
}
} else {
log.V(1).Info("Runner was never registered on GitHub")
} }
newRunner := runner.DeepCopy() newRunner := runner.DeepCopy()
@ -108,7 +112,7 @@ func (r *RunnerReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
return ctrl.Result{}, err return ctrl.Result{}, err
} }
log.Info("Removed runner from GitHub", "repository", runner.Spec.Repository) log.Info("Removed runner from GitHub", "repository", runner.Spec.Repository, "organization", runner.Spec.Organization)
} }
return ctrl.Result{}, nil return ctrl.Result{}, nil