Skip to content

Commit 0258525

Browse files
committed
fix lint
1 parent 5536c88 commit 0258525

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

pkg/controller/pshibernation/controller.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ func (r *PerconaServerMySQLHibernationReconciler) pauseCluster(ctx context.Conte
582582
return k8sretry.RetryOnConflict(k8sretry.DefaultRetry, func() error {
583583
// Get fresh copy of the cluster
584584
fresh := &apiv1.PerconaServerMySQL{}
585-
if err := r.Client.Get(ctx, types.NamespacedName{Name: cr.Name, Namespace: cr.Namespace}, fresh); err != nil {
585+
if err := r.Get(ctx, types.NamespacedName{Name: cr.Name, Namespace: cr.Namespace}, fresh); err != nil {
586586
log.Error(err, "Failed to get fresh cluster copy", "cluster", cr.Name, "namespace", cr.Namespace)
587587
return err
588588
}
@@ -591,7 +591,7 @@ func (r *PerconaServerMySQLHibernationReconciler) pauseCluster(ctx context.Conte
591591
fresh.Spec.Pause = true
592592

593593
// Update the cluster
594-
if err := r.Client.Update(ctx, fresh); err != nil {
594+
if err := r.Update(ctx, fresh); err != nil {
595595
log.Error(err, "Failed to update cluster spec", "cluster", cr.Name, "namespace", cr.Namespace)
596596
return err
597597
}
@@ -632,7 +632,7 @@ func (r *PerconaServerMySQLHibernationReconciler) unpauseCluster(ctx context.Con
632632
return k8sretry.RetryOnConflict(k8sretry.DefaultRetry, func() error {
633633
// Get fresh copy of the cluster
634634
fresh := &apiv1.PerconaServerMySQL{}
635-
if err := r.Client.Get(ctx, types.NamespacedName{Name: cr.Name, Namespace: cr.Namespace}, fresh); err != nil {
635+
if err := r.Get(ctx, types.NamespacedName{Name: cr.Name, Namespace: cr.Namespace}, fresh); err != nil {
636636
log.Error(err, "Failed to get fresh cluster copy", "cluster", cr.Name, "namespace", cr.Namespace)
637637
return err
638638
}
@@ -641,7 +641,7 @@ func (r *PerconaServerMySQLHibernationReconciler) unpauseCluster(ctx context.Con
641641
fresh.Spec.Pause = false
642642

643643
// Update the cluster
644-
if err := r.Client.Update(ctx, fresh); err != nil {
644+
if err := r.Update(ctx, fresh); err != nil {
645645
log.Error(err, "Failed to update cluster spec", "cluster", cr.Name, "namespace", cr.Namespace)
646646
return err
647647
}
@@ -682,7 +682,7 @@ func (r *PerconaServerMySQLHibernationReconciler) updateHibernationState(ctx con
682682
return k8sretry.RetryOnConflict(k8sretry.DefaultRetry, func() error {
683683
// Get fresh copy of the cluster
684684
fresh := &apiv1.PerconaServerMySQL{}
685-
if err := r.Client.Get(ctx, types.NamespacedName{Name: cr.Name, Namespace: cr.Namespace}, fresh); err != nil {
685+
if err := r.Get(ctx, types.NamespacedName{Name: cr.Name, Namespace: cr.Namespace}, fresh); err != nil {
686686
log.Error(err, "Failed to get fresh cluster copy for status update", "cluster", cr.Name, "namespace", cr.Namespace)
687687
return err
688688
}
@@ -725,7 +725,7 @@ func (r *PerconaServerMySQLHibernationReconciler) initializeHibernationStatus(ct
725725
return k8sretry.RetryOnConflict(k8sretry.DefaultRetry, func() error {
726726
// Get fresh copy of the cluster
727727
fresh := &apiv1.PerconaServerMySQL{}
728-
if err := r.Client.Get(ctx, types.NamespacedName{Name: cr.Name, Namespace: cr.Namespace}, fresh); err != nil {
728+
if err := r.Get(ctx, types.NamespacedName{Name: cr.Name, Namespace: cr.Namespace}, fresh); err != nil {
729729
log.Error(err, "Failed to get fresh cluster copy for status initialization", "cluster", cr.Name, "namespace", cr.Namespace)
730730
return err
731731
}
@@ -866,7 +866,7 @@ func (r *PerconaServerMySQLHibernationReconciler) updateHibernationNextTimes(ctx
866866
return k8sretry.RetryOnConflict(k8sretry.DefaultRetry, func() error {
867867
// Get fresh copy of the cluster
868868
fresh := &apiv1.PerconaServerMySQL{}
869-
if err := r.Client.Get(ctx, types.NamespacedName{Name: cr.Name, Namespace: cr.Namespace}, fresh); err != nil {
869+
if err := r.Get(ctx, types.NamespacedName{Name: cr.Name, Namespace: cr.Namespace}, fresh); err != nil {
870870
log.Error(err, "Failed to get fresh cluster copy for schedule update", "cluster", cr.Name, "namespace", cr.Namespace)
871871
return err
872872
}

pkg/controller/pshibernation/controller_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -798,7 +798,7 @@ func TestPerconaServerMySQLHibernationReconciler_shouldUnpauseCluster(t *testing
798798
t.Logf(" Schedule: %s", tt.schedule)
799799
t.Logf(" Current time: %s", tt.now.Format(time.RFC3339))
800800
if tt.cr.Status.Hibernation != nil && tt.cr.Status.Hibernation.LastPauseTime != nil {
801-
t.Logf(" LastPauseTime: %s", tt.cr.Status.Hibernation.LastPauseTime.Time.Format(time.RFC3339))
801+
t.Logf(" LastPauseTime: %s", tt.cr.Status.Hibernation.LastPauseTime.Format(time.RFC3339))
802802
}
803803
}
804804
assert.Equal(t, tt.expectedResult, result)

0 commit comments

Comments
 (0)