Update: Refactor ErrorUtilizationPenalty to use integer type with percentage-based representation in Gateway CRDs, configurations, and tests. Adjust related documentation and ensure backward compatibility.

Signed-off-by: anurag.ag <[email protected]>

Author: anuragagarwal561994

internal/gatewayapi/clustersettings.go

@@ -362,8 +362,7 @@ func buildLoadBalancer(policy *egv1a1.ClusterSettings) (*ir.LoadBalancer, error)
 				}
 			}
 			if cswrr.ErrorUtilizationPenalty != nil {
-				v := float32(*cswrr.ErrorUtilizationPenalty) / 100.0
-				lb.ClientSideWeightedRoundRobin.ErrorUtilizationPenalty = &v
+				lb.ClientSideWeightedRoundRobin.ErrorUtilizationPenalty = ptr.To(*cswrr.ErrorUtilizationPenalty)
 			}
 			if len(cswrr.MetricNamesForComputingUtilization) > 0 {
 				lb.ClientSideWeightedRoundRobin.MetricNamesForComputingUtilization = append([]string(nil), cswrr.MetricNamesForComputingUtilization...)

internal/gatewayapi/clustersettings_cswrr_test.go

@@ -43,6 +43,6 @@ func TestBuildLoadBalancer_ClientSideWeightedRoundRobin(t *testing.T) {
 	require.Equal(t, ptr.To(metav1.Duration{Duration: 3 * time.Minute}), got.WeightExpirationPeriod)
 	require.Equal(t, ptr.To(metav1.Duration{Duration: 1 * time.Second}), got.WeightUpdatePeriod)
 	require.NotNil(t, got.ErrorUtilizationPenalty)
-	require.InDelta(t, 1.5, *got.ErrorUtilizationPenalty, 0.0001)
+	require.EqualValues(t, 150, *got.ErrorUtilizationPenalty)
 	require.Equal(t, []string{"named_metrics.foo", "cpu_utilization"}, got.MetricNamesForComputingUtilization)
 }

internal/gatewayapi/testdata/backendtrafficpolicy-with-loadbalancer.out.yaml

@@ -705,7 +705,7 @@ xdsIR:
           loadBalancer:
             clientSideWeightedRoundRobin:
               blackoutPeriod: 10s
-              errorUtilizationPenalty: 1
+              errorUtilizationPenalty: 100
               metricNamesForComputingUtilization:
               - cpu_utilization
               weightExpirationPeriod: 1m0s

internal/ir/xds.go

@@ -2640,7 +2640,7 @@ type ClientSideWeightedRoundRobin struct {
 	BlackoutPeriod                     *metav1.Duration `json:"blackoutPeriod,omitempty" yaml:"blackoutPeriod,omitempty"`
 	WeightExpirationPeriod             *metav1.Duration `json:"weightExpirationPeriod,omitempty" yaml:"weightExpirationPeriod,omitempty"`
 	WeightUpdatePeriod                 *metav1.Duration `json:"weightUpdatePeriod,omitempty" yaml:"weightUpdatePeriod,omitempty"`
-	ErrorUtilizationPenalty            *float32         `json:"errorUtilizationPenalty,omitempty" yaml:"errorUtilizationPenalty,omitempty"`
+	ErrorUtilizationPenalty            *uint32          `json:"errorUtilizationPenalty,omitempty" yaml:"errorUtilizationPenalty,omitempty"`
 	MetricNamesForComputingUtilization []string         `json:"metricNamesForComputingUtilization,omitempty" yaml:"metricNamesForComputingUtilization,omitempty"`
 }
 

internal/ir/zz_generated.deepcopy.go

@@ -413,7 +413,7 @@ func buildXdsCluster(args *xdsClusterArgs) (*buildClusterResult, error) {
 				cswrr.WeightUpdatePeriod = durationpb.New(v.WeightUpdatePeriod.Duration)
 			}
 			if v.ErrorUtilizationPenalty != nil {
-				cswrr.ErrorUtilizationPenalty = wrapperspb.Float(float32(*v.ErrorUtilizationPenalty))
+				cswrr.ErrorUtilizationPenalty = wrapperspb.Float(float32(*v.ErrorUtilizationPenalty) / 100.0)
 			}
 			if len(v.MetricNamesForComputingUtilization) > 0 {
 				cswrr.MetricNamesForComputingUtilization = append([]string(nil), v.MetricNamesForComputingUtilization...)

internal/xds/translator/cluster.go

@@ -210,7 +210,7 @@ http:
           blackoutPeriod: 30s
           weightExpirationPeriod: 60s
           weightUpdatePeriod: 10s
-          errorUtilizationPenalty: 1
+          errorUtilizationPenalty: 100
           metricNamesForComputingUtilization:
           - "cpu_utilization"
     destination:

internal/xds/translator/testdata/in/xds-ir/load-balancer.yaml

@@ -623,7 +623,7 @@ func TestBackendTrafficPolicyTarget(t *testing.T) {
 			},
 		},
 		{
-			desc: "cswrr with negative penalty is invalid",
+			desc: "cswrr with zero penalty is valid",
 			mutate: func(btp *egv1a1.BackendTrafficPolicy) {
 				btp.Spec = egv1a1.BackendTrafficPolicySpec{
 					PolicyTargetReferences: egv1a1.PolicyTargetReferences{
@@ -638,14 +638,12 @@ func TestBackendTrafficPolicyTarget(t *testing.T) {
 					ClusterSettings: egv1a1.ClusterSettings{
 						LoadBalancer: &egv1a1.LoadBalancer{
 							Type:                         egv1a1.ClientSideWeightedRoundRobinLoadBalancerType,
-							ClientSideWeightedRoundRobin: &egv1a1.ClientSideWeightedRoundRobin{ErrorUtilizationPenalty: ptr.To[float32](-1)},
+							ClientSideWeightedRoundRobin: &egv1a1.ClientSideWeightedRoundRobin{ErrorUtilizationPenalty: ptr.To[uint32](0)},
 						},
 					},
 				}
 			},
-			wantErrors: []string{
-				"Invalid value: -1: spec.loadBalancer.clientSideWeightedRoundRobin.errorUtilizationPenalty in body should be greater than or equal to 0",
-			},
+			wantErrors: []string{},
 		},
 		{
 			desc: "Using both httpStatus and grpcStatus in abort fault injection",