Skip to content

Add uploader-type argument to Velero deployment configuration when configuration.args is used. #2019

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
wants to merge 1 commit into
base: oadp-dev
Choose a base branch
from
Open

Add uploader-type argument to Velero deployment configuration when configuration.args is used. #2019

Show file tree
Hide file tree
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
8 changes: 8 additions & 0 deletions internal/controller/velero.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -679,6 +679,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
}
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/velero_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2350,11 +2350,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,
},
}),
Expand Down