Skip to content

Auto select when only one NABSL exists #193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NicholasYancey wants to merge 1 commit into
base: oadp-dev
Choose a base branch
from
+40 −13
Open

Auto select when only one NABSL exists #193

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 40 additions & 13 deletions cmd/non-admin/backup/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,11 @@ type CreateOptions struct {
*velerobackup.CreateOptions // Embed Velero's CreateOptions

// NAB-specific fields
Name string // The NonAdminBackup resource name (maps to Velero's BackupName)
client kbclient.WithWatch
currentNamespace string
storageLocationFromConfig bool // Track if storage location came from config
Name string // The NonAdminBackup resource name (maps to Velero's BackupName)
client kbclient.WithWatch
currentNamespace string
storageLocationFromConfig bool // Track if storage location came from config
storageLocationAutoSelected bool // Track if storage location was auto-selected
}

func NewCreateOptions() *CreateOptions {
Expand Down Expand Up @@ -147,15 +148,6 @@ func (o *CreateOptions) Validate(c *cobra.Command, args []string, f client.Facto
func (o *CreateOptions) Complete(args []string, f client.Factory) error {
o.Name = args[0]

// Load default NABSL from config if not provided via flag
if o.StorageLocation == "" {
defaultNABSL := getNABSLFromConfig()
if defaultNABSL != "" {
o.StorageLocation = defaultNABSL
o.storageLocationFromConfig = true
}
}

// Create client with NonAdmin scheme
client, err := shared.NewClientWithScheme(f, shared.ClientOptions{
IncludeNonAdminTypes: true,
Expand All @@ -172,6 +164,37 @@ func (o *CreateOptions) Complete(args []string, f client.Factory) error {

o.client = client
o.currentNamespace = currentNS

// Load default NABSL from config if not provided via flag, or auto-select if exactly one exists
if o.StorageLocation == "" {
defaultNABSL := getNABSLFromConfig()
if defaultNABSL != "" {
o.StorageLocation = defaultNABSL
o.storageLocationFromConfig = true
} else {
// Auto-select NABSL if exactly one approved/created exists in the namespace
nabslList := &nacv1alpha1.NonAdminBackupStorageLocationList{}
if err := o.client.List(context.TODO(), nabslList, &kbclient.ListOptions{
Namespace: currentNS,
}); err != nil {
return fmt.Errorf("failed to list NonAdminBackupStorageLocations: %w", err)
}

// Filter to only approved/created NABSLs (exclude pending/rejected)
var usableNABSLs []nacv1alpha1.NonAdminBackupStorageLocation
for _, nabsl := range nabslList.Items {
if nabsl.Status.Phase == nacv1alpha1.NonAdminPhaseCreated {
usableNABSLs = append(usableNABSLs, nabsl)
}
}

if len(usableNABSLs) == 1 {
o.StorageLocation = usableNABSLs[0].Name
o.storageLocationAutoSelected = true
}
Comment on lines +183 to +194
Copy link
Copy Markdown
Member

@kaovilai kaovilai May 29, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is microoptimization but for consideration. no array allocation

var usableCount int
var selectedName string

for _, nabsl := range nabslList.Items {
	if nabsl.Status.Phase == nacv1alpha1.NonAdminPhaseCreated {
		usableCount++
		if usableCount == 1 {
			selectedName = nabsl.Name
		} else {
			break
		}
	}
}

if usableCount == 1 {
	o.StorageLocation = selectedName
	o.storageLocationAutoSelected = true
}

}
}

return nil
}

Expand All @@ -193,6 +216,10 @@ func (o *CreateOptions) Run(c *cobra.Command, f client.Factory) error {
if o.storageLocationFromConfig {
fmt.Printf("Using default nonadmin backup storage location from config: %s\n", o.StorageLocation)
}
if o.storageLocationAutoSelected {
fmt.Printf("Auto-selected storage location: %s (only NABSL in namespace)\n", o.StorageLocation)
fmt.Printf("Warning: If you create another NABSL in this namespace, future backups may not use the same location.\n")
}

fmt.Printf("NonAdminBackup request %q submitted successfully.\n", nonAdminBackup.Name)
fmt.Printf("Run `oc oadp nonadmin backup describe %s` or `oc oadp nonadmin backup logs %s` for more details.\n", nonAdminBackup.Name, nonAdminBackup.Name)
Expand Down
Loading