lbType should not be null for new services

Signed-off-by: Shriram Sharma <[email protected]>
istio-ecosystem · Aug 9, 2024 · 2818580 · 2818580
1 parent 6c0ab62
commit 2818580
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/admiral/pkg/clusters/serviceentry.go b/admiral/pkg/clusters/serviceentry.go
@@ -1599,6 +1599,7 @@ func getWorkloadData(ctxLogger *logrus.Entry, serviceEntry *v1alpha3.ServiceEntr
 				dr.TrafficPolicy.LoadBalancer.LocalityLbSetting.Distribute[0].From == "*" {
 				for region, weight := range dr.TrafficPolicy.LoadBalancer.LocalityLbSetting.Distribute[0].To {
 					trafficDistribution[region] = int32(weight)
+					lbType = model.TrafficPolicy_LbType_name[int32(model.TrafficPolicy_FAILOVER)]
 				}
 			}
 		}

diff --git a/admiral/pkg/clusters/serviceentry_test.go b/admiral/pkg/clusters/serviceentry_test.go
@@ -5959,6 +5959,7 @@ func TestGetWorkloadDataActivePassiveEnabled(t *testing.T) {
 		Env:                 "dev",
 		Aliases:             []string{"dev.custom.testsuffix"},
 		TrafficDistribution: map[string]int32{"us-west-2": 100},
+		LbType:              model.TrafficPolicy_LbType_name[int32(model.TrafficPolicy_FAILOVER)],
 	}
 
 	var workloadDataWithFailoverGTP = WorkloadData{
@@ -6100,7 +6101,7 @@ func TestGetWorkloadDataActivePassiveEnabled(t *testing.T) {
 		t.Run(c.name, func(t *testing.T) {
 			workloadData := getWorkloadData(ctxLogger, c.serviceEntry, c.globalTrafficPolicy, c.additionalEndpoints, c.dr, "dev", c.isSuccess)
 			if !reflect.DeepEqual(workloadData, c.expectedWorkloadData) {
-				assert.Fail(t, "actual and expected workload data do not match. Actual : %v. Expected : %v.", workloadData, c.expectedWorkloadData)
+				assert.Fail(t, "actual and expected workload data do not match.", "Actual : %v. Expected : %v.", workloadData, c.expectedWorkloadData)
 			}
 		})
 	}