Fix error handling in EtcdMemberReconciler

The watch for CRD getting ready used wrong error when checking if it is retriable. This results in bogus logging and a "busyloop": ``` time="2024-05-16 10:05:45" level=info msg="Transient error while watching etcdmember CRD, last observed version is \"\", starting over after 0s ..." component=etcdMemberReconciler error="<nil>" time="2024-05-16 10:05:45" level=info msg="Transient error while watching etcdmember CRD, last observed version is \"\", starting over after 0s ..." component=etcdMemberReconciler error="<nil>" time="2024-05-16 10:05:45" level=info msg="Transient error while watching etcdmember CRD, last observed version is \"\", starting over after 0s ..." component=etcdMemberReconciler error="<nil>" ... ``` It actually hides the transient errors encountered. Signed-off-by: Jussi Nummelin <[email protected]>
k0sproject · May 17, 2024 · d67b442 · d67b442
1 parent 4141997
commit d67b442
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/pkg/component/controller/etcd_member_reconciler.go b/pkg/component/controller/etcd_member_reconciler.go
@@ -142,7 +142,7 @@ func (e *EtcdMemberReconciler) waitForCRD(ctx context.Context) error {
 	log.Info("waiting to see EtcdMember CRD ready")
 	return watch.FromClient[*crdList, crd](ec.CustomResourceDefinitions()).
 		WithObjectName(fmt.Sprintf("%s.%s", "etcdmembers", "etcd.k0sproject.io")).
-		WithErrorCallback(func(cbErr error) (retryDelay time.Duration, err error) {
+		WithErrorCallback(func(err error) (time.Duration, error) {
 			if retryAfter, e := watch.IsRetryable(err); e == nil {
 				log.WithError(err).Infof(
 					"Transient error while watching etcdmember CRD"+