Merge origin/main into narsupport - resolved conflicts

Author: NicholasYancey

.gitignore

@@ -39,4 +39,4 @@ go.work
 .Spotlight-V100
 .Trashes
 ehthumbs.db
-Thumbs.db
+Thumbs.db

cmd/non-admin/nonadmin.go

@@ -37,7 +37,6 @@ func NewNonAdminCommand(f client.Factory) *cobra.Command {
 
 	// Add restore subcommand
 	c.AddCommand(restore.NewRestoreCommand(f))
-
 	// Add backup storage location subcommand
 	//c.AddCommand(bsl.NewBSLCommand(f))
 

design.md

@@ -9,6 +9,7 @@ require (
 	github.com/spf13/cobra v1.9.1
 	github.com/spf13/pflag v1.0.6
 	github.com/vmware-tanzu/velero v1.16.1
+	gopkg.in/yaml.v2 v2.4.0
 	k8s.io/api v0.33.1
 	k8s.io/apimachinery v0.33.1
 	k8s.io/client-go v0.33.1