From 0a1b40c1042ebdf212c46f67dd62bf13c2eee5aa Mon Sep 17 00:00:00 2001 From: Lukasz Rajewski Date: Fri, 6 Aug 2021 16:43:32 +0200 Subject: Optimized status discovery Optimized status discovery Issue-ID: MULTICLOUD-1372 Signed-off-by: Lukasz Rajewski Change-Id: I854bc88676f4bc3b5f35e8a303d94603ce61a91d --- src/k8splugin/internal/app/instance.go | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/k8splugin/internal/app/instance.go b/src/k8splugin/internal/app/instance.go index c12b0a68..8c924af3 100644 --- a/src/k8splugin/internal/app/instance.go +++ b/src/k8splugin/internal/app/instance.go @@ -306,19 +306,16 @@ Main: status, err := k8sClient.GetResourceStatus(oneResource, resResp.Namespace) if err != nil { cumulatedErrorMsg = append(cumulatedErrorMsg, err.Error()) + isReady = false } else { generalStatus = append(generalStatus, status) - } - - ready, err := v.checkRssStatus(oneResource, k8sClient, resResp.Namespace, status) + ready, err := v.checkRssStatus(oneResource, k8sClient, resResp.Namespace, status) - if !ready || err != nil { - isReady = false - if err != nil { - cumulatedErrorMsg = append(cumulatedErrorMsg, err.Error()) - } else { - apiVersion, kind := oneResource.GVK.ToAPIVersionAndKind() - cumulatedErrorMsg = append(cumulatedErrorMsg, kind+"/"+apiVersion+" ("+oneResource.Name+") is not ready") + if !ready || err != nil { + isReady = false + if err != nil { + cumulatedErrorMsg = append(cumulatedErrorMsg, err.Error()) + } } } } -- cgit 1.2.3-korg