[DELETE] Delete unnecessary error param in setupArgs function

Signed-off-by: Pooya Azarpour <[email protected]>
eunames · Apr 8, 2024 · 9b4216a · 9b4216a
1 parent d1319f0
commit 9b4216a
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 20 deletions.
diff --git a/operator/archivecontroller/executor.go b/operator/archivecontroller/executor.go
@@ -58,10 +58,9 @@ func (a *ArchiveExecutor) Execute(ctx context.Context) error {
 		batchJob.Spec.Template.Spec.Containers[0].VolumeMounts = a.attachMoreVolumeMounts()
 		batchJob.Spec.Template.Spec.Volumes = a.attachMoreVolumes()
 
-		args, argsErr := a.setupArgs()
-		batchJob.Spec.Template.Spec.Containers[0].Args = args
+		batchJob.Spec.Template.Spec.Containers[0].Args = a.setupArgs()
 
-		return argsErr
+		return nil
 	})
 	if err != nil {
 		log.Error(err, "could not create job")
@@ -77,14 +76,14 @@ func (a *ArchiveExecutor) jobName() string {
 	return k8upv1.ArchiveType.String() + "-" + a.Obj.GetName()
 }
 
-func (a *ArchiveExecutor) setupArgs() ([]string, error) {
+func (a *ArchiveExecutor) setupArgs() []string {
 	args := []string{"-varDir", cfg.Config.PodVarDir, "-archive", "-restoreType", "s3"}
 	if a.archive.Spec.RestoreSpec != nil && len(a.archive.Spec.RestoreSpec.Tags) > 0 {
 		args = append(args, executor.BuildTagArgs(a.archive.Spec.RestoreSpec.Tags)...)
 	}
 	args = append(args, a.appendOptionsArgs()...)
 
-	return args, nil
+	return args
 }
 
 func (a *ArchiveExecutor) setupEnvVars(ctx context.Context, archive *k8upv1.Archive) []corev1.EnvVar {

diff --git a/operator/backupcontroller/backup_utils.go b/operator/backupcontroller/backup_utils.go
@@ -76,14 +76,14 @@ func (b *BackupExecutor) createServiceAccountAndBinding(ctx context.Context) err
 	return err
 }
 
-func (b *BackupExecutor) setupArgs() ([]string, error) {
+func (b *BackupExecutor) setupArgs() []string {
 	args := []string{"--varDir", cfg.Config.PodVarDir}
 	if len(b.backup.Spec.Tags) > 0 {
 		args = append(args, executor.BuildTagArgs(b.backup.Spec.Tags)...)
 	}
 	args = append(args, b.appendOptionsArgs()...)
 
-	return args, nil
+	return args
 }
 
 func (b *BackupExecutor) setupEnvVars() ([]corev1.EnvVar, error) {

diff --git a/operator/backupcontroller/executor.go b/operator/backupcontroller/executor.go
@@ -271,11 +271,10 @@ func (b *BackupExecutor) startBackup(ctx context.Context) error {
 				b.attachMoreVolumeMounts()...,
 			)
 
-			args, argsErr := b.setupArgs()
-			batchJob.job.Spec.Template.Spec.Containers[0].Args = args
+			batchJob.job.Spec.Template.Spec.Containers[0].Args = b.setupArgs()
 
 			index++
-			return argsErr
+			return nil
 		})
 		if err != nil {
 			return fmt.Errorf("unable to createOrUpdate(%q): %w", batchJob.job.Name, err)

diff --git a/operator/checkcontroller/executor.go b/operator/checkcontroller/executor.go
@@ -58,10 +58,9 @@ func (c *CheckExecutor) Execute(ctx context.Context) error {
 		batchJob.Spec.Template.Spec.Volumes = c.attachMoreVolumes()
 		batchJob.Labels[job.K8upExclusive] = "true"
 
-		args, argsErr := c.setupArgs()
-		batchJob.Spec.Template.Spec.Containers[0].Args = args
+		batchJob.Spec.Template.Spec.Containers[0].Args = c.setupArgs()
 
-		return argsErr
+		return nil
 	},
 	)
 	if err != nil {
@@ -76,11 +75,11 @@ func (c *CheckExecutor) jobName() string {
 	return k8upv1.CheckType.String() + "-" + c.check.Name
 }
 
-func (c *CheckExecutor) setupArgs() ([]string, error) {
+func (c *CheckExecutor) setupArgs() []string {
 	args := []string{"-varDir", cfg.Config.PodVarDir, "-check"}
 	args = append(args, c.appendOptionsArgs()...)
 
-	return args, nil
+	return args
 }
 
 func (c *CheckExecutor) setupEnvVars(ctx context.Context) []corev1.EnvVar {

diff --git a/operator/prunecontroller/executor.go b/operator/prunecontroller/executor.go
@@ -52,10 +52,9 @@ func (p *PruneExecutor) Execute(ctx context.Context) error {
 		batchJob.Spec.Template.Spec.Volumes = p.attachMoreVolumes()
 		batchJob.Labels[job.K8upExclusive] = "true"
 
-		args, argsErr := p.setupArgs()
-		batchJob.Spec.Template.Spec.Containers[0].Args = args
+		batchJob.Spec.Template.Spec.Containers[0].Args = p.setupArgs()
 
-		return argsErr
+		return nil
 	})
 	if err != nil {
 		p.SetConditionFalseWithMessage(ctx, k8upv1.ConditionReady, k8upv1.ReasonCreationFailed, "could not create job: %v", err)
@@ -70,14 +69,14 @@ func (p *PruneExecutor) jobName() string {
 	return k8upv1.PruneType.String() + "-" + p.prune.Name
 }
 
-func (p *PruneExecutor) setupArgs() ([]string, error) {
+func (p *PruneExecutor) setupArgs() []string {
 	args := []string{"-varDir", cfg.Config.PodVarDir, "-prune"}
 	if len(p.prune.Spec.Retention.Tags) > 0 {
 		args = append(args, executor.BuildTagArgs(p.prune.Spec.Retention.Tags)...)
 	}
 	args = append(args, p.appendOptionsArgs()...)
 
-	return args, nil
+	return args
 }
 
 // Exclusive should return true for jobs that can't run while other jobs run.