From 3cccca8d097222a1022a16a9cd2e42bcdb1459b8 Mon Sep 17 00:00:00 2001
From: Yusuke Kuoka <ykuoka@gmail.com>
Date: Thu, 18 Mar 2021 10:31:17 +0900
Subject: [PATCH] Do patch runner status instead of update to reduce conflicts
 and avoid future bugs

Ref https://github.com/summerwind/actions-runner-controller/pull/398#issuecomment-801548375
---
 controllers/runner_controller.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/controllers/runner_controller.go b/controllers/runner_controller.go
index ff2d31ff..1dc9bb50 100644
--- a/controllers/runner_controller.go
+++ b/controllers/runner_controller.go
@@ -463,7 +463,7 @@ func (r *RunnerReconciler) updateRegistrationToken(ctx context.Context, runner v
 		ExpiresAt:    metav1.NewTime(rt.GetExpiresAt().Time),
 	}
 
-	if err := r.Status().Update(ctx, updated); err != nil {
+	if err := r.Status().Patch(ctx, updated, client.MergeFrom(&runner)); err != nil {
 		log.Error(err, "Failed to update runner status for Registration")
 		return false, err
 	}