From f9a2dba26ca3467d2713ac0fc1b994f378bdb241 Mon Sep 17 00:00:00 2001
From: Brian Goff <cpuguy83@gmail.com>
Date: Mon, 4 Nov 2024 13:12:18 -0800
Subject: [PATCH] Bump go versions

go1.21 is EOL
go1.22 should be able to be used everywhere except compose which
requires go1.23.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
---
 packages/moby-buildx/go_version.go     |  2 +-
 packages/moby-compose/go_version.go    |  2 +-
 packages/moby-containerd/go_version.go | 15 +--------------
 pkg/goversion/version.go               |  6 +++---
 4 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/packages/moby-buildx/go_version.go b/packages/moby-buildx/go_version.go
index ba2a1dd..3780d2e 100644
--- a/packages/moby-buildx/go_version.go
+++ b/packages/moby-buildx/go_version.go
@@ -6,5 +6,5 @@ import (
 )
 
 func GoVersion(_ *archive.Spec) string {
-	return goversion.OneTwentyOne
+	return goversion.OneTwentyTwo
 }
diff --git a/packages/moby-compose/go_version.go b/packages/moby-compose/go_version.go
index da64591..e980960 100644
--- a/packages/moby-compose/go_version.go
+++ b/packages/moby-compose/go_version.go
@@ -26,7 +26,7 @@ func GoVersion(s *archive.Spec) string {
 	}
 
 	if v.Compare(t) >= 0 { // if v >= t
-		return goversion.OneTwentyOne
+		return goversion.OneTwentyThree
 	}
 
 	return goversion.DefaultVersion
diff --git a/packages/moby-containerd/go_version.go b/packages/moby-containerd/go_version.go
index 86c1aac..83f556b 100644
--- a/packages/moby-containerd/go_version.go
+++ b/packages/moby-containerd/go_version.go
@@ -1,23 +1,10 @@
 package containerd
 
 import (
-	"strings"
-
 	"github.com/Azure/moby-packaging/pkg/archive"
 	"github.com/Azure/moby-packaging/pkg/goversion"
-	"github.com/Masterminds/semver/v3"
 )
 
 func GoVersion(spec *archive.Spec) string {
-	version, _, _ := strings.Cut(spec.Tag, "~")
-	v, err := semver.NewVersion(version)
-	if err != nil {
-		panic(err)
-	}
-
-	if v.Major() < 2 {
-		return goversion.OneTwentyOne
-	} else {
-		return goversion.OneTwentyTwo
-	}
+	return goversion.OneTwentyTwo
 }
diff --git a/pkg/goversion/version.go b/pkg/goversion/version.go
index d5415d3..7393beb 100644
--- a/pkg/goversion/version.go
+++ b/pkg/goversion/version.go
@@ -1,7 +1,7 @@
 package goversion
 
 const (
-	DefaultVersion = OneTwentyOne
-	OneTwentyOne   = "1.21.12"
-	OneTwentyTwo   = "1.22.5"
+	DefaultVersion = OneTwentyTwo
+	OneTwentyTwo   = "1.22.8"
+	OneTwentyThree = "1.23.2"
 )