From 34bc3c7e1a660e8805dd4d11f78be850e12abaac Mon Sep 17 00:00:00 2001
From: Shubham Pampattiwar <spampatt@redhat.com>
Date: Tue, 28 Jul 2026 09:42:13 -0700
Subject: [PATCH] Add --skip-default-resource-modifier flag to restore CLI

When set, the server-configured default resource modifier is skipped
for this restore. Only sets the *bool field when the flag is true,
leaving it nil otherwise.

Signed-off-by: Shubham Pampattiwar <spampatt@redhat.com>
---
 pkg/cmd/cli/restore/create.go | 59 ++++++++++++++++++++---------------
 1 file changed, 33 insertions(+), 26 deletions(-)

diff --git a/pkg/cmd/cli/restore/create.go b/pkg/cmd/cli/restore/create.go
index 3f59b6a6b..c76097176 100644
--- a/pkg/cmd/cli/restore/create.go
+++ b/pkg/cmd/cli/restore/create.go
@@ -85,32 +85,33 @@ Notes:
 }
 
 type CreateOptions struct {
-	BackupName                string
-	ScheduleName              string
-	RestoreName               string
-	RestoreVolumes            flag.OptionalBool
-	PreserveNodePorts         flag.OptionalBool
-	Labels                    flag.Map
-	Annotations               flag.Map
-	IncludeNamespaces         flag.StringArray
-	ExcludeNamespaces         flag.StringArray
-	ExistingResourcePolicy    string
-	IncludeResources          flag.StringArray
-	ExcludeResources          flag.StringArray
-	StatusIncludeResources    flag.StringArray
-	StatusExcludeResources    flag.StringArray
-	NamespaceMappings         flag.Map
-	Selector                  flag.LabelSelector
-	OrSelector                flag.OrLabelSelector
-	IncludeClusterResources   flag.OptionalBool
-	Wait                      bool
-	AllowPartiallyFailed      flag.OptionalBool
-	ItemOperationTimeout      time.Duration
-	ResourceModifierConfigMap string
-	ResourcePoliciesConfigMap string
-	WriteSparseFiles          flag.OptionalBool
-	ParallelFilesDownload     int
-	client                    kbclient.WithWatch
+	BackupName                  string
+	ScheduleName                string
+	RestoreName                 string
+	RestoreVolumes              flag.OptionalBool
+	PreserveNodePorts           flag.OptionalBool
+	Labels                      flag.Map
+	Annotations                 flag.Map
+	IncludeNamespaces           flag.StringArray
+	ExcludeNamespaces           flag.StringArray
+	ExistingResourcePolicy      string
+	IncludeResources            flag.StringArray
+	ExcludeResources            flag.StringArray
+	StatusIncludeResources      flag.StringArray
+	StatusExcludeResources      flag.StringArray
+	NamespaceMappings           flag.Map
+	Selector                    flag.LabelSelector
+	OrSelector                  flag.OrLabelSelector
+	IncludeClusterResources     flag.OptionalBool
+	Wait                        bool
+	AllowPartiallyFailed        flag.OptionalBool
+	ItemOperationTimeout        time.Duration
+	ResourceModifierConfigMap   string
+	ResourcePoliciesConfigMap   string
+	SkipDefaultResourceModifier bool
+	WriteSparseFiles            flag.OptionalBool
+	ParallelFilesDownload       int
+	client                      kbclient.WithWatch
 }
 
 func NewCreateOptions() *CreateOptions {
@@ -164,6 +165,8 @@ func (o *CreateOptions) BindFlags(flags *pflag.FlagSet) {
 
 	flags.StringVar(&o.ResourcePoliciesConfigMap, "resource-policies-configmap", "", "Reference to the ConfigMap containing restore resource filter policies")
 
+	flags.BoolVar(&o.SkipDefaultResourceModifier, "skip-default-resource-modifier", false, "Skip applying the server-configured default resource modifier for this restore")
+
 	f = flags.VarPF(&o.WriteSparseFiles, "write-sparse-files", "", "Whether to write sparse files during restoring volumes")
 	f.NoOptDefVal = cmd.TRUE
 
@@ -362,6 +365,10 @@ func (o *CreateOptions) Run(c *cobra.Command, f client.Factory) error {
 		},
 	}
 
+	if o.SkipDefaultResourceModifier {
+		restore.Spec.SkipDefaultResourceModifier = boolptr.True()
+	}
+
 	if len([]string(o.StatusIncludeResources)) > 0 {
 		restore.Spec.RestoreStatus = &api.RestoreStatusSpec{
 			IncludedResources: o.StatusIncludeResources,