From ee310e3921b21fb163df27fcc1040af6fbb940d0 Mon Sep 17 00:00:00 2001 From: Andy Asp Date: Thu, 15 Aug 2024 16:12:30 -0400 Subject: [PATCH] Add some nolint --- pkg/admission/prep_downscale.go | 3 +++ pkg/admission/zone_tracker.go | 3 +++ 2 files changed, 6 insertions(+) diff --git a/pkg/admission/prep_downscale.go b/pkg/admission/prep_downscale.go index 9026f643d..c48882e76 100644 --- a/pkg/admission/prep_downscale.go +++ b/pkg/admission/prep_downscale.go @@ -138,6 +138,7 @@ func prepareDownscale(ctx context.Context, l log.Logger, ar v1.AdmissionReview, msg := fmt.Sprintf("downscale of %s/%s in %s from %d to %d replicas is not allowed because statefulset %v was downscaled at %v and is labelled to wait %s between zone downscales", ar.Request.Resource.Resource, ar.Request.Name, ar.Request.Namespace, *oldInfo.replicas, *newInfo.replicas, foundSts.name, foundSts.lastDownscaleTime, foundSts.waitTime) level.Warn(logger).Log("msg", msg, "err", err) + //nolint:govet return deny(msg) } foundSts, err = findStatefulSetWithNonUpdatedReplicas(ctx, api, ar.Request.Namespace, stsList, ar.Request.Name) @@ -145,12 +146,14 @@ func prepareDownscale(ctx context.Context, l log.Logger, ar v1.AdmissionReview, msg := fmt.Sprintf("downscale of %s/%s in %s from %d to %d replicas is not allowed because an error occurred while checking whether StatefulSets have non-updated replicas", ar.Request.Resource.Resource, ar.Request.Name, ar.Request.Namespace, *oldInfo.replicas, *newInfo.replicas) level.Warn(logger).Log("msg", msg, "err", err) + //nolint:govet return deny(msg) } if foundSts != nil { msg := fmt.Sprintf("downscale of %s/%s in %s from %d to %d replicas is not allowed because statefulset %v has %d non-updated replicas and %d non-ready replicas", ar.Request.Resource.Resource, ar.Request.Name, ar.Request.Namespace, *oldInfo.replicas, *newInfo.replicas, foundSts.name, foundSts.nonUpdatedReplicas, foundSts.nonReadyReplicas) level.Warn(logger).Log("msg", msg) + //nolint:govet return deny(msg) } } diff --git a/pkg/admission/zone_tracker.go b/pkg/admission/zone_tracker.go index 23f688e0e..aaaaf6d1f 100644 --- a/pkg/admission/zone_tracker.go +++ b/pkg/admission/zone_tracker.go @@ -126,6 +126,7 @@ func (zt *zoneTracker) prepareDownscale(ctx context.Context, l log.Logger, ar v1 msg := fmt.Sprintf("downscale of %s/%s in %s from %d to %d replicas is not allowed because statefulset %v was downscaled at %v and is labelled to wait %s between zone downscales", ar.Request.Resource.Resource, ar.Request.Name, ar.Request.Namespace, *oldInfo.replicas, *newInfo.replicas, foundSts.name, foundSts.lastDownscaleTime, foundSts.waitTime) level.Warn(logger).Log("msg", msg, "err", err) + //nolint:govet return deny(msg) } foundSts, err = findStatefulSetWithNonUpdatedReplicas(ctx, api, ar.Request.Namespace, stsList, ar.Request.Name) @@ -133,12 +134,14 @@ func (zt *zoneTracker) prepareDownscale(ctx context.Context, l log.Logger, ar v1 msg := fmt.Sprintf("downscale of %s/%s in %s from %d to %d replicas is not allowed because an error occurred while checking whether StatefulSets have non-updated replicas", ar.Request.Resource.Resource, ar.Request.Name, ar.Request.Namespace, *oldInfo.replicas, *newInfo.replicas) level.Warn(logger).Log("msg", msg, "err", err) + //nolint:govet return deny(msg) } if foundSts != nil { msg := fmt.Sprintf("downscale of %s/%s in %s from %d to %d replicas is not allowed because statefulset %v has %d non-updated replicas and %d non-ready replicas", ar.Request.Resource.Resource, ar.Request.Name, ar.Request.Namespace, *oldInfo.replicas, *newInfo.replicas, foundSts.name, foundSts.nonUpdatedReplicas, foundSts.nonReadyReplicas) level.Warn(logger).Log("msg", msg) + //nolint:govet return deny(msg) } }