internal/featuretests: fix test merge conflicts (#6057)

Signed-off-by: Steve Kriss <[email protected]>
projectcontour · Jan 5, 2024 · 387e6a7 · 387e6a7
1 parent c60a501
commit 387e6a7
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/internal/featuretests/v3/cluster_test.go b/internal/featuretests/v3/cluster_test.go
@@ -497,6 +497,7 @@ func TestClusterCircuitbreakerAnnotationsIngress(t *testing.T) {
 						MaxRequests:        wrapperspb.UInt32(15),
 						MaxRetries:         wrapperspb.UInt32(17),
 					}},
+					PerHostThresholds: []*envoy_cluster_v3.CircuitBreakers_Thresholds{{}},
 				},
 			}),
 		),
@@ -530,6 +531,7 @@ func TestClusterCircuitbreakerAnnotationsIngress(t *testing.T) {
 						MaxRequests:        wrapperspb.UInt32(15),
 						MaxRetries:         wrapperspb.UInt32(17),
 					}},
+					PerHostThresholds: []*envoy_cluster_v3.CircuitBreakers_Thresholds{{}},
 				},
 			}),
 		),
@@ -595,6 +597,7 @@ func TestClusterCircuitbreakerAnnotationsHTTPProxy(t *testing.T) {
 						MaxRequests:        wrapperspb.UInt32(404),
 						MaxRetries:         wrapperspb.UInt32(7),
 					}},
+					PerHostThresholds: []*envoy_cluster_v3.CircuitBreakers_Thresholds{{}},
 				},
 			}),
 		),
@@ -628,6 +631,7 @@ func TestClusterCircuitbreakerAnnotationsHTTPProxy(t *testing.T) {
 						MaxRequests:        wrapperspb.UInt32(15),
 						MaxRetries:         wrapperspb.UInt32(17),
 					}},
+					PerHostThresholds: []*envoy_cluster_v3.CircuitBreakers_Thresholds{{}},
 				},
 			}),
 		),
@@ -661,6 +665,7 @@ func TestClusterCircuitbreakerAnnotationsHTTPProxy(t *testing.T) {
 						MaxRequests:        wrapperspb.UInt32(15),
 						MaxRetries:         wrapperspb.UInt32(17),
 					}},
+					PerHostThresholds: []*envoy_cluster_v3.CircuitBreakers_Thresholds{{}},
 				},
 			}),
 		),
@@ -769,6 +774,7 @@ func TestClusterCircuitbreakerAnnotationsGateway(t *testing.T) {
 						MaxRequests:        wrapperspb.UInt32(404),
 						MaxRetries:         wrapperspb.UInt32(7),
 					}},
+					PerHostThresholds: []*envoy_cluster_v3.CircuitBreakers_Thresholds{{}},
 				},
 			}),
 		),
@@ -802,6 +808,7 @@ func TestClusterCircuitbreakerAnnotationsGateway(t *testing.T) {
 						MaxRequests:        wrapperspb.UInt32(15),
 						MaxRetries:         wrapperspb.UInt32(17),
 					}},
+					PerHostThresholds: []*envoy_cluster_v3.CircuitBreakers_Thresholds{{}},
 				},
 			}),
 		),