Bump go version to 1.24

bochengchu · bochengchu · commit 7f9d91290d25 · 2025-08-28T11:28:52.000-07:00
diff --git a/api/v1beta1/gcpcluster_webhook_test.go b/api/v1beta1/gcpcluster_webhook_test.go
@@ -17,7 +17,6 @@ limitations under the License.
 package v1beta1
 
 import (
-	"context"
 	"testing"
 
 	. "github.com/onsi/gomega"
@@ -90,7 +89,7 @@ func TestGCPCluster_ValidateUpdate(t *testing.T) {
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
 			t.Parallel()
-			warn, err := (&gcpClusterWebhook{}).ValidateUpdate(context.Background(), test.oldCluster, test.newCluster)
+			warn, err := (&gcpClusterWebhook{}).ValidateUpdate(t.Context(), test.oldCluster, test.newCluster)
 			if test.wantErr {
 				g.Expect(err).To(HaveOccurred())
 			} else {
diff --git a/api/v1beta1/gcpclustertemplate_webhook_test.go b/api/v1beta1/gcpclustertemplate_webhook_test.go
@@ -17,7 +17,6 @@ limitations under the License.
 package v1beta1
 
 import (
-	"context"
 	"testing"
 
 	. "github.com/onsi/gomega"
@@ -84,7 +83,7 @@ func TestGCPClusterTemplate_ValidateUpdate(t *testing.T) {
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
 			t.Parallel()
-			warn, err := (&gcpClusterTemplateWebhook{}).ValidateUpdate(context.Background(), test.oldTemplate, test.newTemplate)
+			warn, err := (&gcpClusterTemplateWebhook{}).ValidateUpdate(t.Context(), test.oldTemplate, test.newTemplate)
 			if test.wantErr {
 				g.Expect(err).To(HaveOccurred())
 			} else {
diff --git a/api/v1beta1/gcpmachine_webhook_test.go b/api/v1beta1/gcpmachine_webhook_test.go
@@ -17,7 +17,6 @@ limitations under the License.
 package v1beta1
 
 import (
-	"context"
 	"testing"
 
 	. "github.com/onsi/gomega"
@@ -273,7 +272,7 @@ func TestGCPMachine_ValidateCreate(t *testing.T) {
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
 			t.Parallel()
-			warn, err := (&gcpMachineWebhook{}).ValidateCreate(context.Background(), test.GCPMachine)
+			warn, err := (&gcpMachineWebhook{}).ValidateCreate(t.Context(), test.GCPMachine)
 			if test.wantErr {
 				g.Expect(err).To(HaveOccurred())
 			} else {
diff --git a/api/v1beta1/gcpmachinetemplate_webhook_test.go b/api/v1beta1/gcpmachinetemplate_webhook_test.go
@@ -17,7 +17,6 @@ limitations under the License.
 package v1beta1
 
 import (
-	"context"
 	"testing"
 
 	. "github.com/onsi/gomega"
@@ -233,7 +232,7 @@ func TestGCPMachineTemplate_ValidateCreate(t *testing.T) {
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
 			t.Parallel()
-			warn, err := (&gcpMachineTemplateWebhook{}).ValidateCreate(context.Background(), test.template)
+			warn, err := (&gcpMachineTemplateWebhook{}).ValidateCreate(t.Context(), test.template)
 			if test.wantErr {
 				g.Expect(err).To(HaveOccurred())
 			} else {
diff --git a/controllers/gcpcluster_controller_test.go b/controllers/gcpcluster_controller_test.go
@@ -19,7 +19,6 @@ package controllers
 import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	"golang.org/x/net/context"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	infrav1 "sigs.k8s.io/cluster-api-provider-gcp/api/v1beta1"
 	ctrl "sigs.k8s.io/controller-runtime"
@@ -32,7 +31,7 @@ var _ = Describe("GCPClusterReconciler", func() {
 
 	Context("Reconcile an GCPCluster", func() {
 		It("should not error and not requeue the request with insufficient set up", func() {
-			ctx := context.Background()
+			ctx := t.Context()
 
 			reconciler := &GCPClusterReconciler{
 				Client: k8sClient,
diff --git a/controllers/gcpmachine_controller_test.go b/controllers/gcpmachine_controller_test.go
@@ -17,8 +17,6 @@ limitations under the License.
 package controllers
 
 import (
-	"context"
-
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -37,7 +35,7 @@ var _ = Describe("GCPMachineReconciler", func() {
 				Client: k8sClient,
 			}
 			By("Calling reconcile")
-			ctx := context.Background()
+			ctx := t.Context()
 			instance := &infrav1.GCPMachine{ObjectMeta: metav1.ObjectMeta{Name: "foo", Namespace: "default"}}
 			result, err := reconciler.Reconcile(ctx, ctrl.Request{
 				NamespacedName: client.ObjectKey{
diff --git a/exp/api/v1beta1/gcpmanagedcluster_webhook_test.go b/exp/api/v1beta1/gcpmanagedcluster_webhook_test.go
@@ -17,7 +17,6 @@ limitations under the License.
 package v1beta1
 
 import (
-	"context"
 	"testing"
 
 	. "github.com/onsi/gomega"
@@ -101,7 +100,7 @@ func TestGCPManagedClusterValidatingWebhookUpdate(t *testing.T) {
 				},
 			}
 
-			warn, err := (&gcpManagedClusterWebhook{}).ValidateUpdate(context.Background(), oldMC, newMC)
+			warn, err := (&gcpManagedClusterWebhook{}).ValidateUpdate(t.Context(), oldMC, newMC)
 
 			if tc.expectError {
 				g.Expect(err).To(HaveOccurred())
diff --git a/exp/api/v1beta1/gcpmanagedcontrolplane_webhook_test.go b/exp/api/v1beta1/gcpmanagedcontrolplane_webhook_test.go
@@ -17,7 +17,6 @@ limitations under the License.
 package v1beta1
 
 import (
-	"context"
 	"strings"
 	"testing"
 
@@ -110,7 +109,7 @@ func TestGCPManagedControlPlaneDefaultingWebhook(t *testing.T) {
 				},
 				Spec: tc.spec,
 			}
-			err := (&gcpManagedControlPlaneWebhook{}).Default(context.Background(), mcp)
+			err := (&gcpManagedControlPlaneWebhook{}).Default(t.Context(), mcp)
 			g.Expect(err).NotTo(HaveOccurred())
 
 			g.Expect(mcp.Spec).ToNot(BeNil())
@@ -193,7 +192,7 @@ func TestGCPManagedControlPlaneValidatingWebhookCreate(t *testing.T) {
 			mcp := &GCPManagedControlPlane{
 				Spec: tc.spec,
 			}
-			warn, err := (&gcpManagedControlPlaneWebhook{}).ValidateCreate(context.Background(), mcp)
+			warn, err := (&gcpManagedControlPlaneWebhook{}).ValidateCreate(t.Context(), mcp)
 
 			if tc.expectError {
 				g.Expect(err).To(HaveOccurred())
@@ -288,7 +287,7 @@ func TestGCPManagedControlPlaneValidatingWebhookUpdate(t *testing.T) {
 				},
 			}
 
-			warn, err := (&gcpManagedControlPlaneWebhook{}).ValidateUpdate(context.Background(), oldMCP, newMCP)
+			warn, err := (&gcpManagedControlPlaneWebhook{}).ValidateUpdate(t.Context(), oldMCP, newMCP)
 
 			if tc.expectError {
 				g.Expect(err).To(HaveOccurred())
diff --git a/exp/api/v1beta1/gcpmanagedmachinepool_webhook_test.go b/exp/api/v1beta1/gcpmanagedmachinepool_webhook_test.go
@@ -17,7 +17,6 @@ limitations under the License.
 package v1beta1
 
 import (
-	"context"
 	"strings"
 	"testing"
 
@@ -148,7 +147,7 @@ func TestGCPManagedMachinePoolValidatingWebhookCreate(t *testing.T) {
 			mmp := &GCPManagedMachinePool{
 				Spec: tc.spec,
 			}
-			warn, err := (&gcpManagedMachinePoolWebhook{}).ValidateCreate(context.Background(), mmp)
+			warn, err := (&gcpManagedMachinePoolWebhook{}).ValidateCreate(t.Context(), mmp)
 
 			if tc.expectError {
 				g.Expect(err).To(HaveOccurred())
@@ -215,7 +214,7 @@ func TestGCPManagedMachinePoolValidatingWebhookUpdate(t *testing.T) {
 				},
 			}
 
-			warn, err := (&gcpManagedMachinePoolWebhook{}).ValidateUpdate(context.Background(), oldMMP, newMMP)
+			warn, err := (&gcpManagedMachinePoolWebhook{}).ValidateUpdate(t.Context(), oldMMP, newMMP)
 
 			if tc.expectError {
 				g.Expect(err).To(HaveOccurred())
diff --git a/exp/bootstrap/gke/controllers/gkeconfig_controller.go b/exp/bootstrap/gke/controllers/gkeconfig_controller.go
@@ -133,7 +133,7 @@ func (r *GKEConfigReconciler) ManagedMachinePoolToGKEConfigMapFunc(_ context.Con
 		klog.Errorf("Expected a Cluster but got a %T", o)
 	}
 
-	machinePool, err := getOwnerMachinePool(context.Background(), r.Client, c.ObjectMeta)
+	machinePool, err := getOwnerMachinePool(t.Context(), r.Client, c.ObjectMeta)
 	if err != nil {
 		klog.Errorf("Failed to get owner MachinePool for GCPManagedMachinePool %s/%s: %v", c.Namespace, c.Name, err)
 		return nil
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module sigs.k8s.io/cluster-api-provider-gcp
 
-go 1.23.7
+go 1.24.6
 
 require (
 	cloud.google.com/go/compute v1.44.0
diff --git a/test/e2e/conformance_test.go b/test/e2e/conformance_test.go
@@ -138,7 +138,7 @@ var _ = Describe("Conformance Tests", func() {
 		ginkgoNodes, err := strconv.Atoi(e2eConfig.MustGetVariable("CONFORMANCE_NODES"))
 		Expect(err).NotTo(HaveOccurred())
 
-		kubetest.Run(context.Background(),
+		kubetest.Run(t.Context(),
 			kubetest.RunInput{
 				ClusterProxy:         workloadProxy,
 				NumberOfNodes:        int(workerMachineCount),

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ func (r *GKEConfigReconciler) ManagedMachinePoolToGKEConfigMapFunc(_ context.Con`
`133`	`133`	`klog.Errorf("Expected a Cluster but got a %T", o)`
`134`	`134`	`}`
`135`	`135`
`136`		`- machinePool, err := getOwnerMachinePool(context.Background(), r.Client, c.ObjectMeta)`
	`136`	`+ machinePool, err := getOwnerMachinePool(t.Context(), r.Client, c.ObjectMeta)`
`137`	`137`	`if err != nil {`
`138`	`138`	`klog.Errorf("Failed to get owner MachinePool for GCPManagedMachinePool %s/%s: %v", c.Namespace, c.Name, err)`
`139`	`139`	`return nil`