Widen the default retriable conditions. (knative#6368)

* Widen the default retriable conditions.

We should follow this up by fixing
knative#6367 for real.

* Extract to variable 'retriableConditions'.

* Split join to multiple lines.

pkg/reconciler/ingress/resources/virtual_service.go

@@ -36,6 +36,14 @@ import (
 	"knative.dev/serving/pkg/resources"
 )
 
+var retriableConditions = strings.Join([]string{
+	"5xx",
+	"connect-failure",
+	"refused-stream",
+	"cancelled",
+	"resource-exhausted",
+	"retriable-status-codes"}, ",")
+
 // VirtualServiceNamespace gives the namespace of the child
 // VirtualServices for a given Ingress.
 func VirtualServiceNamespace(ing *v1alpha1.Ingress) string {
@@ -190,6 +198,8 @@ func makeVirtualServiceRoute(hosts sets.String, http *v1alpha1.HTTPIngressPath,
 		Route:   weights,
 		Timeout: types.DurationProto(http.Timeout.Duration),
 		Retries: &istiov1alpha3.HTTPRetry{
+			// TODO(https://github.com/knative/serving/issues/6367): Allow customization of this.
+			RetryOn:       retriableConditions,
 			Attempts:      int32(http.Retries.Attempts),
 			PerTryTimeout: types.DurationProto(http.Retries.PerTryTimeout.Duration),
 		},

pkg/reconciler/ingress/resources/virtual_service_test.go

@@ -305,6 +305,7 @@ func TestMakeMeshVirtualServiceSpec_CorrectRoutes(t *testing.T) {
 		},
 		Timeout: types.DurationProto(defaultMaxRevisionTimeout),
 		Retries: &istiov1alpha3.HTTPRetry{
+			RetryOn:       retriableConditions,
 			Attempts:      int32(networking.DefaultRetryCount),
 			PerTryTimeout: types.DurationProto(defaultMaxRevisionTimeout),
 		},
@@ -443,6 +444,7 @@ func TestMakeIngressVirtualServiceSpec_CorrectRoutes(t *testing.T) {
 		},
 		Timeout: types.DurationProto(defaultMaxRevisionTimeout),
 		Retries: &istiov1alpha3.HTTPRetry{
+			RetryOn:       retriableConditions,
 			Attempts:      int32(networking.DefaultRetryCount),
 			PerTryTimeout: types.DurationProto(defaultMaxRevisionTimeout),
 		},
@@ -473,6 +475,7 @@ func TestMakeIngressVirtualServiceSpec_CorrectRoutes(t *testing.T) {
 		},
 		Timeout: types.DurationProto(defaultMaxRevisionTimeout),
 		Retries: &istiov1alpha3.HTTPRetry{
+			RetryOn:       retriableConditions,
 			Attempts:      int32(networking.DefaultRetryCount),
 			PerTryTimeout: types.DurationProto(defaultMaxRevisionTimeout),
 		},
@@ -525,6 +528,7 @@ func TestMakeVirtualServiceRoute_Vanilla(t *testing.T) {
 		}},
 		Timeout: types.DurationProto(defaultMaxRevisionTimeout),
 		Retries: &istiov1alpha3.HTTPRetry{
+			RetryOn:       retriableConditions,
 			Attempts:      int32(networking.DefaultRetryCount),
 			PerTryTimeout: types.DurationProto(defaultMaxRevisionTimeout),
 		},
@@ -582,6 +586,7 @@ func TestMakeVirtualServiceRoute_TwoTargets(t *testing.T) {
 		}},
 		Timeout: types.DurationProto(defaultMaxRevisionTimeout),
 		Retries: &istiov1alpha3.HTTPRetry{
+			RetryOn:       retriableConditions,
 			Attempts:      int32(networking.DefaultRetryCount),
 			PerTryTimeout: types.DurationProto(defaultMaxRevisionTimeout),
 		},