Upgrade go version to 1.21.0 (#5618)

* Upgrade go version to 1.21.0 Signed-off-by: Alex Le <[email protected]> * fix lint Signed-off-by: Alex Le <[email protected]> * fix lint Signed-off-by: Alex Le <[email protected]> * fix tls test Signed-off-by: Alex Le <[email protected]> --------- Signed-off-by: Alex Le <[email protected]>
cortexproject · Oct 24, 2023 · 8505ac4 · 8505ac4
1 parent 1d2e2ee
commit 8505ac4
Show file tree

Hide file tree

Showing 11 changed files with 100 additions and 22 deletions.
diff --git a/.github/workflows/test-build-deploy.yml b/.github/workflows/test-build-deploy.yml
@@ -11,7 +11,7 @@ jobs:
   lint:
     runs-on: ubuntu-20.04
     container:
-      image: quay.io/cortexproject/build-image:upgrade-to-go-1.20.4-6025f83e5
+      image: quay.io/cortexproject/build-image:feature-master-update-to-go-1.21-050c36e7b
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
@@ -40,7 +40,7 @@ jobs:
   test:
     runs-on: ubuntu-20.04
     container:
-      image: quay.io/cortexproject/build-image:upgrade-to-go-1.20.4-6025f83e5
+      image: quay.io/cortexproject/build-image:feature-master-update-to-go-1.21-050c36e7b
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
@@ -59,7 +59,7 @@ jobs:
   build:
     runs-on: ubuntu-20.04
     container:
-      image: quay.io/cortexproject/build-image:upgrade-to-go-1.20.4-6025f83e5
+      image: quay.io/cortexproject/build-image:feature-master-update-to-go-1.21-050c36e7b
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
@@ -118,7 +118,7 @@ jobs:
       - name: Upgrade golang
         uses: actions/setup-go@v2
         with:
-          go-version: 1.20.1
+          go-version: 1.21.0
       - name: Checkout Repo
         uses: actions/checkout@v2
       - name: Install Docker Client
@@ -193,14 +193,14 @@ jobs:
         run: |
           touch build-image/.uptodate
           MIGRATIONS_DIR=$(pwd)/cmd/cortex/migrations
-          make BUILD_IMAGE=quay.io/cortexproject/build-image:upgrade-to-go-1.20.4-6025f83e5 TTY='' configs-integration-test
+          make BUILD_IMAGE=quay.io/cortexproject/build-image:feature-master-update-to-go-1.21-050c36e7b TTY='' configs-integration-test
 
   deploy_website:
     needs: [build, test]
     if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')) && github.repository == 'cortexproject/cortex'
     runs-on: ubuntu-20.04
     container:
-      image: quay.io/cortexproject/build-image:upgrade-to-go-1.20.4-6025f83e5
+      image: quay.io/cortexproject/build-image:feature-master-update-to-go-1.21-050c36e7b
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
@@ -242,7 +242,7 @@ jobs:
     if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')) && github.repository == 'cortexproject/cortex'
     runs-on: ubuntu-20.04
     container:
-      image: quay.io/cortexproject/build-image:upgrade-to-go-1.20.4-6025f83e5
+      image: quay.io/cortexproject/build-image:feature-master-update-to-go-1.21-050c36e7b
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2

diff --git a/Makefile b/Makefile
@@ -122,7 +122,7 @@ build-image/$(UPTODATE): build-image/*
 SUDO := $(shell docker info >/dev/null 2>&1 || echo "sudo -E")
 BUILD_IN_CONTAINER := true
 BUILD_IMAGE ?= $(IMAGE_PREFIX)build-image
-LATEST_BUILD_IMAGE_TAG ?= upgrade-to-go-1.20.4-6025f83e5
+LATEST_BUILD_IMAGE_TAG ?= feature-master-update-to-go-1.21-050c36e7b
 
 # TTY is parameterized to allow Google Cloud Builder to run builds,
 # as it currently disallows TTY devices. This value needs to be overridden

diff --git a/build-image/Dockerfile b/build-image/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.20.4-bullseye
+FROM golang:1.21.0-bullseye
 ARG goproxyValue
 ENV GOPROXY=${goproxyValue}
 RUN apt-get update && apt-get install -y curl file jq unzip protobuf-compiler libprotobuf-dev && \

diff --git a/cmd/cortex/main.go b/cmd/cortex/main.go
@@ -174,7 +174,7 @@ func main() {
 	}
 
 	// Initialise seed for randomness usage.
-	rand.Seed(time.Now().UnixNano())
+	rand.New(rand.NewSource(time.Now().UnixNano()))
 
 	t, err := cortex.New(cfg)
 	util_log.CheckFatal("initializing cortex", err)

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/cortexproject/cortex
 
-go 1.18
+go 1.21
 
 require (
 	github.com/Masterminds/squirrel v1.5.4

diff --git a/go.sum b/go.sum
diff --git a/pkg/ring/ring_test.go b/pkg/ring/ring_test.go
@@ -2406,7 +2406,7 @@ func TestRing_ShuffleShardWithLookback_CorrectnessWithFuzzy(t *testing.T) {
 				t.Run(testName, func(t *testing.T) {
 					// Randomise the seed but log it in case we need to reproduce the test on failure.
 					seed := time.Now().UnixNano()
-					rand.Seed(seed)
+					rand.New(rand.NewSource(seed))
 					t.Log("random generator seed:", seed)
 
 					// Initialise the ring.

diff --git a/pkg/storegateway/gateway_test.go b/pkg/storegateway/gateway_test.go
@@ -314,7 +314,7 @@ func TestStoreGateway_InitialSyncWithWaitRingStability(t *testing.T) {
 				//parallel testing causes data race
 				// Randomise the seed but log it in case we need to reproduce the test on failure.
 				seed := time.Now().UnixNano()
-				rand.Seed(seed)
+				rand.New(rand.NewSource(seed))
 				t.Log("random generator seed:", seed)
 
 				ctx := context.Background()
@@ -419,7 +419,7 @@ func TestStoreGateway_BlocksSyncWithDefaultSharding_RingTopologyChangedAfterScal
 
 	// Randomise the seed but log it in case we need to reproduce the test on failure.
 	seed := time.Now().UnixNano()
-	rand.Seed(seed)
+	rand.New(rand.NewSource(seed))
 	t.Log("random generator seed:", seed)
 
 	ctx := context.Background()

diff --git a/pkg/util/grpcencoding/encoding_test.go b/pkg/util/grpcencoding/encoding_test.go
@@ -3,7 +3,6 @@ package grpcencoding
 import (
 	"bytes"
 	"io"
-	"io/ioutil"
 	"strings"
 	"testing"
 
@@ -173,6 +172,6 @@ func decompress(compressor encoding.Compressor, d []byte, maxReceiveMessageSize
 	}
 	// Read from LimitReader with limit max+1. So if the underlying
 	// reader is over limit, the result will be bigger than max.
-	d, err = ioutil.ReadAll(io.LimitReader(dcReader, int64(maxReceiveMessageSize)+1))
+	d, err = io.ReadAll(io.LimitReader(dcReader, int64(maxReceiveMessageSize)+1))
 	return d, len(d), err
 }
diff --git a/pkg/util/metrics_helper_test.go b/pkg/util/metrics_helper_test.go
@@ -461,7 +461,7 @@ func TestFloat64PrecisionStability(t *testing.T) {
 
 	// Randomise the seed but log it in case we need to reproduce the test on failure.
 	seed := time.Now().UnixNano()
-	rand.Seed(seed)
+	rand.New(rand.NewSource(seed))
 	t.Log("random generator seed:", seed)
 
 	// Generate a large number of registries with different metrics each.

diff --git a/pkg/util/tls/test/tls_integration_test.go b/pkg/util/tls/test/tls_integration_test.go
@@ -345,9 +345,11 @@ func TestTLSServerWithLocalhostCertWithClientCertificateEnforcementUsingClientCA
 	cfg.GRPCTLSConfig.ClientAuth = "RequireAndVerifyClientCert"
 
 	// TODO: Investigate why we don't really receive the error about the
-	// bad certificate from the server side and just see connection
+	// certificate required from the server side and just see connection
 	// closed/reset instead
-	badCertErr := errorContainsString("remote error: tls: bad certificate")
+	// In Go 1.21, TLS 1.3 would return certificate required error instead
+	// of bad certificate error
+	certRequiredErr := errorContainsString("remote error: tls: certificate required")
 	newIntegrationClientServer(
 		t,
 		cfg,
@@ -358,7 +360,7 @@ func TestTLSServerWithLocalhostCertWithClientCertificateEnforcementUsingClientCA
 				tlsConfig: tls.ClientConfig{
 					InsecureSkipVerify: true,
 				},
-				httpExpectError: badCertErr,
+				httpExpectError: certRequiredErr,
 				grpcExpectError: unavailableDescErr,
 			},
 			{
@@ -367,7 +369,7 @@ func TestTLSServerWithLocalhostCertWithClientCertificateEnforcementUsingClientCA
 				tlsConfig: tls.ClientConfig{
 					CAPath: certs.caCertFile,
 				},
-				httpExpectError: badCertErr,
+				httpExpectError: certRequiredErr,
 				grpcExpectError: unavailableDescErr,
 			},
 			{
@@ -396,7 +398,7 @@ func TestTLSServerWithLocalhostCertWithClientCertificateEnforcementUsingClientCA
 					CertPath: certs.client2CertFile,
 					KeyPath:  certs.client2KeyFile,
 				},
-				httpExpectError: badCertErr,
+				httpExpectError: certRequiredErr,
 				grpcExpectError: unavailableDescErr,
 			},
 		},