Merge pull request #69670 from atlassian/simplify-rand-seed

Simplify rand seeding

test/e2e/network/service.go

@@ -1111,7 +1111,7 @@ var _ = SIGDescribe("Services", func() {
 		}
 
 		outOfRangeNodePort := 0
-		rand.Seed(time.Now().UTC().UnixNano())
+		rand.Seed(time.Now().UnixNano())
 		for {
 			outOfRangeNodePort = 1 + rand.Intn(65535)
 			if !framework.ServiceNodePortRange.Contains(outOfRangeNodePort) {

test/e2e/storage/pd.go

@@ -79,7 +79,7 @@ var _ = utils.SIGDescribe("Pod Disks", func() {
 		host0Name = types.NodeName(nodes.Items[0].ObjectMeta.Name)
 		host1Name = types.NodeName(nodes.Items[1].ObjectMeta.Name)
 
-		mathrand.Seed(time.Now().UTC().UnixNano())
+		mathrand.Seed(time.Now().UnixNano())
 	})
 
 	Context("schedule pods each with a PD, delete pod and verify detach [Slow]", func() {

test/e2e/storage/vsphere/BUILD

@@ -46,6 +46,7 @@ go_library(
         "//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library",
+        "//staging/src/k8s.io/apimachinery/pkg/util/rand:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/util/uuid:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",
         "//staging/src/k8s.io/client-go/kubernetes:go_default_library",

test/e2e/storage/vsphere/vsphere_utils.go

@@ -19,7 +19,6 @@ package vsphere
 import (
 	"context"
 	"fmt"
-	"math/rand"
 	"path/filepath"
 	"regexp"
 	"strings"
@@ -37,6 +36,7 @@ import (
 	storage "k8s.io/api/storage/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/util/rand"
 	"k8s.io/apimachinery/pkg/util/uuid"
 	"k8s.io/apimachinery/pkg/util/wait"
 	clientset "k8s.io/client-go/kubernetes"
@@ -747,7 +747,6 @@ func GetReadySchedulableNodeInfos() []*NodeInfo {
 // and it's associated NodeInfo object is returned.
 func GetReadySchedulableRandomNodeInfo() *NodeInfo {
 	nodesInfo := GetReadySchedulableNodeInfos()
-	rand.Seed(time.Now().Unix())
 	Expect(nodesInfo).NotTo(BeEmpty())
 	return nodesInfo[rand.Int()%len(nodesInfo)]
 }

test/e2e_node/e2e_node_suite_test.go

@@ -74,6 +74,7 @@ func init() {
 }
 
 func TestMain(m *testing.M) {
+	rand.Seed(time.Now().UnixNano())
 	pflag.Parse()
 	framework.AfterReadingAllFlags(&framework.TestContext)
 	os.Exit(m.Run())
@@ -119,7 +120,6 @@ func TestE2eNode(t *testing.T) {
 		return
 	}
 	// If run-services-mode is not specified, run test.
-	rand.Seed(time.Now().UTC().UnixNano())
 	RegisterFailHandler(Fail)
 	reporters := []Reporter{}
 	reportDir := framework.TestContext.ReportDir

test/e2e_node/runner/remote/run_remote.go

@@ -188,7 +188,7 @@ func main() {
 		glog.Fatalf("--test-suite must be one of default or conformance")
 	}
 
-	rand.Seed(time.Now().UTC().UnixNano())
+	rand.Seed(time.Now().UnixNano())
 	if *buildOnly {
 		// Build the archive and exit
 		remote.CreateTestArchive(suite, *systemSpecName)

test/images/logs-generator/logs_generator.go

@@ -60,7 +60,6 @@ func main() {
 // Outputs linesTotal lines of logs to stdout uniformly for duration
 func generateLogs(linesTotal int, duration time.Duration) {
 	delay := duration / time.Duration(linesTotal)
-	rand.Seed(time.Now().UnixNano())
 
 	ticker := time.NewTicker(delay)
 	defer ticker.Stop()

test/integration/volume/main_test.go

@@ -17,11 +17,14 @@ limitations under the License.
 package volume
 
 import (
+	"math/rand"
 	"testing"
+	"time"
 
 	"k8s.io/kubernetes/test/integration/framework"
 )
 
 func TestMain(m *testing.M) {
+	rand.Seed(time.Now().UnixNano())
 	framework.EtcdMain(m.Run)
 }

test/integration/volume/persistent_volumes_test.go

@@ -256,7 +256,6 @@ func TestPersistentVolumeBindRace(t *testing.T) {
 	glog.V(2).Infof("TestPersistentVolumeBindRace claims created")
 
 	// putting a bind manually on a pv should only match the claim it is bound to
-	rand.Seed(time.Now().Unix())
 	claim := claims[rand.Intn(maxClaims-1)]
 	claimRef, err := ref.GetReference(legacyscheme.Scheme, claim)
 	if err != nil {