From 39b5e18fce55793776f783c46b08a9d5cb4039da Mon Sep 17 00:00:00 2001
From: Jiawei Huang <jiawei@tigera.io>
Date: Tue, 4 Mar 2025 11:52:35 -0800
Subject: [PATCH 1/2] Update golang to v1.23.7 and k8s to v1.31.6

---
 images/calico-go-build/versions.yaml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/images/calico-go-build/versions.yaml b/images/calico-go-build/versions.yaml
index d99c0fe2..1073dcd6 100644
--- a/images/calico-go-build/versions.yaml
+++ b/images/calico-go-build/versions.yaml
@@ -1,12 +1,12 @@
 golang:
-  version: 1.23.6
+  version: 1.23.7
   checksum:
     sha256:
-      amd64: 9379441ea310de000f33a4dc767bd966e72ab2826270e038e78b2c53c2e7802d
-      arm64: 561c780e8f4a8955d32bf72e46af0b5ee5e0debe1e4633df9a03781878219202
-      ppc64le: 0f817201e83d78ddbfa27f5f78d9b72450b92cc21d5e045145efacd0d3244a99
-      s390x: 321e7ed0d5416f731479c52fa7610b52b8079a8061967bd48cec6d66f671a60e
+      amd64: 4741525e69841f2e22f9992af25df0c1112b07501f61f741c12c6389fcb119f3
+      arm64: 597acbd0505250d4d98c4c83adf201562a8c812cbcd7b341689a07087a87a541
+      ppc64le: 3ffc310bfd11fd0bcc713a764a0f7252c4d52d03f12abebfaebaaae77e027028
+      s390x: af1d4c5d01e32c2cf6e3cc00e44cb240e1a6cef539b28a64389b2b9ca284ac6c
 kubernetes:
-  version: 1.31.5
+  version: 1.31.6
 llvm:
   version: 18.1.8

From a8e5b6e88259971583731330fccea0195a351aa5 Mon Sep 17 00:00:00 2001
From: Jiawei Huang <jiawei@tigera.io>
Date: Tue, 4 Mar 2025 13:55:10 -0800
Subject: [PATCH 2/2] Use semaphore f1-standard-2

---
 .semaphore/promotions/calico-go-build.yml | 2 +-
 .semaphore/semaphore.yml                  | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/.semaphore/promotions/calico-go-build.yml b/.semaphore/promotions/calico-go-build.yml
index dc7318d2..010a8780 100644
--- a/.semaphore/promotions/calico-go-build.yml
+++ b/.semaphore/promotions/calico-go-build.yml
@@ -2,7 +2,7 @@ version: v1.0
 name: Publish calico/go-build images
 agent:
   machine:
-    type: f1-standard-4
+    type: f1-standard-2
     os_image: ubuntu2204
 
 execution_time_limit:
diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml
index 9e6ee04c..fe9ee9dd 100644
--- a/.semaphore/semaphore.yml
+++ b/.semaphore/semaphore.yml
@@ -49,10 +49,6 @@ blocks:
   - name: calico/go-build image
     dependencies: []
     task:
-      agent:
-        machine:
-          type: f1-standard-4
-          os_image: ubuntu2204
       env_vars:
         # The branch to test the current go-build against
         - name: CALICO_BRANCH