Optimized status discovery 68/123168/1 0.9.0
authorLukasz Rajewski <lukasz.rajewski@orange.com>
Fri, 6 Aug 2021 14:43:32 +0000 (16:43 +0200)
committerLukasz Rajewski <lukasz.rajewski@orange.com>
Fri, 6 Aug 2021 14:43:32 +0000 (16:43 +0200)
Optimized status discovery

Issue-ID: MULTICLOUD-1372
Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com>
Change-Id: I854bc88676f4bc3b5f35e8a303d94603ce61a91d

src/k8splugin/internal/app/instance.go

index c12b0a6..8c924af 100644 (file)
@@ -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())
+                               }
                        }
                }
        }