Skip to content

Commit 8bb1db8

Browse files
dsessler7dsessler7
committed
Remove unnecessary error return value from generateBackupJobIntent.
1 parent 95c50a2 commit 8bb1db8

File tree

2 files changed

+18
-39
lines changed

2 files changed

+18
-39
lines changed

‎internal/controller/postgrescluster/pgbackrest.go‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -773,7 +773,7 @@ func (r *Reconciler) generateRepoVolumeIntent(postgresCluster *v1beta1.PostgresC
773773
// generateBackupJobSpecIntent generates a JobSpec for a pgBackRest backup job
774774
func generateBackupJobSpecIntent(ctx context.Context, postgresCluster *v1beta1.PostgresCluster,
775775
repo v1beta1.PGBackRestRepo, serviceAccountName string,
776-
labels, annotations map[string]string, opts ...string) (*batchv1.JobSpec, error) {
776+
labels, annotations map[string]string, opts ...string) *batchv1.JobSpec {
777777

778778
repoIndex := regexRepoIndex.FindString(repo.Name)
779779
cmdOpts := []string{
@@ -875,7 +875,7 @@ func generateBackupJobSpecIntent(ctx context.Context, postgresCluster *v1beta1.P
875875
pgbackrest.AddConfigToCloudBackupJob(postgresCluster, &jobSpec.Template)
876876
}
877877

878-
return jobSpec, nil
878+
return jobSpec
879879
}
880880

881881
// +kubebuilder:rbac:groups="",resources="configmaps",verbs={delete,list}
@@ -2454,11 +2454,8 @@ func (r *Reconciler) reconcileManualBackup(ctx context.Context,
24542454
backupJob.Labels = labels
24552455
backupJob.Annotations = annotations
24562456

2457-
spec, err := generateBackupJobSpecIntent(ctx, postgresCluster, repo,
2457+
spec := generateBackupJobSpecIntent(ctx, postgresCluster, repo,
24582458
serviceAccount.GetName(), labels, annotations, backupOpts...)
2459-
if err != nil {
2460-
return errors.WithStack(err)
2461-
}
24622459

24632460
backupJob.Spec = *spec
24642461

@@ -2634,11 +2631,8 @@ func (r *Reconciler) reconcileReplicaCreateBackup(ctx context.Context,
26342631
backupJob.Labels = labels
26352632
backupJob.Annotations = annotations
26362633

2637-
spec, err := generateBackupJobSpecIntent(ctx, postgresCluster, replicaCreateRepo,
2634+
spec := generateBackupJobSpecIntent(ctx, postgresCluster, replicaCreateRepo,
26382635
serviceAccount.GetName(), labels, annotations)
2639-
if err != nil {
2640-
return errors.WithStack(err)
2641-
}
26422636

26432637
backupJob.Spec = *spec
26442638

@@ -3064,11 +3058,8 @@ func (r *Reconciler) reconcilePGBackRestCronJob(
30643058
// set backup type (i.e. "full", "diff", "incr")
30653059
backupOpts := []string{"--type=" + backupType}
30663060

3067-
jobSpec, err := generateBackupJobSpecIntent(ctx, cluster, repo,
3061+
jobSpec := generateBackupJobSpecIntent(ctx, cluster, repo,
30683062
serviceAccount.GetName(), labels, annotations, backupOpts...)
3069-
if err != nil {
3070-
return errors.WithStack(err)
3071-
}
30723063

30733064
// Suspend cronjobs when shutdown or read-only. Any jobs that have already
30743065
// started will continue.
@@ -3101,7 +3092,7 @@ func (r *Reconciler) reconcilePGBackRestCronJob(
31013092

31023093
// set metadata
31033094
pgBackRestCronJob.SetGroupVersionKind(batchv1.SchemeGroupVersion.WithKind("CronJob"))
3104-
err = errors.WithStack(r.setControllerReference(cluster, pgBackRestCronJob))
3095+
err := errors.WithStack(r.setControllerReference(cluster, pgBackRestCronJob))
31053096

31063097
if err == nil {
31073098
err = r.apply(ctx, pgBackRestCronJob)

‎internal/controller/postgrescluster/pgbackrest_test.go‎

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2609,12 +2609,11 @@ func TestGenerateBackupJobIntent(t *testing.T) {
26092609
// The code assumes that if repo.Volume is nil, then it is a cloud repo backup,
26102610
// therefore, an "empty" input results in a job spec for a cloud repo backup
26112611
t.Run("empty", func(t *testing.T) {
2612-
spec, err := generateBackupJobSpecIntent(ctx,
2612+
spec := generateBackupJobSpecIntent(ctx,
26132613
&cluster, v1beta1.PGBackRestRepo{},
26142614
"",
26152615
nil, nil,
26162616
)
2617-
assert.NilError(t, err)
26182617
assert.Assert(t, cmp.MarshalMatches(spec.Template.Spec, `
26192618
containers:
26202619
- command:
@@ -2671,7 +2670,7 @@ volumes:
26712670
})
26722671

26732672
t.Run("volumeRepo", func(t *testing.T) {
2674-
spec, err := generateBackupJobSpecIntent(ctx,
2673+
spec := generateBackupJobSpecIntent(ctx,
26752674
&cluster, v1beta1.PGBackRestRepo{
26762675
Volume: &v1beta1.RepoPVC{
26772676
VolumeClaimSpec: v1beta1.VolumeClaimSpec{},
@@ -2680,7 +2679,6 @@ volumes:
26802679
"",
26812680
nil, nil,
26822681
)
2683-
assert.NilError(t, err)
26842682
assert.Assert(t, cmp.MarshalMatches(spec.Template.Spec, `
26852683
containers:
26862684
- command:
@@ -2749,12 +2747,11 @@ volumes:
27492747
ImagePullPolicy: corev1.PullAlways,
27502748
},
27512749
}
2752-
job, err := generateBackupJobSpecIntent(ctx,
2750+
job := generateBackupJobSpecIntent(ctx,
27532751
cluster, v1beta1.PGBackRestRepo{},
27542752
"",
27552753
nil, nil,
27562754
)
2757-
assert.NilError(t, err)
27582755
assert.Equal(t, job.Template.Spec.Containers[0].ImagePullPolicy, corev1.PullAlways)
27592756
})
27602757

@@ -2765,12 +2762,11 @@ volumes:
27652762
cluster.Spec.Backups = v1beta1.Backups{
27662763
PGBackRest: v1beta1.PGBackRestArchive{},
27672764
}
2768-
job, err := generateBackupJobSpecIntent(ctx,
2765+
job := generateBackupJobSpecIntent(ctx,
27692766
cluster, v1beta1.PGBackRestRepo{},
27702767
"",
27712768
nil, nil,
27722769
)
2773-
assert.NilError(t, err)
27742770
assert.DeepEqual(t, job.Template.Spec.Containers[0].Resources,
27752771
corev1.ResourceRequirements{})
27762772
})
@@ -2783,12 +2779,11 @@ volumes:
27832779
},
27842780
},
27852781
}
2786-
job, err := generateBackupJobSpecIntent(ctx,
2782+
job := generateBackupJobSpecIntent(ctx,
27872783
cluster, v1beta1.PGBackRestRepo{},
27882784
"",
27892785
nil, nil,
27902786
)
2791-
assert.NilError(t, err)
27922787
assert.DeepEqual(t, job.Template.Spec.Containers[0].Resources,
27932788
corev1.ResourceRequirements{
27942789
Requests: corev1.ResourceList{
@@ -2823,12 +2818,11 @@ volumes:
28232818
},
28242819
},
28252820
}
2826-
job, err := generateBackupJobSpecIntent(ctx,
2821+
job := generateBackupJobSpecIntent(ctx,
28272822
cluster, v1beta1.PGBackRestRepo{},
28282823
"",
28292824
nil, nil,
28302825
)
2831-
assert.NilError(t, err)
28322826
assert.Equal(t, job.Template.Spec.Affinity, affinity)
28332827
})
28342828

@@ -2837,12 +2831,11 @@ volumes:
28372831
cluster.Spec.Backups.PGBackRest.Jobs = &v1beta1.BackupJobs{
28382832
PriorityClassName: initialize.String("some-priority-class"),
28392833
}
2840-
job, err := generateBackupJobSpecIntent(ctx,
2834+
job := generateBackupJobSpecIntent(ctx,
28412835
cluster, v1beta1.PGBackRestRepo{},
28422836
"",
28432837
nil, nil,
28442838
)
2845-
assert.NilError(t, err)
28462839
assert.Equal(t, job.Template.Spec.PriorityClassName, "some-priority-class")
28472840
})
28482841

@@ -2856,12 +2849,11 @@ volumes:
28562849
cluster.Spec.Backups.PGBackRest.Jobs = &v1beta1.BackupJobs{
28572850
Tolerations: tolerations,
28582851
}
2859-
job, err := generateBackupJobSpecIntent(ctx,
2852+
job := generateBackupJobSpecIntent(ctx,
28602853
cluster, v1beta1.PGBackRestRepo{},
28612854
"",
28622855
nil, nil,
28632856
)
2864-
assert.NilError(t, err)
28652857
assert.DeepEqual(t, job.Template.Spec.Tolerations, tolerations)
28662858
})
28672859

@@ -2871,18 +2863,16 @@ volumes:
28712863
t.Run("Undefined", func(t *testing.T) {
28722864
cluster.Spec.Backups.PGBackRest.Jobs = nil
28732865

2874-
spec, err := generateBackupJobSpecIntent(ctx,
2866+
spec := generateBackupJobSpecIntent(ctx,
28752867
cluster, v1beta1.PGBackRestRepo{}, "", nil, nil,
28762868
)
2877-
assert.NilError(t, err)
28782869
assert.Assert(t, spec.TTLSecondsAfterFinished == nil)
28792870

28802871
cluster.Spec.Backups.PGBackRest.Jobs = &v1beta1.BackupJobs{}
28812872

2882-
spec, err = generateBackupJobSpecIntent(ctx,
2873+
spec = generateBackupJobSpecIntent(ctx,
28832874
cluster, v1beta1.PGBackRestRepo{}, "", nil, nil,
28842875
)
2885-
assert.NilError(t, err)
28862876
assert.Assert(t, spec.TTLSecondsAfterFinished == nil)
28872877
})
28882878

@@ -2891,10 +2881,9 @@ volumes:
28912881
TTLSecondsAfterFinished: initialize.Int32(0),
28922882
}
28932883

2894-
spec, err := generateBackupJobSpecIntent(ctx,
2884+
spec := generateBackupJobSpecIntent(ctx,
28952885
cluster, v1beta1.PGBackRestRepo{}, "", nil, nil,
28962886
)
2897-
assert.NilError(t, err)
28982887
if assert.Check(t, spec.TTLSecondsAfterFinished != nil) {
28992888
assert.Equal(t, *spec.TTLSecondsAfterFinished, int32(0))
29002889
}
@@ -2905,10 +2894,9 @@ volumes:
29052894
TTLSecondsAfterFinished: initialize.Int32(100),
29062895
}
29072896

2908-
spec, err := generateBackupJobSpecIntent(ctx,
2897+
spec := generateBackupJobSpecIntent(ctx,
29092898
cluster, v1beta1.PGBackRestRepo{}, "", nil, nil,
29102899
)
2911-
assert.NilError(t, err)
29122900
if assert.Check(t, spec.TTLSecondsAfterFinished != nil) {
29132901
assert.Equal(t, *spec.TTLSecondsAfterFinished, int32(100))
29142902
}

0 commit comments

Comments
 (0)