From e458e002179ebe0b8fe3a7ac2a6b6949714cecbc Mon Sep 17 00:00:00 2001
From: CrazyMax <crazy-max@users.noreply.github.com>
Date: Thu, 4 May 2023 23:26:58 +0200
Subject: [PATCH 1/2] update to go 1.20

---
 Dockerfile             | 2 +-
 docker-bake.hcl        | 2 +-
 hack/gen.Dockerfile    | 2 +-
 hack/lint.Dockerfile   | 2 +-
 hack/vendor.Dockerfile | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 829a377e..a6a41b1c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_VERSION="1.19"
+ARG GO_VERSION="1.20"
 ARG ALPINE_VERSION="3.17"
 ARG XX_VERSION="1.1.2"
 
diff --git a/docker-bake.hcl b/docker-bake.hcl
index 4f8156f7..de93f2b4 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -1,5 +1,5 @@
 variable "GO_VERSION" {
-  default = "1.19"
+  default = null
 }
 
 variable "DESTDIR" {
diff --git a/hack/gen.Dockerfile b/hack/gen.Dockerfile
index 3e7caae1..14a7a5e5 100644
--- a/hack/gen.Dockerfile
+++ b/hack/gen.Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_VERSION="1.19"
+ARG GO_VERSION="1.20"
 ARG PROTOC_VERSION="3.17.3"
 
 # protoc is dynamically linked to glibc so can't use alpine base
diff --git a/hack/lint.Dockerfile b/hack/lint.Dockerfile
index 499dfaae..80278b6e 100644
--- a/hack/lint.Dockerfile
+++ b/hack/lint.Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_VERSION="1.19"
+ARG GO_VERSION="1.20"
 ARG GOLANGCI_LINT_VERSION="v1.48"
 
 FROM golang:${GO_VERSION}-alpine AS base
diff --git a/hack/vendor.Dockerfile b/hack/vendor.Dockerfile
index 66aae1a5..2fba3eca 100644
--- a/hack/vendor.Dockerfile
+++ b/hack/vendor.Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_VERSION="1.19"
+ARG GO_VERSION="1.20"
 ARG GOMOD_OUTDATED_VERSION="v0.8.0"
 
 FROM golang:${GO_VERSION}-alpine AS base

From e29ba8f703ba0edc88b18045b0721a31bede0937 Mon Sep 17 00:00:00 2001
From: CrazyMax <crazy-max@users.noreply.github.com>
Date: Thu, 4 May 2023 23:29:18 +0200
Subject: [PATCH 2/2] remove deprecated golangci-lint linters

Linters 'deadcode' and 'varcheck' are deprecated since v1.49.0
and had been replaced by 'unused'
---
 .golangci.yml        | 3 +--
 hack/lint.Dockerfile | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index bef0e99c..29a54f46 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -7,7 +7,6 @@ run:
 
 linters:
   enable:
-    - deadcode
     - depguard
     - gofmt
     - goimports
@@ -17,10 +16,10 @@ linters:
     - ineffassign
     - misspell
     - typecheck
-    - varcheck
     - errname
     - makezero
     - whitespace
+    - unused
   disable-all: true
 
 linters-settings:
diff --git a/hack/lint.Dockerfile b/hack/lint.Dockerfile
index 80278b6e..551c3e4e 100644
--- a/hack/lint.Dockerfile
+++ b/hack/lint.Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1
 
 ARG GO_VERSION="1.20"
-ARG GOLANGCI_LINT_VERSION="v1.48"
+ARG GOLANGCI_LINT_VERSION="v1.51"
 
 FROM golang:${GO_VERSION}-alpine AS base
 ENV GOFLAGS="-buildvcs=false"