diff --git a/hack/make-rules/verify.sh b/hack/make-rules/verify.sh index 8d500459e7b..98d317004a1 100755 --- a/hack/make-rules/verify.sh +++ b/hack/make-rules/verify.sh @@ -35,7 +35,6 @@ EXCLUDED_PATTERNS=( "verify-linkcheck.sh" # runs in separate Jenkins job once per day due to high network usage "verify-*-dockerized.sh" # Don't run any scripts that intended to be run dockerized "verify-govet-levee.sh" # Do not run levee analysis by default while KEP-1933 implementation is in alpha. - "verify-golangci-lint.sh" # Experimental - intended to be run by hand periodically ) # Exclude generated-files-remake in certain cases, if they're running in a separate job. diff --git a/pkg/apis/storage/validation/validation_test.go b/pkg/apis/storage/validation/validation_test.go index fffe8396d46..ccc7fe76651 100644 --- a/pkg/apis/storage/validation/validation_test.go +++ b/pkg/apis/storage/validation/validation_test.go @@ -1696,8 +1696,7 @@ func TestCSIDriverValidation(t *testing.T) { storageCapacity := true notStorageCapacity := false supportedFSGroupPolicy := storage.FileFSGroupPolicy - invalidFSGroupPolicy := storage.ReadWriteOnceWithFSTypeFSGroupPolicy //nolint:ineffassign - invalidFSGroupPolicy = "invalid-mode" + invalidFSGroupPolicy := storage.FSGroupPolicy("invalid-mode") successCases := []storage.CSIDriver{ { ObjectMeta: metav1.ObjectMeta{Name: driverName}, @@ -2051,8 +2050,7 @@ func TestCSIDriverValidationUpdate(t *testing.T) { { name: "FSGroupPolicy invalidated", modify: func(new *storage.CSIDriver) { - invalidFSGroupPolicy := storage.ReadWriteOnceWithFSTypeFSGroupPolicy //nolint:ineffassign - invalidFSGroupPolicy = "invalid" + invalidFSGroupPolicy := storage.FSGroupPolicy("invalid") new.Spec.FSGroupPolicy = &invalidFSGroupPolicy }, }, diff --git a/pkg/generated/openapi/cmd/models-schema/main.go b/pkg/generated/openapi/cmd/models-schema/main.go index 5a348570b5e..deff95f730c 100644 --- a/pkg/generated/openapi/cmd/models-schema/main.go +++ b/pkg/generated/openapi/cmd/models-schema/main.go @@ -59,7 +59,7 @@ func output() error { if err != nil { return fmt.Errorf("error serializing api definitions: %w", err) } - _, _ = os.Stdout.Write(data) + os.Stdout.Write(data) return nil } diff --git a/pkg/kubelet/certificate/bootstrap/bootstrap_test.go b/pkg/kubelet/certificate/bootstrap/bootstrap_test.go index 2cfe5bb0f08..7d8ffbe9616 100644 --- a/pkg/kubelet/certificate/bootstrap/bootstrap_test.go +++ b/pkg/kubelet/certificate/bootstrap/bootstrap_test.go @@ -387,7 +387,8 @@ func TestRequestNodeCertificate(t *testing.T) { type failureType int const ( - createError = iota + noError failureType = iota //nolint:deadcode,varcheck + createError certificateSigningRequestDenied ) diff --git a/test/e2e/common/node/pods.go b/test/e2e/common/node/pods.go index dfd314181ab..91f2ec6735a 100644 --- a/test/e2e/common/node/pods.go +++ b/test/e2e/common/node/pods.go @@ -244,6 +244,7 @@ var _ = SIGDescribe("Pods", func() { pods, err := podClient.List(context.TODO(), options) framework.ExpectNoError(err, "failed to query for pods") framework.ExpectEqual(len(pods.Items), 0) + listCompleted := make(chan bool, 1) lw := &cache.ListWatch{ ListFunc: func(options metav1.ListOptions) (runtime.Object, error) { diff --git a/test/e2e/network/ingress.go b/test/e2e/network/ingress.go index a97b5be6f3d..281df81626a 100644 --- a/test/e2e/network/ingress.go +++ b/test/e2e/network/ingress.go @@ -47,7 +47,7 @@ import ( ) const ( - negUpdateTimeout = 2 * time.Minute + negUpdateTimeout = 2 * time.Minute ) var _ = common.SIGDescribe("Loadbalancing: L7", func() { diff --git a/test/e2e/scheduling/limit_range.go b/test/e2e/scheduling/limit_range.go index 5d84296f568..667f0c4417b 100644 --- a/test/e2e/scheduling/limit_range.go +++ b/test/e2e/scheduling/limit_range.go @@ -72,6 +72,7 @@ var _ = SIGDescribe("LimitRange", func() { limitRanges, err := f.ClientSet.CoreV1().LimitRanges(f.Namespace.Name).List(context.TODO(), options) framework.ExpectNoError(err, "failed to query for limitRanges") framework.ExpectEqual(len(limitRanges.Items), 0) + listCompleted := make(chan bool, 1) lw := &cache.ListWatch{ ListFunc: func(options metav1.ListOptions) (runtime.Object, error) {