From f9f94f469caac617584c34042e489dfaa64e072d Mon Sep 17 00:00:00 2001 From: gabemontero Date: Wed, 21 Feb 2024 15:58:38 -0500 Subject: [PATCH] fix pod client creation; move streamLogs onto reconciler thread rh-pre-commit.version: 2.2.0 rh-pre-commit.check-secrets: ENABLED --- pkg/watcher/reconciler/dynamic/dynamic.go | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/pkg/watcher/reconciler/dynamic/dynamic.go b/pkg/watcher/reconciler/dynamic/dynamic.go index 8029b85cd..1c1701f92 100644 --- a/pkg/watcher/reconciler/dynamic/dynamic.go +++ b/pkg/watcher/reconciler/dynamic/dynamic.go @@ -337,22 +337,21 @@ func (r *Reconciler) sendLog(ctx context.Context, o results.Object) error { zap.String("name", o.GetName()), ) - go func() { - err := r.streamLogs(ctx, o, labelKey, logName) - if err != nil { - logger.Errorw("Error streaming log", - zap.String("namespace", o.GetNamespace()), - zap.String("kind", o.GetObjectKind().GroupVersionKind().Kind), - zap.String("name", o.GetName()), - zap.Error(err), - ) - } - logger.Debugw("Streaming log completed", + err = r.streamLogs(ctx, o, labelKey, logName) + if err != nil { + logger.Errorw("Error streaming log", zap.String("namespace", o.GetNamespace()), zap.String("kind", o.GetObjectKind().GroupVersionKind().Kind), zap.String("name", o.GetName()), + zap.Error(err), ) - }() + return err + } + logger.Debugw("Streaming log completed", + zap.String("namespace", o.GetNamespace()), + zap.String("kind", o.GetObjectKind().GroupVersionKind().Kind), + zap.String("name", o.GetName()), + ) } return nil