Skip to content

Commit 812a0f9

Browse files
mmorel-35mmorel-35
committed
fix QF1008 rule from staticcheck
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
1 parent d7d20bc commit 812a0f9

31 files changed

+106
-107
lines changed

‎.golangci.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,6 @@ linters:
249249
staticcheck:
250250
checks:
251251
- all
252-
- -QF1008 # Omit embedded fields from selector expression
253252

254253
testifylint:
255254
# TODO: enable them all

‎internal/volume/volumes_information.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ func (v *BackupVolumesInformation) generateVolumeInfoForCSIVolumeSnapshot() {
446446

447447
var operation itemoperation.BackupOperation
448448
for _, op := range v.BackupOperations {
449-
if op.Spec.ResourceIdentifier.GroupResource.String() == kuberesource.VolumeSnapshots.String() &&
449+
if op.Spec.ResourceIdentifier.String() == kuberesource.VolumeSnapshots.String() &&
450450
op.Spec.ResourceIdentifier.Name == volumeSnapshot.Name &&
451451
op.Spec.ResourceIdentifier.Namespace == volumeSnapshot.Namespace {
452452
operation = *op
@@ -567,9 +567,9 @@ func (v *BackupVolumesInformation) generateVolumeInfoFromDataUpload() {
567567
// Retrieve the operations containing DataUpload.
568568
duOperationMap := make(map[kbclient.ObjectKey]*itemoperation.BackupOperation)
569569
for _, operation := range v.BackupOperations {
570-
if operation.Spec.ResourceIdentifier.GroupResource.String() == kuberesource.PersistentVolumeClaims.String() {
570+
if operation.Spec.ResourceIdentifier.String() == kuberesource.PersistentVolumeClaims.String() {
571571
for _, identifier := range operation.Spec.PostOperationItems {
572-
if identifier.GroupResource.String() == "datauploads.velero.io" {
572+
if identifier.String() == "datauploads.velero.io" {
573573
duOperationMap[kbclient.ObjectKey{
574574
Namespace: identifier.Namespace,
575575
Name: identifier.Name,

‎internal/volumehelper/volume_policy_helper.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ func (v volumeHelperImpl) ShouldPerformFSBackup(volume corev1api.Volume, pod cor
148148
var err error
149149
resource = &volume
150150
var pvc = &corev1api.PersistentVolumeClaim{}
151-
if volume.VolumeSource.PersistentVolumeClaim != nil {
151+
if volume.PersistentVolumeClaim != nil {
152152
pvc, err = kubeutil.GetPVCForPodVolume(&volume, &pod, v.client)
153153
if err != nil {
154154
v.logger.WithError(err).Errorf("fail to get PVC for pod %s", pod.Namespace+"/"+pod.Name)

‎pkg/backup/actions/csi/pvc_action.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ func (p *pvcBackupItemAction) validatePVCandPV(
109109
return false, updateItem, errors.WithStack(err)
110110
}
111111

112-
if pv.Spec.PersistentVolumeSource.CSI == nil {
112+
if pv.Spec.CSI == nil {
113113
p.log.Infof(
114114
"Skipping PVC %s/%s, associated PV %s is not a CSI volume",
115115
pvc.Namespace, pvc.Name, pv.Name)
@@ -160,7 +160,7 @@ func (p *pvcBackupItemAction) createVolumeSnapshot(
160160
p.log.Infof("VolumeSnapshotClass=%s", vsClass.Name)
161161

162162
vsLabels := map[string]string{}
163-
for k, v := range pvc.ObjectMeta.Labels {
163+
for k, v := range pvc.Labels {
164164
vsLabels[k] = v
165165
}
166166
vsLabels[velerov1api.BackupNameLabel] = label.GetValidName(backup.Name)
@@ -355,7 +355,7 @@ func (p *pvcBackupItemAction) Execute(
355355
p.log.Infof("Returning from PVCBackupItemAction with %d additionalItems to backup",
356356
len(additionalItems))
357357
for _, ai := range additionalItems {
358-
p.log.Debugf("%s: %s", ai.GroupResource.String(), ai.Name)
358+
p.log.Debugf("%s: %s", ai.String(), ai.Name)
359359
}
360360

361361
pvcMap, err := runtime.DefaultUnstructuredConverter.ToUnstructured(&pvc)

‎pkg/backup/actions/csi/volumesnapshot_action.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ func (p *volumeSnapshotBackupItemAction) Execute(
237237
p.log.Infof("Returning from VolumeSnapshotBackupItemAction with %d additionalItems to backup",
238238
len(additionalItems))
239239
for _, ai := range additionalItems {
240-
p.log.Debugf("%s: %s", ai.GroupResource.String(), ai.Name)
240+
p.log.Debugf("%s: %s", ai.String(), ai.Name)
241241
}
242242

243243
operationID := ""

‎pkg/backup/backup.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ func (kb *kubernetesBackupper) BackupWithResolvers(
279279
)
280280
}
281281

282-
log.Infof("Backing up all volumes using pod volume backup: %t", boolptr.IsSetToTrue(backupRequest.Backup.Spec.DefaultVolumesToFsBackup))
282+
log.Infof("Backing up all volumes using pod volume backup: %t", boolptr.IsSetToTrue(backupRequest.Spec.DefaultVolumesToFsBackup))
283283

284284
var err error
285285
backupRequest.ResourceHooks, err = getResourceHooks(backupRequest.Spec.Hooks.Resources, kb.discoveryHelper)
@@ -344,7 +344,7 @@ func (kb *kubernetesBackupper) BackupWithResolvers(
344344
items := collector.getAllItems()
345345
log.WithField("progress", "").Infof("Collected %d items matching the backup spec from the Kubernetes API (actual number of items backed up may be more or less depending on velero.io/exclude-from-backup annotation, plugins returning additional related items to back up, etc.)", len(items))
346346

347-
updated := backupRequest.Backup.DeepCopy()
347+
updated := backupRequest.DeepCopy()
348348
if updated.Status.Progress == nil {
349349
updated.Status.Progress = &velerov1api.BackupProgress{}
350350
}
@@ -417,7 +417,7 @@ func (kb *kubernetesBackupper) BackupWithResolvers(
417417
lastUpdate = &val
418418
case <-ticker.C:
419419
if lastUpdate != nil {
420-
updated := backupRequest.Backup.DeepCopy()
420+
updated := backupRequest.DeepCopy()
421421
if updated.Status.Progress == nil {
422422
updated.Status.Progress = &velerov1api.BackupProgress{}
423423
}
@@ -591,7 +591,7 @@ func (kb *kubernetesBackupper) BackupWithResolvers(
591591

592592
// do a final update on progress since we may have just added some CRDs and may not have updated
593593
// for the last few processed items.
594-
updated = backupRequest.Backup.DeepCopy()
594+
updated = backupRequest.DeepCopy()
595595
if updated.Status.Progress == nil {
596596
updated.Status.Progress = &velerov1api.BackupProgress{}
597597
}
@@ -668,9 +668,9 @@ func (kb *kubernetesBackupper) executeItemBlockActions(
668668
continue
669669
}
670670
// Item wasn't found in item collector list, get from cluster
671-
gvr, resource, err := itemBlock.itemBackupper.discoveryHelper.ResourceFor(relatedItem.GroupResource.WithVersion(""))
671+
gvr, resource, err := itemBlock.itemBackupper.discoveryHelper.ResourceFor(relatedItem.WithVersion(""))
672672
if err != nil {
673-
log.Error(errors.Wrapf(err, "Unable to obtain gvr and resource for related item %s %s/%s", relatedItem.GroupResource.String(), relatedItem.Namespace, relatedItem.Name))
673+
log.Error(errors.Wrapf(err, "Unable to obtain gvr and resource for related item %s %s/%s", relatedItem.String(), relatedItem.Namespace, relatedItem.Name))
674674
continue
675675
}
676676

@@ -690,7 +690,7 @@ func (kb *kubernetesBackupper) executeItemBlockActions(
690690
continue
691691
}
692692
if err != nil {
693-
log.Error(errors.Wrapf(err, "Error while trying to get related item %s %s/%s from cluster", relatedItem.GroupResource.String(), relatedItem.Namespace, relatedItem.Name))
693+
log.Error(errors.Wrapf(err, "Error while trying to get related item %s %s/%s from cluster", relatedItem.String(), relatedItem.Namespace, relatedItem.Name))
694694
continue
695695
}
696696
itemsMap[relatedItem] = append(itemsMap[relatedItem], &kubernetesResource{
@@ -1080,7 +1080,7 @@ func (kb *kubernetesBackupper) FinalizeBackup(
10801080
}).Infof("Updated %d items out of an estimated total of %d (estimate will change throughout the backup finalizer)", backedUpItems, totalItems)
10811081
}
10821082

1083-
volumeInfos, err := backupStore.GetBackupVolumeInfos(backupRequest.Backup.Name)
1083+
volumeInfos, err := backupStore.GetBackupVolumeInfos(backupRequest.Name)
10841084
if err != nil {
10851085
log.WithError(err).Errorf("fail to get the backup VolumeInfos for backup %s", backupRequest.Name)
10861086
return err

‎pkg/backup/item_backupper.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -432,8 +432,8 @@ func (ib *itemBackupper) executeActions(
432432
now := metav1.Now()
433433
newOperation := itemoperation.BackupOperation{
434434
Spec: itemoperation.BackupOperationSpec{
435-
BackupName: ib.backupRequest.Backup.Name,
436-
BackupUID: string(ib.backupRequest.Backup.UID),
435+
BackupName: ib.backupRequest.Name,
436+
BackupUID: string(ib.backupRequest.UID),
437437
BackupItemAction: action.Name(),
438438
ResourceIdentifier: resourceIdentifier,
439439
OperationID: operationID,
@@ -460,7 +460,7 @@ func (ib *itemBackupper) executeActions(
460460
if len(itemList) == 0 {
461461
log.Infof("Additional Item %s %s/%s not found in ItemBlock, getting from cluster", additionalItem.GroupResource, additionalItem.Namespace, additionalItem.Name)
462462

463-
gvr, resource, err := ib.discoveryHelper.ResourceFor(additionalItem.GroupResource.WithVersion(""))
463+
gvr, resource, err := ib.discoveryHelper.ResourceFor(additionalItem.WithVersion(""))
464464
if err != nil {
465465
return nil, itemFiles, err
466466
}

‎pkg/backup/item_collector.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ func (r *itemCollector) getResourceItems(
369369
)
370370

371371
orders := getOrderedResourcesForType(
372-
r.backupRequest.Backup.Spec.OrderedResources,
372+
r.backupRequest.Spec.OrderedResources,
373373
resource.Name,
374374
)
375375
// Getting the preferred group version of this resource
@@ -758,7 +758,7 @@ func (r *itemCollector) collectNamespaces(
758758
return nil, errors.WithStack(err)
759759
}
760760

761-
for _, includedNSName := range r.backupRequest.Backup.Spec.IncludedNamespaces {
761+
for _, includedNSName := range r.backupRequest.Spec.IncludedNamespaces {
762762
nsExists := false
763763
// Skip checking the namespace existing when it's "*".
764764
if includedNSName == "*" {
@@ -778,17 +778,17 @@ func (r *itemCollector) collectNamespaces(
778778
var singleSelector labels.Selector
779779
var orSelectors []labels.Selector
780780

781-
if r.backupRequest.Backup.Spec.LabelSelector != nil {
781+
if r.backupRequest.Spec.LabelSelector != nil {
782782
var err error
783783
singleSelector, err = metav1.LabelSelectorAsSelector(
784-
r.backupRequest.Backup.Spec.LabelSelector)
784+
r.backupRequest.Spec.LabelSelector)
785785
if err != nil {
786786
log.WithError(err).Errorf("Fail to convert backup LabelSelector %s into selector.",
787-
metav1.FormatLabelSelector(r.backupRequest.Backup.Spec.LabelSelector))
787+
metav1.FormatLabelSelector(r.backupRequest.Spec.LabelSelector))
788788
}
789789
}
790-
if r.backupRequest.Backup.Spec.OrLabelSelectors != nil {
791-
for _, ls := range r.backupRequest.Backup.Spec.OrLabelSelectors {
790+
if r.backupRequest.Spec.OrLabelSelectors != nil {
791+
for _, ls := range r.backupRequest.Spec.OrLabelSelectors {
792792
orSelector, err := metav1.LabelSelectorAsSelector(ls)
793793
if err != nil {
794794
log.WithError(err).Errorf("Fail to convert backup OrLabelSelector %s into selector.",

‎pkg/backup/request.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,5 +83,5 @@ func (r *Request) FillVolumesInformation() {
8383
r.VolumesInformation.NativeSnapshots = r.VolumeSnapshots
8484
r.VolumesInformation.PodVolumeBackups = r.PodVolumeBackups
8585
r.VolumesInformation.BackupOperations = *r.GetItemOperationsList()
86-
r.VolumesInformation.BackupName = r.Backup.Name
86+
r.VolumesInformation.BackupName = r.Name
8787
}

‎pkg/builder/backup_builder.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@ func (b *BackupBuilder) FromSchedule(schedule *velerov1api.Schedule) *BackupBuil
8787

8888
// Check if there's explicit Labels defined in the Schedule object template
8989
// and if present then copy it to the backup object.
90-
if schedule.Spec.Template.Metadata.Labels != nil {
90+
if schedule.Spec.Template.Labels != nil {
9191
logger := logging.DefaultLogger(logging.LogLevelFlag(logrus.InfoLevel).Parse(), logging.NewFormatFlag().Parse())
92-
labels = schedule.Spec.Template.Metadata.Labels
92+
labels = schedule.Spec.Template.Labels
9393
logger.WithFields(logrus.Fields{
9494
"backup": fmt.Sprintf("%s/%s", b.object.GetNamespace(), b.object.GetName()),
9595
"labels": schedule.Spec.Template.Metadata.Labels,

‎pkg/builder/backup_storage_location_builder.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,26 +68,26 @@ func (b *BackupStorageLocationBuilder) Provider(name string) *BackupStorageLocat
6868

6969
// Bucket sets the BackupStorageLocation's object storage bucket.
7070
func (b *BackupStorageLocationBuilder) Bucket(val string) *BackupStorageLocationBuilder {
71-
if b.object.Spec.StorageType.ObjectStorage == nil {
72-
b.object.Spec.StorageType.ObjectStorage = new(velerov1api.ObjectStorageLocation)
71+
if b.object.Spec.ObjectStorage == nil {
72+
b.object.Spec.ObjectStorage = new(velerov1api.ObjectStorageLocation)
7373
}
7474
b.object.Spec.ObjectStorage.Bucket = val
7575
return b
7676
}
7777

7878
// Prefix sets the BackupStorageLocation's object storage prefix.
7979
func (b *BackupStorageLocationBuilder) Prefix(val string) *BackupStorageLocationBuilder {
80-
if b.object.Spec.StorageType.ObjectStorage == nil {
81-
b.object.Spec.StorageType.ObjectStorage = new(velerov1api.ObjectStorageLocation)
80+
if b.object.Spec.ObjectStorage == nil {
81+
b.object.Spec.ObjectStorage = new(velerov1api.ObjectStorageLocation)
8282
}
8383
b.object.Spec.ObjectStorage.Prefix = val
8484
return b
8585
}
8686

8787
// CACert sets the BackupStorageLocation's object storage CACert.
8888
func (b *BackupStorageLocationBuilder) CACert(val []byte) *BackupStorageLocationBuilder {
89-
if b.object.Spec.StorageType.ObjectStorage == nil {
90-
b.object.Spec.StorageType.ObjectStorage = new(velerov1api.ObjectStorageLocation)
89+
if b.object.Spec.ObjectStorage == nil {
90+
b.object.Spec.ObjectStorage = new(velerov1api.ObjectStorageLocation)
9191
}
9292
b.object.Spec.ObjectStorage.CACert = val
9393
return b

‎pkg/cmd/cli/backuplocation/set.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ func (o *SetOptions) Run(c *cobra.Command, f client.Factory) error {
141141
}
142142

143143
location.Spec.Default = boolptr.IsSetToTrue(o.DefaultBackupStorageLocation.Value)
144-
location.Spec.StorageType.ObjectStorage.CACert = caCertData
144+
location.Spec.ObjectStorage.CACert = caCertData
145145

146146
for name, key := range o.Credential.Data() {
147147
location.Spec.Credential = builder.ForSecretKeySelector(name, key).Result()

‎pkg/cmd/util/output/backup_structured_describer.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,12 +234,12 @@ func DescribeBackupStatusInSF(ctx context.Context, kbClient kbclient.Client, d *
234234
if status.StartTimestamp == nil || status.StartTimestamp.Time.IsZero() {
235235
backupStatusInfo["started"] = "<n/a>"
236236
} else {
237-
backupStatusInfo["started"] = status.StartTimestamp.Time.String()
237+
backupStatusInfo["started"] = status.StartTimestamp.String()
238238
}
239239
if status.CompletionTimestamp == nil || status.CompletionTimestamp.Time.IsZero() {
240240
backupStatusInfo["completed"] = "<n/a>"
241241
} else {
242-
backupStatusInfo["completed"] = status.CompletionTimestamp.Time.String()
242+
backupStatusInfo["completed"] = status.CompletionTimestamp.String()
243243
}
244244

245245
// Expiration can't be 0, it is always set to a 30-day default. It can be nil

‎pkg/controller/backup_controller.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ func (b *backupReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr
275275
}
276276

277277
// store ref to just-updated item for creating patch
278-
original = request.Backup.DeepCopy()
278+
original = request.DeepCopy()
279279

280280
b.backupTracker.Add(request.Namespace, request.Name)
281281
defer func() {
@@ -325,7 +325,7 @@ func (b *backupReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr
325325
// BackupPhaseFinalizingPartiallyFailed -> backup_finalizer_controller.go will now reconcile
326326
// BackupPhaseFailed
327327
if err := kubeutil.PatchResourceWithRetriesOnErrors(b.resourceTimeout, original, request.Backup, b.kbClient); err != nil {
328-
log.WithError(err).Errorf("error updating backup's status from %v to %v", original.Status.Phase, request.Backup.Status.Phase)
328+
log.WithError(err).Errorf("error updating backup's status from %v to %v", original.Status.Phase, request.Status.Phase)
329329
}
330330
return ctrl.Result{}, nil
331331
}
@@ -655,7 +655,7 @@ func (b *backupReconciler) runBackup(backup *pkgbackup.Request) error {
655655
return err
656656
}
657657

658-
exists, err := backupStore.BackupExists(backup.StorageLocation.Spec.StorageType.ObjectStorage.Bucket, backup.Name)
658+
exists, err := backupStore.BackupExists(backup.StorageLocation.Spec.ObjectStorage.Bucket, backup.Name)
659659
if exists || err != nil {
660660
backup.Status.Phase = velerov1api.BackupPhaseFailed
661661
backup.Status.CompletionTimestamp = &metav1.Time{Time: b.clock.Now()}
@@ -778,7 +778,7 @@ func recordBackupMetrics(log logrus.FieldLogger, backup *velerov1api.Backup, bac
778778
}
779779

780780
if backup.Status.CompletionTimestamp != nil {
781-
backupDuration := backup.Status.CompletionTimestamp.Time.Sub(backup.Status.StartTimestamp.Time)
781+
backupDuration := backup.Status.CompletionTimestamp.Sub(backup.Status.StartTimestamp.Time)
782782
backupDurationSeconds := float64(backupDuration / time.Second)
783783
serverMetrics.RegisterBackupDuration(backupScheduleName, backupDurationSeconds)
784784
}

‎pkg/controller/backup_deletion_controller.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ func (r *backupDeletionReconciler) Reconcile(ctx context.Context, req ctrl.Reque
331331
}
332332
duList := &velerov2alpha1.DataUploadList{}
333333
log.Info("Removing local datauploads")
334-
if err := r.Client.List(ctx, duList, &client.ListOptions{
334+
if err := r.List(ctx, duList, &client.ListOptions{
335335
Namespace: backup.Namespace,
336336
LabelSelector: labels.SelectorFromSet(map[string]string{
337337
velerov1api.BackupNameLabel: label.GetValidName(backup.Name),
@@ -454,7 +454,7 @@ func (r *backupDeletionReconciler) volumeSnapshottersForVSL(
454454
pluginManager clientmgmt.Manager,
455455
) (vsv1.VolumeSnapshotter, error) {
456456
vsl := &velerov1api.VolumeSnapshotLocation{}
457-
if err := r.Client.Get(ctx, types.NamespacedName{
457+
if err := r.Get(ctx, types.NamespacedName{
458458
Namespace: namespace,
459459
Name: vslName,
460460
}, vsl); err != nil {
@@ -507,7 +507,7 @@ func (r *backupDeletionReconciler) deleteExistingDeletionRequests(ctx context.Co
507507
// when it's running, e.g. due to velero pod restart, and the backup.tar is failed to be downloaded from storage.
508508
func (r *backupDeletionReconciler) deleteCSIVolumeSnapshots(ctx context.Context, backup *velerov1api.Backup, log logrus.FieldLogger) error {
509509
vsList := snapshotv1api.VolumeSnapshotList{}
510-
if err := r.Client.List(ctx, &vsList, &client.ListOptions{
510+
if err := r.List(ctx, &vsList, &client.ListOptions{
511511
LabelSelector: labels.SelectorFromSet(map[string]string{
512512
velerov1api.BackupNameLabel: label.GetValidName(backup.Name),
513513
}),
@@ -541,7 +541,7 @@ func (r *backupDeletionReconciler) deleteMovedSnapshots(ctx context.Context, bac
541541
return nil
542542
}
543543
list := &corev1api.ConfigMapList{}
544-
if err := r.Client.List(ctx, list, &client.ListOptions{
544+
if err := r.List(ctx, list, &client.ListOptions{
545545
Namespace: backup.Namespace,
546546
LabelSelector: labels.SelectorFromSet(
547547
map[string]string{
@@ -588,7 +588,7 @@ func (r *backupDeletionReconciler) deleteMovedSnapshots(ctx context.Context, bac
588588

589589
for i := range list.Items {
590590
cm := list.Items[i]
591-
if err := r.Client.Delete(ctx, &cm); err != nil {
591+
if err := r.Delete(ctx, &cm); err != nil {
592592
r.logger.Warnf("Failed to delete snapshot info configmap %s/%s: %v", cm.Namespace, cm.Name, err)
593593
}
594594
}
@@ -638,7 +638,7 @@ func (r *backupDeletionReconciler) patchBackup(ctx context.Context, backup *vele
638638
return nil, errors.Wrap(err, "error creating json merge patch for Backup")
639639
}
640640

641-
if err := r.Client.Patch(ctx, backup, client.RawPatch(types.MergePatchType, patchBytes)); err != nil {
641+
if err := r.Patch(ctx, backup, client.RawPatch(types.MergePatchType, patchBytes)); err != nil {
642642
return nil, errors.Wrap(err, "error patching Backup")
643643
}
644644
return backup, nil

‎pkg/controller/backup_operations_controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,15 +268,15 @@ func (c *backupOperationsReconciler) updateBackupAndOperationsJSON(
268268
}
269269
}
270270
// update backup
271-
err := c.Client.Patch(ctx, backup, client.MergeFrom(original))
271+
err := c.Patch(ctx, backup, client.MergeFrom(original))
272272
if err != nil {
273273
removeIfComplete = false
274274
return errors.Wrapf(err, "error updating Backup %s", backup.Name)
275275
}
276276
} else if completionChanges {
277277
// If backup is still incomplete and no new errors are found but there are some new operations
278278
// completed, patch backup to reflect new completion numbers, but don't upload detailed json file
279-
err := c.Client.Patch(ctx, backup, client.MergeFrom(original))
279+
err := c.Patch(ctx, backup, client.MergeFrom(original))
280280
if err != nil {
281281
return errors.Wrapf(err, "error updating Backup %s", backup.Name)
282282
}

‎pkg/controller/backup_repository_controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,8 @@ func (r *BackupRepoReconciler) needInvalidBackupRepo(oldObj client.Object, newOb
146146
oldBSL := oldObj.(*velerov1api.BackupStorageLocation)
147147
newBSL := newObj.(*velerov1api.BackupStorageLocation)
148148

149-
oldStorage := oldBSL.Spec.StorageType.ObjectStorage
150-
newStorage := newBSL.Spec.StorageType.ObjectStorage
149+
oldStorage := oldBSL.Spec.ObjectStorage
150+
newStorage := newBSL.Spec.ObjectStorage
151151
oldConfig := oldBSL.Spec.Config
152152
newConfig := newBSL.Spec.Config
153153

0 commit comments

Comments
 (0)