Skip to content

Commit 910eb4e

Browse files
authored
update hack/generate-kind-config.sh to handle multiple mirrors (#5977)
1 parent 16f7510 commit 910eb4e

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

.travis.yml

+8
Original file line numberDiff line numberDiff line change
@@ -91,18 +91,26 @@ jobs:
9191
- C:\\Users\\travis\\AppData\\Local\\go-build
9292
- name: "kind integration partition 0"
9393
<<: *integration_test
94+
<<: *upgrade_docker
95+
<<: *registry_mirror
9496
script:
9597
- env IT_PARTITION=0 make integration-in-kind
9698
- name: "kind integration partition 1"
9799
<<: *integration_test
100+
<<: *upgrade_docker
101+
<<: *registry_mirror
98102
script:
99103
- env IT_PARTITION=1 make integration-in-kind
100104
- name: "kind integration partition 2"
101105
<<: *integration_test
106+
<<: *upgrade_docker
107+
<<: *registry_mirror
102108
script:
103109
- env IT_PARTITION=2 make integration-in-kind
104110
- name: "kind integration partition 3"
105111
<<: *integration_test
112+
<<: *upgrade_docker
113+
<<: *registry_mirror
106114
script:
107115
- env IT_PARTITION=3 make integration-in-kind
108116
- name: "k3d integration partition 0"

hack/generate-kind-config.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@
1515
# limitations under the License.
1616

1717
# Create a kind configuration to use the docker daemon's configured registry-mirrors.
18-
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}}'
18+
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}}'

0 commit comments

Comments
 (0)