Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch away from Docker Hub to avoid rate limits #1053

Merged
merged 1 commit into from
Jan 9, 2023
Merged

Switch away from Docker Hub to avoid rate limits #1053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions pkg/benchmark/image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,19 +34,22 @@ import (

const (
defaultImageBenchmarkTimeoutSeconds = 10

// defaultImageListingPrefix is for avoiding Docker Hub's rate limit
defaultImageListingPrefix = "public.ecr.aws/docker/library/"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm, we should move those images to k8s.grc.io / registry.k8s.io.

)

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() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/framework/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/validate/consts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/validate/multi_container_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/validate/security_context_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down