From 337003732f2a7aeea1188cd665236a5fd0bca5c7 Mon Sep 17 00:00:00 2001 From: Omer Aplatony Date: Fri, 29 Nov 2024 12:13:55 +0200 Subject: [PATCH 1/2] Chore: fixed lints errors Signed-off-by: Omer Aplatony --- .../eviction/pods_eviction_restriction_test.go | 3 ++- .../updater/priority/update_priority_calculator.go | 4 ++-- .../pkg/utils/status/status_object.go | 11 ++++++----- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/vertical-pod-autoscaler/pkg/updater/eviction/pods_eviction_restriction_test.go b/vertical-pod-autoscaler/pkg/updater/eviction/pods_eviction_restriction_test.go index 86918c7c5fed..8ed233860e79 100644 --- a/vertical-pod-autoscaler/pkg/updater/eviction/pods_eviction_restriction_test.go +++ b/vertical-pod-autoscaler/pkg/updater/eviction/pods_eviction_restriction_test.go @@ -642,7 +642,8 @@ func TestEvictEmitEvent(t *testing.T) { mockRecorder.On("Event", mock.Anything, apiv1.EventTypeNormal, "EvictedByVPA", mock.Anything).Return() mockRecorder.On("Event", mock.Anything, apiv1.EventTypeNormal, "EvictedPod", mock.Anything).Return() - eviction.Evict(p.pod, testCase.vpa, mockRecorder) + err := eviction.Evict(p.pod, testCase.vpa, mockRecorder) + assert.NoError(t, err) if p.canEvict { mockRecorder.AssertNumberOfCalls(t, "Event", 2) diff --git a/vertical-pod-autoscaler/pkg/updater/priority/update_priority_calculator.go b/vertical-pod-autoscaler/pkg/updater/priority/update_priority_calculator.go index 5ae8361c1d70..047782122fef 100644 --- a/vertical-pod-autoscaler/pkg/updater/priority/update_priority_calculator.go +++ b/vertical-pod-autoscaler/pkg/updater/priority/update_priority_calculator.go @@ -193,9 +193,9 @@ func (calc *UpdatePriorityCalculator) GetProcessedRecommendationTargets(r *vpa_t return sb.String() } -func parseVpaObservedContainers(pod *apiv1.Pod) (bool, sets.String) { +func parseVpaObservedContainers(pod *apiv1.Pod) (bool, sets.Set[string]) { observedContainers, hasObservedContainers := pod.GetAnnotations()[annotations.VpaObservedContainersLabel] - vpaContainerSet := sets.NewString() + vpaContainerSet := sets.New[string]() if hasObservedContainers { if containers, err := annotations.ParseVpaObservedContainersValue(observedContainers); err != nil { klog.ErrorS(err, "VPA annotation failed to parse", "pod", klog.KObj(pod), "annotation", observedContainers) diff --git a/vertical-pod-autoscaler/pkg/utils/status/status_object.go b/vertical-pod-autoscaler/pkg/utils/status/status_object.go index 19b3c4aed10d..7c8373a463c5 100644 --- a/vertical-pod-autoscaler/pkg/utils/status/status_object.go +++ b/vertical-pod-autoscaler/pkg/utils/status/status_object.go @@ -28,7 +28,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" clientset "k8s.io/client-go/kubernetes" typedcoordinationv1 "k8s.io/client-go/kubernetes/typed/coordination/v1" - "k8s.io/utils/pointer" + "k8s.io/utils/ptr" ) const ( @@ -97,7 +97,7 @@ func (c *Client) UpdateStatus(ctx context.Context) error { return err } lease.Spec.RenewTime = &metav1.MicroTime{Time: time.Now()} - lease.Spec.HolderIdentity = pointer.String(c.holderIdentity) + lease.Spec.HolderIdentity = ptr.To(c.holderIdentity) _, err = c.client.Update(ctx, lease, metav1.UpdateOptions{}) if apierrors.IsConflict(err) { // Lease was updated by an another replica of the component. @@ -126,8 +126,9 @@ func (c *Client) newLease() *apicoordinationv1.Lease { Namespace: c.leaseNamespace, }, Spec: apicoordinationv1.LeaseSpec{ - HolderIdentity: pointer.String(c.holderIdentity), - LeaseDurationSeconds: pointer.Int32(c.leaseDurationSeconds), + HolderIdentity: ptr.To(c.holderIdentity), + + LeaseDurationSeconds: ptr.To(c.leaseDurationSeconds), }, } } @@ -174,7 +175,7 @@ func isRetryableAPIError(err error) bool { func isRetryableNetError(err error) bool { if netError, ok := err.(net.Error); ok { - return netError.Temporary() || netError.Timeout() + return netError.Timeout() } return false } From 38e6da474f992ea3d2d4cdf46de739dcc17855da Mon Sep 17 00:00:00 2001 From: Omer Aplatony Date: Fri, 29 Nov 2024 12:27:06 +0200 Subject: [PATCH 2/2] Ignore err Signed-off-by: Omer Aplatony --- .../pkg/updater/eviction/pods_eviction_restriction_test.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/vertical-pod-autoscaler/pkg/updater/eviction/pods_eviction_restriction_test.go b/vertical-pod-autoscaler/pkg/updater/eviction/pods_eviction_restriction_test.go index 8ed233860e79..7f93c33df371 100644 --- a/vertical-pod-autoscaler/pkg/updater/eviction/pods_eviction_restriction_test.go +++ b/vertical-pod-autoscaler/pkg/updater/eviction/pods_eviction_restriction_test.go @@ -642,8 +642,7 @@ func TestEvictEmitEvent(t *testing.T) { mockRecorder.On("Event", mock.Anything, apiv1.EventTypeNormal, "EvictedByVPA", mock.Anything).Return() mockRecorder.On("Event", mock.Anything, apiv1.EventTypeNormal, "EvictedPod", mock.Anything).Return() - err := eviction.Evict(p.pod, testCase.vpa, mockRecorder) - assert.NoError(t, err) + _ = eviction.Evict(p.pod, testCase.vpa, mockRecorder) if p.canEvict { mockRecorder.AssertNumberOfCalls(t, "Event", 2)