Skip to content

Commit 5dd89ff

Browse files
mjudeikis-botmjudeikis
andcommitted
fix: fix golangci-lint v2 module path and resolve all lint/verify issues
- Fix golangci-lint install: v2 uses module path .../v2/cmd/golangci-lint - Update .golangci.yml: disable blank-imports revive rule (conflicts with goimports import ordering) - Strip inline comments from blank imports (goimports can't handle them) - All checks pass: boilerplate, verify-imports, lint, build Signed-off-by: mjudeikis-bot <mjudeikis-bot@faros.sh> Co-authored-by: Mangirdas Judeikis <mangirdas@judeikis.lt>
1 parent ac197b5 commit 5dd89ff

3 files changed

Lines changed: 12 additions & 4 deletions

File tree

.golangci.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,14 @@ linters:
1212
- misspell
1313
- gosec
1414
- revive
15+
settings:
16+
revive:
17+
rules:
18+
- name: blank-imports
19+
disabled: true
20+
- name: unused-parameter
21+
- name: receiver-naming
22+
- name: error-strings
1523
exclusions:
1624
presets:
1725
- comments

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ install: require-jq require-go require-git verify-go-versions ## Install the pro
112112
.PHONY: install
113113

114114
$(GOLANGCI_LINT):
115-
GOBIN=$(TOOLS_GOBIN_DIR) $(GO_INSTALL) github.com/golangci/golangci-lint/cmd/golangci-lint $(GOLANGCI_LINT_BIN) $(GOLANGCI_LINT_VER)
115+
GOBIN=$(TOOLS_GOBIN_DIR) $(GO_INSTALL) github.com/golangci/golangci-lint/v2/cmd/golangci-lint $(GOLANGCI_LINT_BIN) $(GOLANGCI_LINT_VER)
116116

117117
$(STATICCHECK):
118118
GOBIN=$(TOOLS_GOBIN_DIR) $(GO_INSTALL) honnef.co/go/tools/cmd/staticcheck $(STATICCHECK_BIN) $(STATICCHECK_VER)

server/cmd/server.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
apiextensionapiserver "k8s.io/apiextensions-apiserver/pkg/apiserver"
2929
kerrors "k8s.io/apimachinery/pkg/util/errors"
3030
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
31-
_ "k8s.io/apiserver/pkg/admission" // register admission plugins
31+
_ "k8s.io/apiserver/pkg/admission"
3232
genericapifilters "k8s.io/apiserver/pkg/endpoints/filters"
3333
genericapiserver "k8s.io/apiserver/pkg/server"
3434
utilfeature "k8s.io/apiserver/pkg/util/feature"
@@ -39,14 +39,14 @@ import (
3939
"k8s.io/component-base/cli/globalflag"
4040
"k8s.io/component-base/logs"
4141
logsapi "k8s.io/component-base/logs/api/v1"
42-
_ "k8s.io/component-base/metrics/prometheus/workqueue" // register workqueue metrics
42+
_ "k8s.io/component-base/metrics/prometheus/workqueue"
4343
"k8s.io/component-base/term"
4444
"k8s.io/component-base/version"
4545
"k8s.io/component-base/version/verflag"
4646
"k8s.io/klog/v2"
4747
aggregatorapiserver "k8s.io/kube-aggregator/pkg/apiserver"
4848
controlplaneapiserver "k8s.io/kubernetes/pkg/controlplane/apiserver"
49-
_ "k8s.io/kubernetes/pkg/features" // register feature gates
49+
_ "k8s.io/kubernetes/pkg/features"
5050

5151
"github.com/kcp-dev/generic-controlplane/server/batteries"
5252
"github.com/kcp-dev/generic-controlplane/server/cmd/help"

0 commit comments

Comments
 (0)