Merge pull request #8396 from joelsmith/k8smaster

k8s-ci-robot · web-flow · commit 172bf01dedb8 · 2025-08-13T16:05:11.000-07:00
Fix balancer &amp; CA kwok build / govet errors
diff --git a/balancer/pkg/controller/conditions.go b/balancer/pkg/controller/conditions.go
@@ -32,7 +32,7 @@ func setConditionsBasedOnError(balancer *v1alpha1.Balancer, err *BalancerError,
 	} else {
 		balancer.Status.Conditions = setConditionInList(balancer.Status.Conditions,
 			now, v1alpha1.BalancerConditionRunning, metav1.ConditionFalse,
-			string(err.phase), err.Error())
+			string(err.phase), "%s", err.Error())
 	}
 }
 
diff --git a/cluster-autoscaler/cloudprovider/clusterapi/clusterapi_controller_test.go b/cluster-autoscaler/cloudprovider/clusterapi/clusterapi_controller_test.go
@@ -20,7 +20,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"k8s.io/apimachinery/pkg/types"
 	"math/rand"
 	"path"
 	"reflect"
@@ -36,6 +35,7 @@ import (
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/wait"
 	fakediscovery "k8s.io/client-go/discovery/fake"
 	"k8s.io/client-go/dynamic"
diff --git a/cluster-autoscaler/cloudprovider/kwok/kwok_nodegroups.go b/cluster-autoscaler/cloudprovider/kwok/kwok_nodegroups.go
@@ -29,7 +29,7 @@ import (
 	klog "k8s.io/klog/v2"
 )
 
-var (
+const (
 	sizeIncreaseMustBePositiveErr   = "size increase must be positive"
 	maxSizeReachedErr               = "size increase too large"
 	minSizeReachedErr               = "min size reached, nodes will not be deleted"

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ func setConditionsBasedOnError(balancer v1alpha1.Balancer, err BalancerError,`
`32`	`32`	`} else {`
`33`	`33`	`balancer.Status.Conditions = setConditionInList(balancer.Status.Conditions,`
`34`	`34`	`now, v1alpha1.BalancerConditionRunning, metav1.ConditionFalse,`
`35`		`- string(err.phase), err.Error())`
	`35`	`+ string(err.phase), "%s", err.Error())`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ import (`
`29`	`29`	`klog "k8s.io/klog/v2"`
`30`	`30`	`)`
`31`	`31`
`32`		`-var (`
	`32`	`+const (`
`33`	`33`	`sizeIncreaseMustBePositiveErr = "size increase must be positive"`
`34`	`34`	`maxSizeReachedErr = "size increase too large"`
`35`	`35`	`minSizeReachedErr = "min size reached, nodes will not be deleted"`