From fd84535326e27d82f06198889318655dc4d38fbf Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Thu, 8 May 2025 13:39:43 +0900 Subject: [PATCH] testutil: bump up GolangImage to 1.23 Fix issue 4214 Signed-off-by: Akihiro Suda --- pkg/testutil/testutil.go | 2 ++ pkg/testutil/testutil_darwin.go | 1 - pkg/testutil/testutil_freebsd.go | 1 - pkg/testutil/testutil_linux.go | 1 - pkg/testutil/testutil_windows.go | 1 - 5 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkg/testutil/testutil.go b/pkg/testutil/testutil.go index dd57f2821e7..56aa4c6bb58 100644 --- a/pkg/testutil/testutil.go +++ b/pkg/testutil/testutil.go @@ -768,3 +768,5 @@ func mirrorOf(s string) string { // plain mirror, NOT stargz-converted images return fmt.Sprintf("ghcr.io/stargz-containers/%s-org", s) } + +var GolangImage = mirrorOf("golang:1.23") diff --git a/pkg/testutil/testutil_darwin.go b/pkg/testutil/testutil_darwin.go index 07990bfef57..b693b828806 100644 --- a/pkg/testutil/testutil_darwin.go +++ b/pkg/testutil/testutil_darwin.go @@ -31,5 +31,4 @@ var ( BusyboxImage = "ghcr.io/containerd/busybox:1.36" AlpineImage = mirrorOf("alpine:3.13") NginxAlpineImage = mirrorOf("nginx:1.19-alpine") - GolangImage = mirrorOf("golang:1.18") ) diff --git a/pkg/testutil/testutil_freebsd.go b/pkg/testutil/testutil_freebsd.go index 9761008585f..c04a065fac0 100644 --- a/pkg/testutil/testutil_freebsd.go +++ b/pkg/testutil/testutil_freebsd.go @@ -31,5 +31,4 @@ var ( BusyboxImage = "ghcr.io/containerd/busybox:1.36" AlpineImage = mirrorOf("alpine:3.13") NginxAlpineImage = mirrorOf("nginx:1.19-alpine") - GolangImage = mirrorOf("golang:1.18") ) diff --git a/pkg/testutil/testutil_linux.go b/pkg/testutil/testutil_linux.go index f7ab0688d42..e318c8d0a63 100644 --- a/pkg/testutil/testutil_linux.go +++ b/pkg/testutil/testutil_linux.go @@ -30,7 +30,6 @@ var ( FluentdImage = "fluent/fluentd:v1.17.0-debian-1.0" KuboImage = mirrorOf("ipfs/kubo:v0.16.0") SystemdImage = "ghcr.io/containerd/stargz-snapshotter:0.15.1-kind" - GolangImage = mirrorOf("golang:1.18") // Source: https://gist.github.com/cpuguy83/fcf3041e5d8fb1bb5c340915aabeebe0 NonDistBlobImage = "ghcr.io/cpuguy83/non-dist-blob:latest" diff --git a/pkg/testutil/testutil_windows.go b/pkg/testutil/testutil_windows.go index d1b830da6bf..069bdb83c8d 100644 --- a/pkg/testutil/testutil_windows.go +++ b/pkg/testutil/testutil_windows.go @@ -53,7 +53,6 @@ const ( ) var ( - GolangImage = mirrorOf("fixme-test-using-this-image-is-disabled-on-windows") AlpineImage = mirrorOf("fixme-test-using-this-image-is-disabled-on-windows") hypervContainer bool