uplift(Go): version from 1.23 to 1.24 (#148)

zdtsw · web-flow · commit f284cc830298 · 2025-08-28T18:35:30.000Z
- Go 1.23 is EOL - fix linter: usetesting context.Background() - context.Background() create independent context but this is causing lint error but this wont have rate limit - t.Context() is shared by all testscases in the same test, this could cause rate limit by the client esp when many run in parallel. to add a 30seconds as a workaround to mitigate rate limit issue. - uplift setup-go to use v5.5.0 across all workflow and use go.mod for Go version ~~DO NOT MERGE TILL #139 IS IN FIRST~~ Approved-by: rhdedgar
diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
@@ -13,10 +13,10 @@ jobs:
     if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'main'
     runs-on: ubuntu-24.04
     steps:
-      - name: Set up Go 1.23
-        uses: actions/setup-go@be3c94b385c4f180051c996d336f57a34c397495 # v3.6.1
+      - name: Set up Go 1.24
+        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
         with:
-          go-version: '1.23'
+          go-version-file: go.mod
 
       - name: Checkout code
         uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
         with:
-          go-version: '1.21'
+          go-version-file: go.mod
 
       - name: Set up limgo
         uses: GoTestTools/limgo-action@d4a725a46ab3bdbbf23186bbbe54b4ff4a35d5a7 # v1.0.2
diff --git a/.github/workflows/generate-release.yml b/.github/workflows/generate-release.yml
@@ -19,7 +19,6 @@ permissions:
 env:
   GIT_USER_NAME: github-actions[bot]
   GIT_USER_EMAIL: github-actions[bot]@users.noreply.github.com
-  GO_VERSION: '1.23'
 
 jobs:
   generate-release:
@@ -91,9 +90,9 @@ jobs:
           fi
 
       - name: Set up Go
-        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5
+        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 #v 5.5.0
         with:
-          go-version: ${{ env.GO_VERSION }}
+          go-version-file: go.mod
 
       - name: Prepare release files
         shell: bash
@@ -244,9 +243,9 @@ jobs:
           GH_TOKEN: ${{ github.token }}
 
       - name: Set up Go
-        uses: actions/setup-go@a26af69be951a213d495a4c3e4e4022e16d87065
+        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
         with:
-          go-version: ${{ env.GO_VERSION }}
+          go-version-file: go.mod
 
       - name: Build release image
         shell: bash
diff --git a/.github/workflows/release-image.yml b/.github/workflows/release-image.yml
@@ -20,10 +20,10 @@ jobs:
   build-release-image:
     runs-on: ubuntu-24.04
     steps:
-      - name: Set up Go 1.23
-        uses: actions/setup-go@be3c94b385c4f180051c996d336f57a34c397495 # v3.6.1
+      - name: Set up Go 1.24
+        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
         with:
-          go-version: '1.23'
+          go-version-file: go.mod
 
       - name: Checkout code
         uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
diff --git a/.github/workflows/run-e2e-test.yml b/.github/workflows/run-e2e-test.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
         with:
-          go-version: '1.21'
+          go-version-file: go.mod
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
 # Build the manager binary
-ARG GOLANG_VERSION=1.23
+ARG GOLANG_VERSION=1.24
 
-FROM registry.access.redhat.com/ubi8/go-toolset:${GOLANG_VERSION} as builder
+FROM registry.access.redhat.com/ubi9/go-toolset:${GOLANG_VERSION} as builder
 ARG TARGETOS=linux
 ARG TARGETARCH
 ARG CGO_ENABLED=1
diff --git a/Makefile b/Makefile
@@ -151,11 +151,11 @@ test-e2e: ## Run e2e tests
 GOLANGCI_LINT_TIMEOUT ?= 5m0s
 .PHONY: lint
 lint: golangci-lint ## Run golangci-lint against code.
-	$(GOLANGCI_LINT) run --timeout=$(GOLANGCI_LINT_TIMEOUT) --sort-results
+	$(GOLANGCI_LINT) run --timeout=$(GOLANGCI_LINT_TIMEOUT)
 
 .PHONY: lint-fix
 lint-fix: golangci-lint ## Run golangci-lint fix against code.
-	$(GOLANGCI_LINT) run --fix --sort-results
+	$(GOLANGCI_LINT) run --fix
 
 ##@ Build
 
diff --git a/README.md b/README.md
@@ -109,7 +109,7 @@ kubectl apply -f config/samples/example-with-configmap.yaml
 ### Prerequisites
 
 - Kubernetes cluster (v1.20 or later)
-- Go version **go1.23**
+- Go version **go1.24**
 - operator-sdk **v1.39.2** (v4 layout) or newer
 - kubectl configured to access your cluster
 - A running inference server:
diff --git a/controllers/llamastackdistribution_controller_test.go b/controllers/llamastackdistribution_controller_test.go
@@ -1,7 +1,6 @@
 package controllers_test
 
 import (
-	"context"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -111,9 +110,9 @@ func TestStorageConfiguration(t *testing.T) {
 
 			// arrange
 			instance := tt.buildInstance(namespace.Name)
-			require.NoError(t, k8sClient.Create(context.Background(), instance))
+			require.NoError(t, k8sClient.Create(t.Context(), instance))
 			t.Cleanup(func() {
-				if err := k8sClient.Delete(context.Background(), instance); err != nil && !apierrors.IsNotFound(err) {
+				if err := k8sClient.Delete(t.Context(), instance); err != nil && !apierrors.IsNotFound(err) {
 					t.Logf("Failed to delete LlamaStackDistribution instance %s/%s: %v", instance.Namespace, instance.Name, err)
 				}
 			})
@@ -179,15 +178,15 @@ server:
   port: 8321`,
 		},
 	}
-	require.NoError(t, k8sClient.Create(context.Background(), configMap))
+	require.NoError(t, k8sClient.Create(t.Context(), configMap))
 
 	// Create a LlamaStackDistribution that references the ConfigMap
 	instance := NewDistributionBuilder().
 		WithName("test-configmap-reference").
 		WithNamespace(namespace.Name).
 		WithUserConfig(configMap.Name).
 		Build()
-	require.NoError(t, k8sClient.Create(context.Background(), instance))
+	require.NoError(t, k8sClient.Create(t.Context(), instance))
 
 	// Reconcile to create initial deployment
 	ReconcileDistribution(t, instance, false)
@@ -204,7 +203,7 @@ server:
 	require.NotEmpty(t, initialHash, "ConfigMap hash should not be empty")
 
 	// Update the ConfigMap data
-	require.NoError(t, k8sClient.Get(context.Background(),
+	require.NoError(t, k8sClient.Get(t.Context(),
 		types.NamespacedName{Name: configMap.Name, Namespace: configMap.Namespace}, configMap))
 
 	configMap.Data["run.yaml"] = `version: '2'
@@ -223,7 +222,7 @@ models:
     model_type: llm
 server:
   port: 8321`
-	require.NoError(t, k8sClient.Update(context.Background(), configMap))
+	require.NoError(t, k8sClient.Update(t.Context(), configMap))
 
 	// Wait a moment for the watch to trigger
 	time.Sleep(2 * time.Second)
@@ -250,7 +249,7 @@ server:
 			"some-key": "some-value",
 		},
 	}
-	require.NoError(t, k8sClient.Create(context.Background(), unrelatedConfigMap))
+	require.NoError(t, k8sClient.Create(t.Context(), unrelatedConfigMap))
 
 	// Note: In test environment, field indexer might not be set up properly,
 	// so we skip the isConfigMapReferenced checks which rely on field indexing
@@ -284,7 +283,7 @@ func TestReconcile(t *testing.T) {
 		WithDistribution("starter").
 		WithPort(instancePort).
 		Build()
-	require.NoError(t, k8sClient.Create(context.Background(), instance))
+	require.NoError(t, k8sClient.Create(t.Context(), instance))
 
 	// --- act ---
 	ReconcileDistribution(t, instance, true)
@@ -399,7 +398,7 @@ func TestLlamaStackProviderAndVersionInfo(t *testing.T) {
 		WithName("test-status-instance").
 		WithNamespace(namespace.Name).
 		Build()
-	require.NoError(t, k8sClient.Create(context.Background(), instance))
+	require.NoError(t, k8sClient.Create(t.Context(), instance))
 
 	testClusterInfo := &cluster.ClusterInfo{
 		DistributionImages: map[string]string{
@@ -417,7 +416,7 @@ func TestLlamaStackProviderAndVersionInfo(t *testing.T) {
 
 	// act (part 1)
 	// run the first reconciliation to create the initial resources like the deployment
-	_, err := reconciler.Reconcile(context.Background(), ctrl.Request{
+	_, err := reconciler.Reconcile(t.Context(), ctrl.Request{
 		NamespacedName: types.NamespacedName{Name: instance.Name, Namespace: instance.Namespace},
 	})
 	require.NoError(t, err)
@@ -430,11 +429,11 @@ func TestLlamaStackProviderAndVersionInfo(t *testing.T) {
 
 	deployment.Status.ReadyReplicas = 1
 	deployment.Status.Replicas = 1
-	require.NoError(t, k8sClient.Status().Update(context.Background(), deployment))
+	require.NoError(t, k8sClient.Status().Update(t.Context(), deployment))
 
 	// act (part 2)
 	// run the second reconciliation to trigger the status update logic
-	_, err = reconciler.Reconcile(context.Background(), ctrl.Request{
+	_, err = reconciler.Reconcile(t.Context(), ctrl.Request{
 		NamespacedName: types.NamespacedName{Name: instance.Name, Namespace: instance.Namespace},
 	})
 	require.NoError(t, err)
@@ -492,8 +491,8 @@ func TestNetworkPolicyConfiguration(t *testing.T) {
 				WithNamespace(namespace.Name).
 				WithDistribution("starter").
 				Build()
-			require.NoError(t, k8sClient.Create(context.Background(), instance))
-			t.Cleanup(func() { _ = k8sClient.Delete(context.Background(), instance) })
+			require.NoError(t, k8sClient.Create(t.Context(), instance))
+			t.Cleanup(func() { _ = k8sClient.Delete(t.Context(), instance) })
 
 			// preconditions for this scenario
 			tt.setup(t, instance)
diff --git a/controllers/resource_helper_test.go b/controllers/resource_helper_test.go
@@ -17,7 +17,6 @@ limitations under the License.
 package controllers
 
 import (
-	"context"
 	"strings"
 	"testing"
 
@@ -183,7 +182,7 @@ func TestBuildContainerSpec(t *testing.T) {
 
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
-			result := buildContainerSpec(context.Background(), nil, tc.instance, tc.image)
+			result := buildContainerSpec(t.Context(), nil, tc.instance, tc.image)
 			assert.Equal(t, tc.expectedResult.Name, result.Name)
 			assert.Equal(t, tc.expectedResult.Image, result.Image)
 			assert.Equal(t, tc.expectedResult.Ports, result.Ports)
@@ -275,7 +274,7 @@ func TestConfigurePodStorage(t *testing.T) {
 
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
-			result := configurePodStorage(context.Background(), nil, tc.instance, tc.container)
+			result := configurePodStorage(t.Context(), nil, tc.instance, tc.container)
 
 			// Verify container was added.
 			assert.Len(t, result.Containers, 1)
diff --git a/controllers/testing_support_test.go b/controllers/testing_support_test.go
@@ -1,7 +1,6 @@
 package controllers_test
 
 import (
-	"context"
 	"fmt"
 	"slices"
 	"testing"
@@ -185,7 +184,7 @@ func AssertPVCExists(t *testing.T, client client.Client, namespace, name string)
 	key := types.NamespacedName{Name: name, Namespace: namespace}
 
 	require.Eventually(t, func() bool {
-		return client.Get(context.Background(), key, pvc) == nil
+		return client.Get(t.Context(), key, pvc) == nil
 	}, testTimeout, testInterval, "PVC %s should exist in namespace %s", name, namespace)
 
 	return pvc
@@ -387,7 +386,7 @@ func AssertNetworkPolicyAbsent(t *testing.T, c client.Client, key types.Namespac
 	t.Helper()
 	require.Eventually(t, func() bool {
 		var np networkingv1.NetworkPolicy
-		err := c.Get(context.Background(), key, &np)
+		err := c.Get(t.Context(), key, &np)
 		return apierrors.IsNotFound(err)
 	}, testTimeout, testInterval, "NetworkPolicy %s/%s should not exist", key.Namespace, key.Name)
 }
@@ -403,7 +402,7 @@ func ReconcileDistribution(t *testing.T, instance *llamav1alpha1.LlamaStackDistr
 	// Create reconciler and run reconciliation
 	reconciler := createTestReconciler()
 	reconciler.EnableNetworkPolicy = enableNetworkPolicy
-	_, err := reconciler.Reconcile(context.Background(), ctrl.Request{
+	_, err := reconciler.Reconcile(t.Context(), ctrl.Request{
 		NamespacedName: types.NamespacedName{
 			Name:      instance.Name,
 			Namespace: instance.Namespace,
@@ -470,7 +469,7 @@ func waitForResourceWithKeyAndCondition(t *testing.T, client client.Client, key
 	t.Helper()
 	// envtest interacts with a real API server, which is eventually consistent.
 	require.Eventually(t, func() bool {
-		err := client.Get(context.Background(), key, resource)
+		err := client.Get(t.Context(), key, resource)
 		if err != nil {
 			return false
 		}
@@ -495,12 +494,12 @@ func createTestNamespace(t *testing.T, namePrefix string) *corev1.Namespace {
 			Name: nsName,
 		},
 	}
-	require.NoError(t, k8sClient.Create(context.Background(), namespace))
+	require.NoError(t, k8sClient.Create(t.Context(), namespace))
 
 	// Attempt to delete the namespace after the test. While envtest might not fully reclaim it,
 	// this is good practice and helps keep the test environment cleaner.
 	t.Cleanup(func() {
-		if err := k8sClient.Delete(context.Background(), namespace); err != nil {
+		if err := k8sClient.Delete(t.Context(), namespace); err != nil {
 			t.Logf("Failed to delete test namespace %s: %v", namespace.Name, err)
 		}
 	})
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/llamastack/llama-stack-k8s-operator
 
-go 1.23.0
+go 1.24.6
 
 require (
 	github.com/go-logr/logr v1.4.1
diff --git a/pkg/compare/comparison_test.go b/pkg/compare/comparison_test.go
@@ -73,7 +73,7 @@ func TestHasUnexpectedServiceChanges(t *testing.T) {
 		{
 			name: "only cluster-managed metadata changed",
 			modifier: func(s *corev1.Service) {
-				s.ObjectMeta.ResourceVersion = "2"
+				s.ResourceVersion = "2"
 			},
 			expectChange: false,
 		},
diff --git a/pkg/deploy/deploy_test.go b/pkg/deploy/deploy_test.go
@@ -1,7 +1,6 @@
 package deploy
 
 import (
-	"context"
 	"testing"
 
 	llamav1alpha1 "github.com/llamastack/llama-stack-k8s-operator/api/v1alpha1"
@@ -14,7 +13,7 @@ import (
 )
 
 func TestApplyDeploymentPreservesSelector(t *testing.T) {
-	ctx := context.Background()
+	ctx := t.Context()
 	logger := logf.Log.WithName("test-apply-deployment")
 
 	instance := &llamav1alpha1.LlamaStackDistribution{
diff --git a/pkg/deploy/kustomizer_test.go b/pkg/deploy/kustomizer_test.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"path/filepath"
 	"testing"
+	"time"
 
 	llamav1alpha1 "github.com/llamastack/llama-stack-k8s-operator/api/v1alpha1"
 	"github.com/llamastack/llama-stack-k8s-operator/pkg/deploy/plugins"
@@ -28,14 +29,15 @@ const manifestBasePath = "manifests/base"
 func setupApplyResourcesTest(t *testing.T, ownerName string) (context.Context, string, *llamav1alpha1.LlamaStackDistribution) {
 	t.Helper()
 
-	ctx := context.Background()
+	ctx, cancel := context.WithTimeout(t.Context(), 30*time.Second) // to avlid client rate limit due to too many test in parallel
 	testNs := "test-apply-" + ownerName
 	ns := &corev1.Namespace{
 		ObjectMeta: metav1.ObjectMeta{Name: testNs},
 	}
 	require.NoError(t, k8sClient.Create(ctx, ns))
 	t.Cleanup(func() {
-		require.NoError(t, k8sClient.Delete(ctx, ns))
+		cancel()
+		require.NoError(t, k8sClient.Delete(context.Background(), ns)) //nolint:usetesting
 	})
 
 	owner := &llamav1alpha1.LlamaStackDistribution{
@@ -50,7 +52,7 @@ func setupApplyResourcesTest(t *testing.T, ownerName string) (context.Context, s
 	}
 	ownerGVK := owner.GroupVersionKind()
 
-	require.NoError(t, k8sClient.Create(context.Background(), owner))
+	require.NoError(t, k8sClient.Create(ctx, owner))
 	require.NotEmpty(t, owner.UID)
 
 	createdOwner := &llamav1alpha1.LlamaStackDistribution{}
@@ -416,7 +418,7 @@ func TestApplyResources(t *testing.T) {
 		require.Empty(t, createdClusterRole.GetOwnerReferences(), "cluster-scoped resource should not have an owner reference from a namespaced owner")
 
 		// cleanup the clusterrole
-		require.NoError(t, k8sClient.Delete(context.Background(), createdClusterRole))
+		require.NoError(t, k8sClient.Delete(t.Context(), createdClusterRole))
 	})
 }
 
diff --git a/tests/e2e/tls_test.go b/tests/e2e/tls_test.go
