Merge pull request #5236 from sseago/no-namespaces-fix

Check for empty ns list before checking nslist[0]
vmware-tanzu · Sep 5, 2022 · a5a3df1 · a5a3df1
2 parents 4bc73f2 + 55bf2de
commit a5a3df1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/changelogs/unreleased/5236-sseago b/changelogs/unreleased/5236-sseago
@@ -0,0 +1 @@
+Check for empty ns list before checking nslist[0]
diff --git a/pkg/backup/item_collector.go b/pkg/backup/item_collector.go
@@ -225,8 +225,11 @@ func (r *itemCollector) getResourceItems(log logrus.FieldLogger, gv schema.Group
 
 	namespacesToList := getNamespacesToList(r.backupRequest.NamespaceIncludesExcludes)
 
-	// Check if we're backing up namespaces, and only certain ones
-	if gr == kuberesource.Namespaces && namespacesToList[0] != "" {
+	// Check if we're backing up namespaces for a less-than-full backup.
+	// We enter this block if resource is Namespaces and the namespae list is either empty or contains
+	// an explicit namespace list. (We skip this block if the list contains "" since that indicates
+	// a full-cluster backup
+	if gr == kuberesource.Namespaces && (len(namespacesToList) == 0 || namespacesToList[0] != "") {
 		resourceClient, err := r.dynamicFactory.ClientForGroupVersionResource(gv, resource, "")
 		if err != nil {
 			log.WithError(err).Error("Error getting dynamic client")
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Check for empty ns list before checking nslist[0]