From c53b635f927a905ff431a51d12f42f4f5c36d959 Mon Sep 17 00:00:00 2001
From: Austin Vazquez <macedonv@amazon.com>
Date: Fri, 10 May 2024 15:44:37 +0000
Subject: [PATCH] Update toolchain to Go 1.21.10 and 1.22.3

Go 1.21.10 and 1.22.3 release includes bug fixes for the core net/http package.

Full release notes: https://go.dev/doc/devel/release#go1.21.minor, https://go.dev/doc/devel/release#go1.22.minor

Signed-off-by: Austin Vazquez <macedonv@amazon.com>
(cherry picked from commit 25c2f690a8e031193bcbc1e82a7de33da647fc58)
Signed-off-by: Austin Vazquez <macedonv@amazon.com>
---
 .github/actions/install-go/action.yml | 2 +-
 .github/workflows/ci.yml              | 2 +-
 .github/workflows/release.yml         | 2 +-
 Vagrantfile                           | 2 +-
 contrib/Dockerfile.test               | 2 +-
 contrib/fuzz/oss_fuzz_build.sh        | 4 ++--
 script/setup/prepare_env_windows.ps1  | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/actions/install-go/action.yml b/.github/actions/install-go/action.yml
index d24bf751d0fe..a0ca158cab0f 100644
--- a/.github/actions/install-go/action.yml
+++ b/.github/actions/install-go/action.yml
@@ -3,7 +3,7 @@ description: "Reusable action to install Go, so there is one place to bump Go ve
 inputs:
   go-version:
     required: true
-    default: "1.21.9"
+    default: "1.21.10"
     description: "Go version to install"
 
 runs:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c0f2466dfb17..afecf2e0a92c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -191,7 +191,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04, actuated-arm64-4cpu-16gb, macos-12, windows-2019, windows-2022]
-        go-version: ["1.21.9", "1.22.2"]
+        go-version: ["1.21.10", "1.22.3"]
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/install-go
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0e61f1f1bb30..af29d2a2544c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,7 +13,7 @@ on:
 name: Release
 
 env:
-  GO_VERSION: "1.21.9"
+  GO_VERSION: "1.21.10"
 
 permissions: # added using https://github.com/step-security/secure-workflows
   contents: read
diff --git a/Vagrantfile b/Vagrantfile
index e15303542f9a..d001c498298c 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -102,7 +102,7 @@ EOF
   config.vm.provision "install-golang", type: "shell", run: "once" do |sh|
     sh.upload_path = "/tmp/vagrant-install-golang"
     sh.env = {
-        'GO_VERSION': ENV['GO_VERSION'] || "1.21.9",
+        'GO_VERSION': ENV['GO_VERSION'] || "1.21.10",
     }
     sh.inline = <<~SHELL
         #!/usr/bin/env bash
diff --git a/contrib/Dockerfile.test b/contrib/Dockerfile.test
index 33fdf6a0be1d..b17763d046b3 100644
--- a/contrib/Dockerfile.test
+++ b/contrib/Dockerfile.test
@@ -29,7 +29,7 @@
 #   docker run --privileged containerd-test
 # ------------------------------------------------------------------------------
 
-ARG GOLANG_VERSION=1.21.9
+ARG GOLANG_VERSION=1.21.10
 ARG GOLANG_IMAGE=golang
 
 FROM ${GOLANG_IMAGE}:${GOLANG_VERSION} AS golang
diff --git a/contrib/fuzz/oss_fuzz_build.sh b/contrib/fuzz/oss_fuzz_build.sh
index c272a28d61b5..2032d8ae0db1 100755
--- a/contrib/fuzz/oss_fuzz_build.sh
+++ b/contrib/fuzz/oss_fuzz_build.sh
@@ -43,11 +43,11 @@ go run main.go $SRC/containerd/images
 
 apt-get update && apt-get install -y wget
 cd $SRC
-wget --quiet https://go.dev/dl/go1.21.9.linux-amd64.tar.gz
+wget --quiet https://go.dev/dl/go1.21.10.linux-amd64.tar.gz
 
 mkdir temp-go
 rm -rf /root/.go/*
-tar -C temp-go/ -xzf go1.21.9.linux-amd64.tar.gz
+tar -C temp-go/ -xzf go1.21.10.linux-amd64.tar.gz
 mv temp-go/go/* /root/.go/
 cd $SRC/containerd
 
diff --git a/script/setup/prepare_env_windows.ps1 b/script/setup/prepare_env_windows.ps1
index 36e9f3e87fbb..8bf0e9284cfc 100644
--- a/script/setup/prepare_env_windows.ps1
+++ b/script/setup/prepare_env_windows.ps1
@@ -5,7 +5,7 @@
 # lived test environment.
 Set-MpPreference -DisableRealtimeMonitoring:$true
 
-$PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.21.9"; make = ""; nssm = "" }
+$PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.21.10"; make = ""; nssm = "" }
 
 Write-Host "Downloading chocolatey package"
 curl.exe -L "https://packages.chocolatey.org/chocolatey.0.10.15.nupkg" -o 'c:\choco.zip'