From 167be1b74c1038870b245a1728c6e8dd0653376a Mon Sep 17 00:00:00 2001
From: Jimmi Dyson <jimmidyson@gmail.com>
Date: Fri, 3 Feb 2023 17:37:43 +0000
Subject: [PATCH] build: golang 1.20

---
 .golangci.yml     | 4 ----
 .tool-versions    | 4 ++--
 go.mod            | 2 +-
 make/go.mk        | 2 +-
 pkg/addons/cni.go | 4 +---
 5 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index 557d1ddb1..3f07f1c37 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,10 +1,6 @@
 # Copyright 2023 D2iQ, Inc. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-run:
-  timeout: 5m
-  go: '1.17'
-
 linters:
   disable-all: true
   enable:
diff --git a/.tool-versions b/.tool-versions
index 0a5f39480..b8a334459 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -3,8 +3,8 @@ gcloud 416.0.0
 gcloud 416.0.0
 ginkgo 2.8.0
 gojq 0.12.11
-golang 1.19.5
-golangci-lint 1.50.1
+golang 1.20
+golangci-lint 1.51.0
 goreleaser 1.15.0
 helm 3.11.0
 helm-docs 1.11.0
diff --git a/go.mod b/go.mod
index c9b6d35a9..0cce08f21 100644
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,7 @@
 
 module github.com/d2iq-labs/capi-runtime-extensions
 
-go 1.19
+go 1.20
 
 require (
 	github.com/spf13/pflag v1.0.5
diff --git a/make/go.mk b/make/go.mk
index 793de9028..5941a589a 100644
--- a/make/go.mk
+++ b/make/go.mk
@@ -168,5 +168,5 @@ go-generate: install-tool.golang install-tool.kube-controller-tools ; $(info $(M
 
 .PHONY: go-mod-upgrade
 go-mod-upgrade: ## Interactive check for direct module dependency upgrades
-go-mod-upgrade: install-tool.golang ; $(info $(M) checking for direct module dependency upgrades)
+go-mod-upgrade: install-tool.go.go-mod-upgrade; $(info $(M) checking for direct module dependency upgrades)
 	go-mod-upgrade
diff --git a/pkg/addons/cni.go b/pkg/addons/cni.go
index e29792c5b..34454b1ec 100644
--- a/pkg/addons/cni.go
+++ b/pkg/addons/cni.go
@@ -4,9 +4,7 @@
 package addons
 
 import (
-
-	// embedding as []byte does not import the package.
-	_ "embed"
+	_ "embed" // embedding as []byte does not import the package.
 
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"