Switch away from Docker Hub to avoid rate limits

Fix issue 1052 Signed-off-by: Akihiro Suda <[email protected]>
kubernetes-sigs · Jan 3, 2023 · 3a981a9 · 3a981a9
1 parent 0e32cef
commit 3a981a9
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 12 deletions.
diff --git a/pkg/benchmark/image.go b/pkg/benchmark/image.go
@@ -34,19 +34,22 @@ import (
 
 const (
 	defaultImageBenchmarkTimeoutSeconds = 10
+
+	// defaultImageListingPrefix is for avoiding Docker Hub's rate limit
+	defaultImageListingPrefix = "public.ecr.aws/docker/library/"
 )
 
 var defaultImageListingBenchmarkImagesAmd64 = []string{
-	"busybox:1.26.2-glibc",
-	"busybox:1-uclibc",
-	"busybox:1",
-	"busybox:1-glibc",
-	"busybox:1-musl",
+	defaultImageListingPrefix + "busybox:1.35.0-glibc",
+	defaultImageListingPrefix + "busybox:1-uclibc",
+	defaultImageListingPrefix + "busybox:1",
+	defaultImageListingPrefix + "busybox:1-glibc",
+	defaultImageListingPrefix + "busybox:1-musl",
 }
 var defaultImageListingBenchmarkImages = []string{
-	"busybox:1",
-	"busybox:1-glibc",
-	"busybox:1-musl",
+	defaultImageListingPrefix + "busybox:1",
+	defaultImageListingPrefix + "busybox:1-glibc",
+	defaultImageListingPrefix + "busybox:1-musl",
 }
 
 var _ = framework.KubeDescribe("Image", func() {

diff --git a/pkg/framework/util.go b/pkg/framework/util.go
@@ -94,7 +94,7 @@ const (
 	DefaultStopContainerTimeout int64 = 60
 
 	// DefaultLinuxContainerImage default container image for Linux
-	DefaultLinuxContainerImage string = "busybox:1.28"
+	DefaultLinuxContainerImage string = "k8s.gcr.io/e2e-test-images/busybox:1.29-2"
 
 	// DefaultWindowsContainerImage default container image for Windows
 	DefaultWindowsContainerImage string = "k8s.gcr.io/e2e-test-images/busybox:1.29-2"

diff --git a/pkg/validate/consts.go b/pkg/validate/consts.go
@@ -197,7 +197,7 @@ const (
 	webServerHostNetContainerPort int32 = 12003
 
 	// Linux defaults
-	webServerLinuxImage        = "nginx"
+	webServerLinuxImage        = "k8s.gcr.io/e2e-test-images/nginx:1.14-2"
 	hostNetWebServerLinuxImage = registry + "hostnet-nginx-" + runtime.GOARCH
 
 	// Windows defaults

diff --git a/pkg/validate/multi_container_linux.go b/pkg/validate/multi_container_linux.go
@@ -34,7 +34,7 @@ import (
 
 const (
 	httpdContainerPort = 80
-	httpdImage         = "httpd"
+	httpdImage         = "k8s.gcr.io/e2e-test-images/httpd:2.4.39-4"
 )
 
 var _ = framework.KubeDescribe("Multiple Containers [Conformance]", func() {

diff --git a/pkg/validate/security_context_linux.go b/pkg/validate/security_context_linux.go
@@ -36,7 +36,7 @@ import (
 )
 
 const (
-	nginxContainerImage string = "nginx:1.18"
+	nginxContainerImage string = "k8s.gcr.io/e2e-test-images/nginx:1.14-2"
 	localhost           string = "localhost/"
 	noNewPrivsImage     string = "k8s.gcr.io/e2e-test-images/nonewprivs:1.3"
 )