From f013b0f03cffdbe0e78261bd0ee72a46fc9c167f Mon Sep 17 00:00:00 2001 From: Igor Gov Date: Tue, 8 Feb 2022 14:03:55 +0200 Subject: [PATCH] Fix: proper error hanlding and logging on pod deployment (#773) --- cli/cmd/tapRunner.go | 4 ++-- shared/kubernetes/eventWatchHelper.go | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/cli/cmd/tapRunner.go b/cli/cmd/tapRunner.go index bace705d6..e79f3e9b9 100644 --- a/cli/cmd/tapRunner.go +++ b/cli/cmd/tapRunner.go @@ -339,7 +339,7 @@ func watchApiServerPod(ctx context.Context, kubernetesProvider *kubernetes.Provi continue } - logger.Log.Debugf("Watching API Server pod loop, modified: %v", modifiedPod.Status.Phase) + logger.Log.Debugf("Watching API Server pod loop, modified: %v, containers statuses: %v", modifiedPod.Status.Phase, modifiedPod.Status.ContainerStatuses) if modifiedPod.Status.Phase == core.PodRunning && !isPodReady { isPodReady = true @@ -406,7 +406,7 @@ func watchApiServerEvents(ctx context.Context, kubernetesProvider *kubernetes.Pr case "FailedScheduling", "Failed": logger.Log.Errorf(uiUtils.Error, fmt.Sprintf("Mizu API Server status: %s - %s", event.Reason, event.Note)) cancel() - + } case err, ok := <-errorChan: if !ok { diff --git a/shared/kubernetes/eventWatchHelper.go b/shared/kubernetes/eventWatchHelper.go index cd8049cd8..7ff0c13b6 100644 --- a/shared/kubernetes/eventWatchHelper.go +++ b/shared/kubernetes/eventWatchHelper.go @@ -29,12 +29,10 @@ func (wh *EventWatchHelper) Filter(wEvent *WatchEvent) (bool, error) { if err != nil { return false, nil } - if !wh.NameRegexFilter.MatchString(event.Name) { return false, nil } - - if strings.EqualFold(event.Regarding.Kind, wh.Kind) { + if !strings.EqualFold(event.Regarding.Kind, wh.Kind) { return false, nil }