mirror of
https://github.com/actions/actions-runner-controller.git
synced 2025-12-10 11:41:27 +00:00
fix delete pod when runner failed to register
This commit is contained in:
committed by
KUOKA Yusuke
parent
7df119e470
commit
b96979888c
@@ -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
|
||||||
|
|||||||
Reference in New Issue
Block a user