From f72a604cbd4c020ddf451790181e0ceef89e59da Mon Sep 17 00:00:00 2001
From: Milas Bowman <milas.bowman@docker.com>
Date: Tue, 6 Sep 2022 17:59:11 -0400
Subject: [PATCH] ci: upgrade golangci-lint

Need a compatible version for 1.19

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
---
 .golangci.yml | 7 ++++---
 Dockerfile    | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index ed64575e9..df2fad4c6 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -5,7 +5,6 @@ linters:
   enable-all: false
   disable-all: true
   enable:
-    - deadcode
     - depguard
     - errcheck
     - gocritic
@@ -21,13 +20,15 @@ linters:
     - nakedret
     - nolintlint
     - staticcheck
-    - structcheck
     - typecheck
     - unconvert
     - unparam
     - unused
-    - varcheck
 linters-settings:
+  revive:
+    rules:
+      - name: package-comments
+        disabled: true
   depguard:
     list-type: denylist
     include-go-root: true
diff --git a/Dockerfile b/Dockerfile
index 9c7de75da..b642e75ad 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,7 +17,7 @@
 
 ARG GO_VERSION=1.19.1
 ARG XX_VERSION=1.1.2
-ARG GOLANGCI_LINT_VERSION=v1.47.3
+ARG GOLANGCI_LINT_VERSION=v1.49.0
 ARG ADDLICENSE_VERSION=v1.0.0
 
 ARG BUILD_TAGS="e2e,kube"