From b7856fffce5daa0a6810f8ed46860863a66aa5dd Mon Sep 17 00:00:00 2001
From: Jason Deal <jmdeal@amazon.com>
Date: Mon, 12 Feb 2024 11:04:54 -0800
Subject: [PATCH] deps: bump go version to 1.22

---
 .github/actions/install-deps/action.yaml | 5 ++++-
 go.mod                                   | 2 +-
 tools/allocatable-diff/go.mod            | 2 +-
 tools/kompat/go.mod                      | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.github/actions/install-deps/action.yaml b/.github/actions/install-deps/action.yaml
index 56ddc45c7e5d..ef72ac2a3225 100644
--- a/.github/actions/install-deps/action.yaml
+++ b/.github/actions/install-deps/action.yaml
@@ -8,6 +8,7 @@ runs:
   using: "composite"
   steps:
     - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
+      id: setup-go
       with:
         go-version-file: go.mod
         check-latest: true
@@ -21,7 +22,9 @@ runs:
         path: |
           /usr/local/kubebuilder/bin
           ~/go/bin
-        key: ${{ runner.os }}-${{ inputs.k8sVersion }}-toolchain-cache-${{ hashFiles('hack/toolchain.sh') }}
+        # Added go version to compensate for this issue with govulncheck: https://github.com/golang/go/issues/65590. Could re-evaluate if this is necessary once the
+        # upstream go issue is corrected and if this is causing too many cache misses.
+        key: ${{ runner.os }}-${{ inputs.k8sVersion }}-${{ steps.setup-go.outputs.go-version }}-toolchain-cache-${{ hashFiles('hack/toolchain.sh') }}
     - if: ${{ steps.cache-toolchain.outputs.cache-hit != 'true' }}
       shell: bash
       env:
diff --git a/go.mod b/go.mod
index 2b30ec4c5a00..255abb076b88 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/aws/karpenter-provider-aws
 
-go 1.21
+go 1.22
 
 require (
 	github.com/Pallinder/go-randomdata v1.2.0
diff --git a/tools/allocatable-diff/go.mod b/tools/allocatable-diff/go.mod
index 8112260be942..633f51ebd170 100644
--- a/tools/allocatable-diff/go.mod
+++ b/tools/allocatable-diff/go.mod
@@ -1,6 +1,6 @@
 module github.com/aws/karpenter-provider-aws/tools/allocatable-diff
 
-go 1.21
+go 1.22.0
 
 require (
 	github.com/aws/karpenter-provider-aws v0.33.1-0.20231206223517-f73ccfa65419
diff --git a/tools/kompat/go.mod b/tools/kompat/go.mod
index 1296ab885f6c..7e9d4dd6ef6b 100644
--- a/tools/kompat/go.mod
+++ b/tools/kompat/go.mod
@@ -1,6 +1,6 @@
 module github.com/aws/karpenter-provider-aws/tools/kompat
 
-go 1.20
+go 1.22.0
 
 require (
 	github.com/Masterminds/semver/v3 v3.2.1