Skip to content

Commit

Permalink
Enable govet in golangci-lint config; disable make vet (#1810)
Browse files Browse the repository at this point in the history
  • Loading branch information
alexandear committed Mar 13, 2024
1 parent e7c479a commit 74d17e3
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
4 changes: 4 additions & 0 deletions .golangci.yaml
Expand Up @@ -14,12 +14,16 @@ linters-settings:
- dupImport
goimports:
local-prefixes: sigs.k8s.io/kueue
govet:
enable:
- nilness

# Settings for enabling and disabling linters
linters:
enable:
- ginkgolinter
- gocritic
- goimports
- govet
- misspell
- unconvert
2 changes: 1 addition & 1 deletion Makefile
Expand Up @@ -208,7 +208,7 @@ ci-lint: golangci-lint
$(GOLANGCI_LINT) run --timeout 15m0s

.PHONY: verify
verify: gomod-verify vet ci-lint fmt-verify shell-lint toc-verify manifests generate update-helm generate-apiref prepare-release-branch
verify: gomod-verify ci-lint fmt-verify shell-lint toc-verify manifests generate update-helm generate-apiref prepare-release-branch
git --no-pager diff --exit-code config/components apis charts/kueue/templates client-go site/

##@ Build
Expand Down
4 changes: 1 addition & 3 deletions pkg/controller/jobframework/reconciler.go
Expand Up @@ -292,9 +292,7 @@ func (r *JobReconciler) ReconcileGenericJob(ctx context.Context, req ctrl.Reques
err := r.stopJob(ctx, job, wl, StopReasonWorkloadDeleted, "Workload is deleted")
if err != nil {
log.Error(err, "Suspending job with deleted workload")
}

if err == nil && wl != nil {
} else {
err = workload.RemoveFinalizer(ctx, r.client, wl)
}
return ctrl.Result{}, err
Expand Down

0 comments on commit 74d17e3

Please sign in to comment.