From 29b73d97dd787dd4ad56038fdc060d614a19b5bd Mon Sep 17 00:00:00 2001 From: Tiger Kaovilai Date: Mon, 10 Nov 2025 14:52:19 -0500 Subject: [PATCH] Add uploader-type argument to Velero deployment configuration when configuration.args is used. Signed-off-by: Tiger Kaovilai --- internal/controller/velero.go | 8 ++++++++ internal/controller/velero_test.go | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/internal/controller/velero.go b/internal/controller/velero.go index df7ea975b0c..37c7bcf8ebe 100644 --- a/internal/controller/velero.go +++ b/internal/controller/velero.go @@ -630,6 +630,14 @@ func (r *DataProtectionApplicationReconciler) customizeVeleroContainer(veleroCon if err != nil { return err } + // Re-add uploader-type since GetArgs() doesn't include it + // but it comes from NodeAgent configuration, not Velero.Args + if dpa.Spec.Configuration.NodeAgent != nil && + len(dpa.Spec.Configuration.NodeAgent.UploaderType) > 0 { + uploaderType := dpa.Spec.Configuration.NodeAgent.UploaderType + veleroContainer.Args = append(veleroContainer.Args, + fmt.Sprintf("--uploader-type=%s", uploaderType)) + } } return nil } diff --git a/internal/controller/velero_test.go b/internal/controller/velero_test.go index 980497195d2..30664726451 100644 --- a/internal/controller/velero_test.go +++ b/internal/controller/velero_test.go @@ -2488,11 +2488,11 @@ func TestDPAReconciler_buildVeleroDeployment(t *testing.T) { veleroDeployment: testVeleroDeployment.DeepCopy(), wantVeleroDeployment: createTestBuiltVeleroDeployment(TestBuiltVeleroDeploymentOptions{ args: []string{ - // should be present... "--uploader-type=kopia", "--client-burst=321", "--client-qps=321", "--fs-backup-timeout=4h0m0s", defaultRestoreResourcePriorities, + "--uploader-type=kopia", defaultDisableInformerCache, }, }),