From b3373320daf5655173dc0d160d529452c4258ad0 Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Thu, 14 Aug 2025 12:15:41 -0700 Subject: [PATCH] switch volumemanager reconciler tests to fnv-1a 128 bit fnv-1a is a pretty good non-cryptographic drop-in for md5, it should be faster, and this test code is not sensitive anyhow --- .../volumemanager/reconciler/reconciler_test.go | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkg/kubelet/volumemanager/reconciler/reconciler_test.go b/pkg/kubelet/volumemanager/reconciler/reconciler_test.go index 5759eb27207..ec907e886bb 100644 --- a/pkg/kubelet/volumemanager/reconciler/reconciler_test.go +++ b/pkg/kubelet/volumemanager/reconciler/reconciler_test.go @@ -18,8 +18,8 @@ package reconciler import ( "context" - "crypto/md5" "fmt" + "hash/fnv" "path/filepath" "sync" "testing" @@ -1523,16 +1523,14 @@ func Test_UncertainDeviceGlobalMounts(t *testing.T) { modes := []v1.PersistentVolumeMode{v1.PersistentVolumeBlock, v1.PersistentVolumeFilesystem} + hasher := fnv.New128a() for modeIndex := range modes { for tcIndex := range tests { mode := modes[modeIndex] tc := tests[tcIndex] testName := fmt.Sprintf("%s [%s]", tc.name, mode) uniqueTestString := fmt.Sprintf("global-mount-%s", testName) - // TODO: finish removing existing md5 usage - // https://github.com/kubernetes/kubernetes/issues/129652 - //nolint:forbidigo - uniquePodDir := fmt.Sprintf("%s-%x", kubeletPodsDir, md5.Sum([]byte(uniqueTestString))) + uniquePodDir := fmt.Sprintf("%s-%x", kubeletPodsDir, hasher.Sum([]byte(uniqueTestString))) t.Run(testName+"[", func(t *testing.T) { t.Parallel() pv := &v1.PersistentVolume{ @@ -1739,16 +1737,14 @@ func Test_UncertainVolumeMountState(t *testing.T) { } modes := []v1.PersistentVolumeMode{v1.PersistentVolumeBlock, v1.PersistentVolumeFilesystem} + hasher := fnv.New128a() for modeIndex := range modes { for tcIndex := range tests { mode := modes[modeIndex] tc := tests[tcIndex] testName := fmt.Sprintf("%s [%s]", tc.name, mode) uniqueTestString := fmt.Sprintf("local-mount-%s", testName) - // TODO: finish removing existing md5 usage - // https://github.com/kubernetes/kubernetes/issues/129652 - //nolint:forbidigo - uniquePodDir := fmt.Sprintf("%s-%x", kubeletPodsDir, md5.Sum([]byte(uniqueTestString))) + uniquePodDir := fmt.Sprintf("%s-%x", kubeletPodsDir, hasher.Sum([]byte(uniqueTestString))) t.Run(testName, func(t *testing.T) { t.Parallel() pv := &v1.PersistentVolume{