From 37b20001c467a9b2f4514ac9994091cf2109096a Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bdealwis@google.com>
Date: Tue, 8 Jun 2021 14:05:54 -0400
Subject: [PATCH 1/2] update hack/generate-kind-config.sh to handle multiple
 mirrors

---
 hack/generate-kind-config.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hack/generate-kind-config.sh b/hack/generate-kind-config.sh
index c46f91c78c4..2b0acbd1a69 100644
--- a/hack/generate-kind-config.sh
+++ b/hack/generate-kind-config.sh
@@ -15,4 +15,4 @@
 # limitations under the License.
 
 # Create a kind configuration to use the docker daemon's configured registry-mirrors.
-docker system info --format '{{printf "apiVersion: kind.x-k8s.io/v1alpha4\nkind: Cluster\ncontainerdConfigPatches:\n"}}{{range $reg, $config := .RegistryConfig.IndexConfigs}}{{if $config.Mirrors}}{{printf "- |-\n  [plugins.\"io.containerd.grpc.v1.cri\".registry.mirrors.\"%s\"]\n    endpoint = %q\n" $reg $config.Mirrors}}{{end}}{{end}}'
+docker system info --format '{{printf "apiVersion: kind.x-k8s.io/v1alpha4\nkind: Cluster\ncontainerdConfigPatches:\n"}}{{range $reg, $config := .RegistryConfig.IndexConfigs}}{{if $config.Mirrors}}{{printf "- |-\n  [plugins.\"io.containerd.grpc.v1.cri\".registry.mirrors.\"%s\"]\n    endpoint = [" $reg}}{{range $index, $mirror := $config.Mirrors}}{{if $index}},{{end}}{{printf "%q" $mirror}}{{end}}{{printf "]\n"}}{{end}}{{end}}'

From e8a37eb681c659056b84cb9df8fbcf648a55f8ac Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bdealwis@google.com>
Date: Tue, 8 Jun 2021 14:25:08 -0400
Subject: [PATCH 2/2] Enable mirror.gcr.io for kind

---
 .travis.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 1ca469546cc..22713b2403b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -91,18 +91,26 @@ jobs:
           - C:\\Users\\travis\\AppData\\Local\\go-build
     - name: "kind integration partition 0"
       <<: *integration_test
+      <<: *upgrade_docker
+      <<: *registry_mirror
       script:
         - env IT_PARTITION=0 make integration-in-kind
     - name: "kind integration partition 1"
       <<: *integration_test
+      <<: *upgrade_docker
+      <<: *registry_mirror
       script:
         - env IT_PARTITION=1 make integration-in-kind
     - name: "kind integration partition 2"
       <<: *integration_test
+      <<: *upgrade_docker
+      <<: *registry_mirror
       script:
         - env IT_PARTITION=2 make integration-in-kind
     - name: "kind integration partition 3"
       <<: *integration_test
+      <<: *upgrade_docker
+      <<: *registry_mirror
       script:
         - env IT_PARTITION=3 make integration-in-kind
     - name: "k3d integration partition 0"