diff --git a/build.env b/build.env index 0f474fbe18b..e7d9aaa77dc 100644 --- a/build.env +++ b/build.env @@ -26,7 +26,7 @@ GO111MODULE=on COMMITLINT_VERSION=latest # static checks and linters -GOLANGCI_VERSION=v1.57.2 +GOLANGCI_VERSION=v1.60.3 # external snapshotter version # Refer: https://github.com/kubernetes-csi/external-snapshotter/releases diff --git a/e2e/rbd_helper.go b/e2e/rbd_helper.go index 786660722df..7a00871e896 100644 --- a/e2e/rbd_helper.go +++ b/e2e/rbd_helper.go @@ -36,7 +36,7 @@ import ( "k8s.io/kubernetes/test/e2e/framework" ) -//nolint:gomnd // numbers specify Kernel versions. +//nolint:mnd // numbers specify Kernel versions. var nbdResizeSupport = []util.KernelVersion{ { Version: 5, @@ -48,7 +48,7 @@ var nbdResizeSupport = []util.KernelVersion{ }, // standard 5.3+ versions } -//nolint:gomnd // numbers specify Kernel versions. +//nolint:mnd // numbers specify Kernel versions. var fastDiffSupport = []util.KernelVersion{ { Version: 5, @@ -60,7 +60,7 @@ var fastDiffSupport = []util.KernelVersion{ }, // standard 5.3+ versions } -//nolint:gomnd // numbers specify Kernel versions. +//nolint:mnd // numbers specify Kernel versions. var deepFlattenSupport = []util.KernelVersion{ { Version: 5, @@ -75,7 +75,7 @@ var deepFlattenSupport = []util.KernelVersion{ // To use `io-timeout=0` we need // www.mail-archive.com/linux-block@vger.kernel.org/msg38060.html // -//nolint:gomnd // numbers specify Kernel versions. +//nolint:mnd // numbers specify Kernel versions. var nbdZeroIOtimeoutSupport = []util.KernelVersion{ { Version: 5, diff --git a/internal/cephfs/mounter/volumemounter.go b/internal/cephfs/mounter/volumemounter.go index 986ac6ee6b0..edf85f5d0df 100644 --- a/internal/cephfs/mounter/volumemounter.go +++ b/internal/cephfs/mounter/volumemounter.go @@ -31,7 +31,7 @@ import ( var ( availableMounters []string - //nolint:gomnd // numbers specify Kernel versions. + //nolint:mnd // numbers specify Kernel versions. quotaSupport = []util.KernelVersion{ { Version: 4, diff --git a/internal/rbd/nodeserver.go b/internal/rbd/nodeserver.go index 905fcf8affe..5702ad050f1 100644 --- a/internal/rbd/nodeserver.go +++ b/internal/rbd/nodeserver.go @@ -76,7 +76,7 @@ var ( kernelRelease = "" // deepFlattenSupport holds the list of kernel which support mapping rbd // image with deep-flatten image feature - //nolint:gomnd // numbers specify Kernel versions. + //nolint:mnd // numbers specify Kernel versions. deepFlattenSupport = []util.KernelVersion{ { Version: 5, diff --git a/internal/rbd/rbd_util.go b/internal/rbd/rbd_util.go index d1fc4a32801..274981bfe86 100644 --- a/internal/rbd/rbd_util.go +++ b/internal/rbd/rbd_util.go @@ -1793,7 +1793,7 @@ func (ri *rbdImageMetadataStash) String() string { func stashRBDImageMetadata(volOptions *rbdVolume, metaDataPath string) error { imgMeta := rbdImageMetadataStash{ // there are no checks for this at present - Version: 3, //nolint:gomnd // number specifies version. + Version: 3, //nolint:mnd // number specifies version. Pool: volOptions.Pool, RadosNamespace: volOptions.RadosNamespace, ImageName: volOptions.RbdImageName, diff --git a/scripts/golangci.yml.in b/scripts/golangci.yml.in index d96739ed396..e3fb34a2b2b 100644 --- a/scripts/golangci.yml.in +++ b/scripts/golangci.yml.in @@ -197,7 +197,7 @@ linters: - wrapcheck # TODO: enable linters added in golangci-lint 1.43 - contextcheck - - gomnd + - mnd - ireturn - tagliatelle - varnamelen