Merge pull request #3087 from wojtek-t/bump_golang

Bump golang in perf-test to 1.23.4
kubernetes · Jan 13, 2025 · 870ce5a · 870ce5a
2 parents 3be6af7 + 2a33258
commit 870ce5a
Show file tree

Hide file tree

Showing 21 changed files with 41 additions and 41 deletions.
diff --git a/benchmark/go.mod b/benchmark/go.mod
@@ -1,6 +1,6 @@
 module k8s.io/perf-tests/benchmark
 
-go 1.22.4
+go 1.23.4
 
 require (
 	github.com/dgryski/go-onlinestats v0.0.0-20170612111826-1c7d19468768

diff --git a/benchmark/pkg/util/util.go b/benchmark/pkg/util/util.go
@@ -188,20 +188,20 @@ func GetFlattennedComparisonData(leftJobMetrics, rightJobMetrics []map[string][]
 	return j
 }
 
-func computeSampleStats(sample []float64, avg, stDev, max *float64) {
+func computeSampleStats(sample []float64, avg, stDev, maxVal *float64) {
 	length := len(sample)
 	if length == 0 {
 		*avg = math.NaN()
 		*stDev = math.NaN()
-		*max = math.NaN()
+		*maxVal = math.NaN()
 		return
 	}
 	sum := 0.0
 	squareSum := 0.0
 	for i := 0; i < length; i++ {
 		sum += sample[i]
 		squareSum += sample[i] * sample[i]
-		*max = math.Max(*max, sample[i])
+		*maxVal = math.Max(*maxVal, sample[i])
 	}
 	*avg = sum / float64(length)
 	*stDev = math.Sqrt(squareSum/float64(length) - (*avg * *avg))

diff --git a/clusterloader2/go.mod b/clusterloader2/go.mod
@@ -1,7 +1,7 @@
 module k8s.io/perf-tests/clusterloader2
 
 // go 1.15+ is required by k8s 1.20 we use as dependency.
-go 1.22.4
+go 1.23.4
 
 replace (
 	k8s.io/api => k8s.io/api v0.29.7

diff --git a/clusterloader2/pkg/config/template_functions.go b/clusterloader2/pkg/config/template_functions.go
@@ -193,22 +193,22 @@ func maxFloat(numbers ...interface{}) float64 {
 	if len(numbers) == 0 {
 		panic("maximum undefined")
 	}
-	max := toFloat64(numbers[0])
+	result := toFloat64(numbers[0])
 	for _, number := range numbers {
-		max = math.Max(max, toFloat64(number))
+		result = math.Max(result, toFloat64(number))
 	}
-	return max
+	return result
 }
 
 func minFloat(numbers ...interface{}) float64 {
 	if len(numbers) == 0 {
 		panic("minimum undefined")
 	}
-	min := toFloat64(numbers[0])
+	result := toFloat64(numbers[0])
 	for _, number := range numbers {
-		min = math.Min(min, toFloat64(number))
+		result = math.Min(result, toFloat64(number))
 	}
-	return min
+	return result
 }
 
 func mod(a interface{}, b interface{}) int {

diff --git a/clusterloader2/pkg/imagepreload/imagepreload.go b/clusterloader2/pkg/imagepreload/imagepreload.go
@@ -112,7 +112,7 @@ func (c *controller) PreloadImages() error {
 				return kclient.CoreV1().Nodes().Watch(context.TODO(), options)
 			},
 		},
-		func(old, new interface{}) { c.checkNode(doneNodes, old, new) })
+		func(oldObj, newObj interface{}) { c.checkNode(doneNodes, oldObj, newObj) })
 	if err := informer.StartAndSync(nodeInformer, stopCh, informerTimeout); err != nil {
 		return err
 	}
@@ -164,15 +164,15 @@ func (c *controller) PreloadImages() error {
 	return nil
 }
 
-func (c *controller) checkNode(set map[string]struct{}, old, new interface{}) {
-	if new != nil {
-		node := new.(*v1.Node)
+func (c *controller) checkNode(set map[string]struct{}, oldObj, newObj interface{}) {
+	if newObj != nil {
+		node := newObj.(*v1.Node)
 		preloaded := c.hasPreloadedImages(node)
 		c.markDone(set, node.Name, preloaded)
 		return
 	}
-	if old != nil {
-		node := old.(*v1.Node)
+	if oldObj != nil {
+		node := oldObj.(*v1.Node)
 		c.markDone(set, node.Name, false)
 		return
 	}

diff --git a/clusterloader2/pkg/measurement/common/loadbalancer_nodesync_latency.go b/clusterloader2/pkg/measurement/common/loadbalancer_nodesync_latency.go
@@ -293,13 +293,13 @@ func isCandidateNode(node v1.Node) bool {
 	return true
 }
 
-func preparePatchBytes(old, new, refStruct interface{}) ([]byte, error) {
-	oldBytes, err := json.Marshal(old)
+func preparePatchBytes(oldObj, newObj, refStruct interface{}) ([]byte, error) {
+	oldBytes, err := json.Marshal(oldObj)
 	if err != nil {
 		return nil, fmt.Errorf("failed to marshal old object: %v", err)
 	}
 
-	newBytes, err := json.Marshal(new)
+	newBytes, err := json.Marshal(newObj)
 	if err != nil {
 		return nil, fmt.Errorf("failed to marshal new object: %v", err)
 	}

diff --git a/clusterloader2/pkg/measurement/common/network/network_performance_measurement.go b/clusterloader2/pkg/measurement/common/network/network_performance_measurement.go
@@ -285,7 +285,7 @@ func (npm *networkPerformanceMeasurement) gather() (measurement.Summary, error)
 	if err != nil {
 		klog.Infof("Failed to print metrics: %v", err)
 	}
-	summaryName := fmt.Sprintf(npm.String() + "_" + resultSummary.podRatio + "_" + resultSummary.protocol + "_" + resultSummary.service)
+	summaryName := fmt.Sprint(npm.String() + "_" + resultSummary.podRatio + "_" + resultSummary.protocol + "_" + resultSummary.service)
 	return measurement.CreateSummary(summaryName, "json", content), nil
 }
 

diff --git a/clusterloader2/pkg/measurement/common/wait_for_controlled_pods.go b/clusterloader2/pkg/measurement/common/wait_for_controlled_pods.go
@@ -514,7 +514,7 @@ func (w *waitForControlledPodsRunningMeasurement) updateCacheLocked(oldObj, newO
 	if errList.IsEmpty() {
 		return nil
 	}
-	return fmt.Errorf(errList.Error())
+	return errList
 }
 
 func (w *waitForControlledPodsRunningMeasurement) updateOpResourceVersionLocked(runtimeObj runtime.Object) error {

diff --git a/clusterloader2/pkg/measurement/common/wait_for_generic_k8s_object.go b/clusterloader2/pkg/measurement/common/wait_for_generic_k8s_object.go
@@ -135,18 +135,18 @@ func getNamespaces(namespacesPrefix string, params map[string]interface{}) (meas
 	if err != nil {
 		return measurementutil.NamespacesRange{}, err
 	}
-	min, err := util.GetInt(namespaceRange, "min")
+	minParam, err := util.GetInt(namespaceRange, "min")
 	if err != nil {
 		return measurementutil.NamespacesRange{}, err
 	}
-	max, err := util.GetInt(namespaceRange, "max")
+	maxParam, err := util.GetInt(namespaceRange, "max")
 	if err != nil {
 		return measurementutil.NamespacesRange{}, err
 	}
 
 	return measurementutil.NamespacesRange{
 		Prefix: namespacesPrefix,
-		Min:    min,
-		Max:    max,
+		Min:    minParam,
+		Max:    maxParam,
 	}, nil
 }
diff --git a/dns/dnsperfgo/go.mod b/dns/dnsperfgo/go.mod
@@ -1,6 +1,6 @@
 module k8s.io/perf-tests/dns/dnsperfgo
 
-go 1.22.4
+go 1.23.4
 
 require (
 	github.com/prometheus/client_golang v1.20.5

diff --git a/dns/jsonify/go.mod b/dns/jsonify/go.mod
@@ -1,6 +1,6 @@
 module k8s.io/perf-tests/dns/jsonify
 
-go 1.22.4
+go 1.23.4
 
 require (
 	github.com/golang/glog v1.2.3

diff --git a/network/benchmarks/netperf/go.mod b/network/benchmarks/netperf/go.mod
@@ -1,6 +1,6 @@
 module k8s.io/perf-tests/network
 
-go 1.22.4
+go 1.23.4
 
 require (
 	k8s.io/api v0.31.3

diff --git a/network/benchmarks/netperf/nptest/nptest.go b/network/benchmarks/netperf/nptest/nptest.go
@@ -411,14 +411,14 @@ func flushDataPointsToCsv() {
 	for _, label := range dataPointKeys {
 		buffer = fmt.Sprintf("%-45s,", label)
 		points := dataPoints[label]
-		var max float64
+		var result float64
 		for _, p := range points {
 			fv, _ := strconv.ParseFloat(p.bandwidth, 64)
-			if fv > max {
-				max = fv
+			if fv > result {
+				result = fv
 			}
 		}
-		buffer = buffer + fmt.Sprintf("%f,", max)
+		buffer = buffer + fmt.Sprintf("%f,", result)
 		for _, p := range points {
 			buffer = buffer + fmt.Sprintf("%s,", p.bandwidth)
 		}

diff --git a/network/tools/network-policy-enforcement-latency/go.mod b/network/tools/network-policy-enforcement-latency/go.mod
@@ -1,6 +1,6 @@
 module k8s.io/perf-tests/network/tools/network-policy-enforcement-latency
 
-go 1.22.4
+go 1.23.4
 
 require (
 	github.com/prometheus/client_golang v1.20.5

diff --git a/perfdash/go.mod b/perfdash/go.mod
@@ -1,6 +1,6 @@
 module k8s.io/perf-tests/perfdash
 
-go 1.22.4
+go 1.23.4
 
 require (
 	cloud.google.com/go v0.116.0 // indirect

diff --git a/slo-monitor/go.mod b/slo-monitor/go.mod
@@ -1,6 +1,6 @@
 module k8s.io/perf-tests/slo-monitor
 
-go 1.22.4
+go 1.23.4
 
 require (
 	github.com/golang/glog v1.2.3

diff --git a/util-images/access-tokens/go.mod b/util-images/access-tokens/go.mod
@@ -1,6 +1,6 @@
 module k8s.io/perf-tests/access-tokens
 
-go 1.22.4
+go 1.23.4
 
 require (
 	github.com/spf13/pflag v1.0.5

diff --git a/util-images/network/netperfbenchmark/go.mod b/util-images/network/netperfbenchmark/go.mod
@@ -1,6 +1,6 @@
 module k8s.io/perf-tests/util-images/network/netperfbenchmark
 
-go 1.22.4
+go 1.23.4
 
 require (
 	k8s.io/apimachinery v0.31.3

diff --git a/util-images/probes/go.mod b/util-images/probes/go.mod
@@ -1,6 +1,6 @@
 module k8s.io/perf-tests/util-images/probes
 
-go 1.22.4
+go 1.23.4
 
 require (
 	github.com/prometheus/client_golang v1.20.5

diff --git a/util-images/request-benchmark/go.mod b/util-images/request-benchmark/go.mod
@@ -1,6 +1,6 @@
 module k8s.io/perf-tests/request-benchmark
 
-go 1.22.4
+go 1.23.4
 
 require k8s.io/client-go v0.31.3
 

diff --git a/util-images/watch-list/go.mod b/util-images/watch-list/go.mod
@@ -1,6 +1,6 @@
 module k8s.io/perf-tests/watch-list
 
-go 1.22.4
+go 1.23.4
 
 require (
 	k8s.io/apimachinery v0.31.3