From 4a0f68bfe342e86a79e9b99d825fe6b70cb3208e Mon Sep 17 00:00:00 2001 From: Felipe Galindo Sanchez Date: Wed, 2 Mar 2022 16:01:34 -0800 Subject: [PATCH] Cleanup extra block in runner controller (#1174) --- controllers/runner_controller.go | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/controllers/runner_controller.go b/controllers/runner_controller.go index b624a6e1..39391575 100644 --- a/controllers/runner_controller.go +++ b/controllers/runner_controller.go @@ -113,23 +113,17 @@ func (r *RunnerReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr return ctrl.Result{}, nil } } else { - var p *corev1.Pod + var pod corev1.Pod + if err := r.Get(ctx, req.NamespacedName, &pod); err != nil { + if !kerrors.IsNotFound(err) { + log.Info(fmt.Sprintf("Retrying soon as we failed to get registration-only runner pod: %v", err)) - { - var pod corev1.Pod - if err := r.Get(ctx, req.NamespacedName, &pod); err != nil { - if !kerrors.IsNotFound(err) { - log.Info(fmt.Sprintf("Retrying soon as we failed to get registration-only runner pod: %v", err)) - - return ctrl.Result{Requeue: true}, nil - } - } else { - p = &pod + return ctrl.Result{Requeue: true}, nil } } // Request to remove a runner. DeletionTimestamp was set in the runner - we need to unregister runner - return r.processRunnerDeletion(runner, ctx, log, p) + return r.processRunnerDeletion(runner, ctx, log, &pod) } registrationOnly := metav1.HasAnnotation(runner.ObjectMeta, annotationKeyRegistrationOnly)