add support for varcheck linter

jrabbit · Jun 16, 2022 · 656738b · 656738b
1 parent 08fc101
commit 656738b
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 6 deletions.
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -19,11 +19,11 @@ linters:
   # https://github.com/golangci/golangci-lint/issues/1841
   # - deadcode
   # - structcheck
-  # - varcheck
     - ineffassign
     - staticcheck
-    - unused
     - tenv
+    - unused
+    - varcheck
 
 linters-settings: # please keep this alphabetized
   staticcheck:

diff --git a/protokube/pkg/protokube/aws_volume.go b/protokube/pkg/protokube/aws_volume.go
@@ -32,8 +32,6 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
 )
 
-var devices = []string{"/dev/xvdu", "/dev/xvdv", "/dev/xvdx", "/dev/xvdx", "/dev/xvdy", "/dev/xvdz"}
-
 // AWSCloudProvider defines the AWS cloud provider implementation
 type AWSCloudProvider struct {
 	mutex sync.Mutex

diff --git a/protokube/pkg/protokube/do_volume.go b/protokube/pkg/protokube/do_volume.go
@@ -41,7 +41,6 @@ const (
 	dropletIDMetadataURL         = "http://169.254.169.254/metadata/v1/id"
 	dropletIDMetadataTags        = "http://169.254.169.254/metadata/v1/tags"
 	dropletInternalIPMetadataURL = "http://169.254.169.254/metadata/v1/interfaces/private/0/ipv4/address"
-	localDevicePrefix            = "/dev/disk/by-id/scsi-0DO_Volume_"
 )
 
 // TokenSource implements oauth2.TokenSource

diff --git a/upup/pkg/fi/nodeup/nodetasks/service.go b/upup/pkg/fi/nodeup/nodetasks/service.go
@@ -46,7 +46,6 @@ const (
 
 	containerdService = "containerd.service"
 	dockerService     = "docker.service"
-	kubeletService    = "kubelet.service"
 	protokubeService  = "protokube.service"
 )