Fix SBK to eliminate empty YAML file

Signed-off-by: Jian Wang <w13915984028@gmail.com>
rancher · Sep 27, 2023 · 70a903f · 70a903f
1 parent 5dd578f
commit 70a903f
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 5 deletions.
diff --git a/pkg/manager/client/discovery.go b/pkg/manager/client/discovery.go
@@ -102,7 +102,12 @@ func (dc *DiscoveryClient) SpecificResourcesForNamespace(toObj ParseResult, modu
 				if err != nil {
 					return nil, err
 				}
-				objs[gv.String()+"/"+resource.Name] = obj
+				// skip empty object, which will cause useless zero item yaml file
+				if obj != nil {
+					objs[gv.String()+"/"+resource.Name] = obj
+				} else {
+					logrus.Debugf("No %s/%s resource %s in namespace %s, skip", gv.String(), resource.Kind, resource.Name, namespace)
+				}
 			}
 
 		}
@@ -164,13 +169,17 @@ func (dc *DiscoveryClient) ResourcesForNamespace(toObj ParseResult, namespace st
 				if err != nil {
 					return nil, err
 				}
-				objs[gv.String()+"/"+resource.Name] = obj
+				// skip empty object, which will cause useless zero item yaml file
+				if obj != nil {
+					objs[gv.String()+"/"+resource.Name] = obj
+				} else {
+					logrus.Debugf("No %s/%s resource %s in namespace %s, skip", gv.String(), resource.Kind, resource.Name, namespace)
+				}
 			}
 		}
 	}
 
 	return objs, nil
-
 }
 
 // Get the cluster level resources
@@ -222,7 +231,10 @@ func (dc *DiscoveryClient) ResourcesForCluster(toObj ParseResult, exclude Exclud
 				if err != nil {
 					return nil, err
 				}
-				objs[gv.String()+"/"+resource.Name] = obj
+				// skip empty object
+				if obj != nil {
+					objs[gv.String()+"/"+resource.Name] = obj
+				}
 			}
 		}
 	}

diff --git a/pkg/manager/collectors/common.go b/pkg/manager/collectors/common.go
@@ -82,6 +82,11 @@ func (c common) toObjCommon(b []byte, groupVersion, kind string) (*gabs.Containe
 		return nil, err
 	}
 
+	// When there is no instance of the given GVK, return nil
+	if len(jsonParsed.S("items").Children()) == 0 {
+		return nil, nil
+	}
+
 	for _, child := range jsonParsed.S("items").Children() {
 		if _, err = child.SetP(groupVersion, "apiVersion"); err != nil {
 			logrus.Error("Unable to set apiVersion field.")

diff --git a/pkg/manager/collectors/harvester.go b/pkg/manager/collectors/harvester.go
@@ -121,7 +121,7 @@ func (module harvesterModule) toClusterObj(b []byte, groupVersion, kind string,
 	switch kind {
 	case "Setting":
 		currentItems, _ := jsonParsed.S("items").Data().([]interface{})
-		logrus.Debugf("Whole items: %v", currentItems)
+		logrus.Debugf("Whole items in cluster: %v", currentItems)
 		var newItems []interface{}
 		for _, item := range currentItems {
 			gItem := gabs.Wrap(item)