[gold] Route /img/ traffic away from diffserver

Bug: skia:10582
Change-Id: I3c2289f6fa6583bde7dd7f6f30e0a836fd83b599
Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/373818
Reviewed-by: Leandro Lovisolo <lovisolo@google.com>
diff --git a/skfe/computed.json b/skfe/computed.json
index d406a4b..c66791b 100644
--- a/skfe/computed.json
+++ b/skfe/computed.json
@@ -2749,17 +2749,6 @@
                       "routes": [
                         {
                           "match": {
-                            "prefix": "/img/"
-                          },
-                          "route": {
-                            "cluster": "gold-skia-diffserver",
-                            "timeout": {
-                              "seconds": 600
-                            }
-                          }
-                        },
-                        {
-                          "match": {
                             "prefix": "/"
                           },
                           "route": {
@@ -2777,17 +2766,6 @@
                       "routes": [
                         {
                           "match": {
-                            "prefix": "/img/"
-                          },
-                          "route": {
-                            "cluster": "gold-skia-diffserver",
-                            "timeout": {
-                              "seconds": 600
-                            }
-                          }
-                        },
-                        {
-                          "match": {
                             "prefix": "/"
                           },
                           "route": {
@@ -2805,17 +2783,6 @@
                       "routes": [
                         {
                           "match": {
-                            "prefix": "/img/"
-                          },
-                          "route": {
-                            "cluster": "gold-lottie-diffserver",
-                            "timeout": {
-                              "seconds": 600
-                            }
-                          }
-                        },
-                        {
-                          "match": {
                             "prefix": "/"
                           },
                           "route": {
@@ -2833,17 +2800,6 @@
                       "routes": [
                         {
                           "match": {
-                            "prefix": "/img/"
-                          },
-                          "route": {
-                            "cluster": "gold-pdfium-diffserver",
-                            "timeout": {
-                              "seconds": 600
-                            }
-                          }
-                        },
-                        {
-                          "match": {
                             "prefix": "/"
                           },
                           "route": {
@@ -2911,17 +2867,6 @@
                         },
                         {
                           "match": {
-                            "prefix": "/img/"
-                          },
-                          "route": {
-                            "cluster": "gold-flutter-diffserver",
-                            "timeout": {
-                              "seconds": 600
-                            }
-                          }
-                        },
-                        {
-                          "match": {
                             "prefix": "/"
                           },
                           "route": {
@@ -2989,17 +2934,6 @@
                         },
                         {
                           "match": {
-                            "prefix": "/img/"
-                          },
-                          "route": {
-                            "cluster": "gold-angle-diffserver",
-                            "timeout": {
-                              "seconds": 600
-                            }
-                          }
-                        },
-                        {
-                          "match": {
                             "prefix": "/"
                           },
                           "route": {
@@ -3067,17 +3001,6 @@
                         },
                         {
                           "match": {
-                            "prefix": "/img/"
-                          },
-                          "route": {
-                            "cluster": "gold-chrome-diffserver",
-                            "timeout": {
-                              "seconds": 600
-                            }
-                          }
-                        },
-                        {
-                          "match": {
                             "prefix": "/"
                           },
                           "route": {
@@ -3095,17 +3018,6 @@
                       "routes": [
                         {
                           "match": {
-                            "prefix": "/img/"
-                          },
-                          "route": {
-                            "cluster": "gold-chrome-diffserver",
-                            "timeout": {
-                              "seconds": 600
-                            }
-                          }
-                        },
-                        {
-                          "match": {
                             "prefix": "/"
                           },
                           "route": {
@@ -3173,17 +3085,6 @@
                         },
                         {
                           "match": {
-                            "prefix": "/img/"
-                          },
-                          "route": {
-                            "cluster": "gold-cros-tast-dev-diffserver",
-                            "timeout": {
-                              "seconds": 600
-                            }
-                          }
-                        },
-                        {
-                          "match": {
                             "prefix": "/"
                           },
                           "route": {
@@ -3251,17 +3152,6 @@
                         },
                         {
                           "match": {
-                            "prefix": "/img/"
-                          },
-                          "route": {
-                            "cluster": "gold-flutter-engine-diffserver",
-                            "timeout": {
-                              "seconds": 600
-                            }
-                          }
-                        },
-                        {
-                          "match": {
                             "prefix": "/"
                           },
                           "route": {
@@ -3329,17 +3219,6 @@
                         },
                         {
                           "match": {
-                            "prefix": "/img/"
-                          },
-                          "route": {
-                            "cluster": "gold-fuchsia-public-diffserver",
-                            "timeout": {
-                              "seconds": 600
-                            }
-                          }
-                        },
-                        {
-                          "match": {
                             "prefix": "/"
                           },
                           "route": {
@@ -3407,17 +3286,6 @@
                         },
                         {
                           "match": {
-                            "prefix": "/img/"
-                          },
-                          "route": {
-                            "cluster": "gold-skia-infra-diffserver",
-                            "timeout": {
-                              "seconds": 600
-                            }
-                          }
-                        },
-                        {
-                          "match": {
                             "prefix": "/"
                           },
                           "route": {
diff --git a/skfe/envoy-starter.json b/skfe/envoy-starter.json
index cd28505..69ad062 100644
--- a/skfe/envoy-starter.json
+++ b/skfe/envoy-starter.json
@@ -1580,17 +1580,6 @@
                       "routes": [
                         {
                           "match": {
-                            "prefix": "/img/"
-                          },
-                          "route": {
-                            "cluster": "gold-skia-diffserver",
-                            "timeout": {
-                              "seconds": 600
-                            }
-                          }
-                        },
-                        {
-                          "match": {
                             "prefix": "/"
                           },
                           "route": {
@@ -1608,17 +1597,6 @@
                       "routes": [
                         {
                           "match": {
-                            "prefix": "/img/"
-                          },
-                          "route": {
-                            "cluster": "gold-skia-diffserver",
-                            "timeout": {
-                              "seconds": 600
-                            }
-                          }
-                        },
-                        {
-                          "match": {
                             "prefix": "/"
                           },
                           "route": {
@@ -1636,17 +1614,6 @@
                       "routes": [
                         {
                           "match": {
-                            "prefix": "/img/"
-                          },
-                          "route": {
-                            "cluster": "gold-lottie-diffserver",
-                            "timeout": {
-                              "seconds": 600
-                            }
-                          }
-                        },
-                        {
-                          "match": {
                             "prefix": "/"
                           },
                           "route": {
@@ -1664,17 +1631,6 @@
                       "routes": [
                         {
                           "match": {
-                            "prefix": "/img/"
-                          },
-                          "route": {
-                            "cluster": "gold-pdfium-diffserver",
-                            "timeout": {
-                              "seconds": 600
-                            }
-                          }
-                        },
-                        {
-                          "match": {
                             "prefix": "/"
                           },
                           "route": {
@@ -1742,17 +1698,6 @@
                         },
                         {
                           "match": {
-                            "prefix": "/img/"
-                          },
-                          "route": {
-                            "cluster": "gold-flutter-diffserver",
-                            "timeout": {
-                              "seconds": 600
-                            }
-                          }
-                        },
-                        {
-                          "match": {
                             "prefix": "/"
                           },
                           "route": {
@@ -1820,17 +1765,6 @@
                         },
                         {
                           "match": {
-                            "prefix": "/img/"
-                          },
-                          "route": {
-                            "cluster": "gold-angle-diffserver",
-                            "timeout": {
-                              "seconds": 600
-                            }
-                          }
-                        },
-                        {
-                          "match": {
                             "prefix": "/"
                           },
                           "route": {
@@ -1898,17 +1832,6 @@
                         },
                         {
                           "match": {
-                            "prefix": "/img/"
-                          },
-                          "route": {
-                            "cluster": "gold-chrome-diffserver",
-                            "timeout": {
-                              "seconds": 600
-                            }
-                          }
-                        },
-                        {
-                          "match": {
                             "prefix": "/"
                           },
                           "route": {
@@ -1926,17 +1849,6 @@
                       "routes": [
                         {
                           "match": {
-                            "prefix": "/img/"
-                          },
-                          "route": {
-                            "cluster": "gold-chrome-diffserver",
-                            "timeout": {
-                              "seconds": 600
-                            }
-                          }
-                        },
-                        {
-                          "match": {
                             "prefix": "/"
                           },
                           "route": {
@@ -2004,17 +1916,6 @@
                         },
                         {
                           "match": {
-                            "prefix": "/img/"
-                          },
-                          "route": {
-                            "cluster": "gold-cros-tast-dev-diffserver",
-                            "timeout": {
-                              "seconds": 600
-                            }
-                          }
-                        },
-                        {
-                          "match": {
                             "prefix": "/"
                           },
                           "route": {
@@ -2082,17 +1983,6 @@
                         },
                         {
                           "match": {
-                            "prefix": "/img/"
-                          },
-                          "route": {
-                            "cluster": "gold-flutter-engine-diffserver",
-                            "timeout": {
-                              "seconds": 600
-                            }
-                          }
-                        },
-                        {
-                          "match": {
                             "prefix": "/"
                           },
                           "route": {
@@ -2160,17 +2050,6 @@
                         },
                         {
                           "match": {
-                            "prefix": "/img/"
-                          },
-                          "route": {
-                            "cluster": "gold-fuchsia-public-diffserver",
-                            "timeout": {
-                              "seconds": 600
-                            }
-                          }
-                        },
-                        {
-                          "match": {
                             "prefix": "/"
                           },
                           "route": {
@@ -2238,17 +2117,6 @@
                         },
                         {
                           "match": {
-                            "prefix": "/img/"
-                          },
-                          "route": {
-                            "cluster": "gold-skia-infra-diffserver",
-                            "timeout": {
-                              "seconds": 600
-                            }
-                          }
-                        },
-                        {
-                          "match": {
                             "prefix": "/"
                           },
                           "route": {