diff --git a/Makefile b/Makefile index 208d3278..2412fd5e 100644 --- a/Makefile +++ b/Makefile @@ -268,7 +268,7 @@ lint: $(BUILD_DIRS) --env GO111MODULE=on \ --env GOFLAGS="-mod=vendor" \ $(BUILD_IMAGE) \ - golangci-lint run --enable $(ADDTL_LINTERS) --timeout=10m --skip-files="generated.*\.go$\" --skip-dirs-use-default + golangci-lint run --enable $(ADDTL_LINTERS) --timeout=10m --exclude-files="generated.*\.go$\" --exclude-dirs-use-default $(BUILD_DIRS): @mkdir -p $@ diff --git a/prometheus/v1/servicemonitor.go b/prometheus/v1/servicemonitor.go index bc1f07f6..fb3aa9ea 100644 --- a/prometheus/v1/servicemonitor.go +++ b/prometheus/v1/servicemonitor.go @@ -97,7 +97,6 @@ func TryUpdateMonitorObject(ctx context.Context, c prom.MonitoringV1Interface, m klog.Errorf("Attempt %d failed to update ServiceMonitor %s/%s due to %v.", attempt, cur.Namespace, cur.Name, e2) return false, nil }) - if err != nil { err = errors.Errorf("failed to update ServiceMonitor %s/%s after %d attempts due to %v", meta.Namespace, meta.Name, attempt, err) }