Merge pull request #5189 from TBBle/reduce-load-on-ratelimited-docker.io

Reduce load on ratelimited docker.io
containerd · Mar 14, 2021 · 6f94b15 · 6f94b15
2 parents 42266da + 5cfc4a8
commit 6f94b15
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 285 deletions.
diff --git a/integration/client/client_test.go b/integration/client/client_test.go
@@ -310,7 +310,7 @@ func TestImagePullAllPlatforms(t *testing.T) {
 	defer cancel()
 
 	cs := client.ContentStore()
-	img, err := client.Fetch(ctx, "docker.io/library/busybox:latest")
+	img, err := client.Fetch(ctx, "k8s.gcr.io/pause:3.4.1")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -358,7 +358,9 @@ func TestImagePullSomePlatforms(t *testing.T) {
 		opts = append(opts, WithPlatform(platform))
 	}
 
-	img, err := client.Fetch(ctx, "k8s.gcr.io/pause:3.4.1", opts...)
+	// Note: Must be different to the image used in TestImagePullAllPlatforms
+	// or it will see the content pulled by that, and fail.
+	img, err := client.Fetch(ctx, "k8s.gcr.io/pause:3.2", opts...)
 	if err != nil {
 		t.Fatal(err)
 	}

diff --git a/integration/client/go.mod b/integration/client/go.mod
@@ -3,7 +3,7 @@ module github.com/containerd/containerd/integration/client
 go 1.15
 
 require (
-	github.com/Microsoft/hcsshim v0.8.14
+	github.com/Microsoft/hcsshim v0.8.15
 	github.com/Microsoft/hcsshim/test v0.0.0-20210227013316-43a75bb4edd3
 	github.com/containerd/cgroups v0.0.0-20210114181951-8a68de567b68
 	github.com/containerd/containerd v1.5.0-beta.1