Add registry prefix option

This allows to pre-pull the images and running benchmarks against a
local registry.

Signed-off-by: Sascha Grunert <[email protected]>

cmd/critest/cri_test.go

@@ -130,6 +130,7 @@ func TestCRISuite(t *testing.T) {
 
 	if *isBenchMark {
 		flag.Set("ginkgo.focus", "benchmark")
+		flag.Set("ginkgo.succinct", "true")
 	} else {
 		// Skip benchmark measurements for validation tests.
 		flag.Set("ginkgo.skipMeasurements", "true")

pkg/benchmark/image.go

@@ -38,11 +38,11 @@ var _ = framework.KubeDescribe("Container", func() {
 		var err error
 
 		testImageList := []string{
-			"busybox:1.26.2-uclibc",
-			"busybox:1-uclibc",
-			"busybox:1",
-			"busybox:1-glibc",
-			"busybox:1-musl",
+			"docker.io/library/busybox:1.26.2-uclibc",
+			"docker.io/library/busybox:1-uclibc",
+			"docker.io/library/busybox:1",
+			"docker.io/library/busybox:1-glibc",
+			"docker.io/library/busybox:1-musl",
 		}
 
 		AfterEach(func() {

pkg/framework/test_context.go

@@ -42,6 +42,8 @@ type TestContextType struct {
 
 	// Test configuration.
 	IsLcow bool
+
+	RegistryPrefix string
 }
 
 // TestContext is a test context.
@@ -77,4 +79,5 @@ func RegisterFlags() {
 	} else {
 		TestContext.IsLcow = false
 	}
+	flag.StringVar(&TestContext.RegistryPrefix, "registry-prefix", "", "A possible registry prefix added to all images, like 'localhost:5000/'")
 }

pkg/framework/util.go

@@ -23,6 +23,7 @@ import (
 	"sync"
 	"time"
 
+	"github.com/docker/distribution/reference"
 	"github.com/pborman/uuid"
 	internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri"
 	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
@@ -83,7 +84,7 @@ const (
 	DefaultStopContainerTimeout int64 = 60
 
 	// DefaultLinuxContainerImage default container image for Linux
-	DefaultLinuxContainerImage string = "busybox:1.28"
+	DefaultLinuxContainerImage string = "docker.io/library/busybox:1.28"
 
 	// DefaultWindowsContainerImage default container image for Windows
 	DefaultWindowsContainerImage string = "mcr.microsoft.com/windows/servercore:ltsc2019"
@@ -297,9 +298,26 @@ func ListImage(c internalapi.ImageManagerService, filter *runtimeapi.ImageFilter
 
 // PullPublicImage pulls the public image named imageName.
 func PullPublicImage(c internalapi.ImageManagerService, imageName string, podConfig *runtimeapi.PodSandboxConfig) string {
-	if !strings.Contains(imageName, ":") {
-		imageName = imageName + ":latest"
-		Logf("Use latest as default image tag.")
+
+	ref, err := reference.ParseNamed(imageName)
+	if err == nil {
+		// Modify the image if it's a fully qualified image name
+		if TestContext.RegistryPrefix != "" {
+			r := fmt.Sprintf("%s/%s", TestContext.RegistryPrefix, reference.Path(ref))
+			ref, err = reference.ParseNamed(r)
+			ExpectNoError(err, "failed to parse new image name: %v", err)
+		}
+		imageName = ref.String()
+
+		if !strings.Contains(imageName, ":") {
+			imageName = imageName + ":latest"
+			Logf("Use latest as default image tag.")
+		}
+	} else if err == reference.ErrNameNotCanonical {
+		// Non canonical images can simply be prefixed
+		imageName = fmt.Sprintf("%s/%s", TestContext.RegistryPrefix, imageName)
+	} else {
+		Failf("Unable to parse imageName: %v", err)
 	}
 
 	By("Pull image : " + imageName)

pkg/validate/multi_container_linux.go

@@ -33,7 +33,7 @@ import (
 
 const (
 	httpdContainerPort = 80
-	httpdImage         = "httpd"
+	httpdImage         = "docker.io/library/httpd"
 )
 
 var _ = framework.KubeDescribe("Multiple Containers [Conformance]", func() {

pkg/validate/security_context_linux.go

@@ -35,7 +35,7 @@ import (
 )
 
 const (
-	nginxContainerImage string = "nginx"
+	nginxContainerImage string = "docker.io/library/nginx"
 	localhost           string = "localhost/"
 	noNewPrivsImage     string = "gcr.io/google_containers/nonewprivs:1.2"
 )

vendor.conf

@@ -1,5 +1,6 @@
 github.com/Azure/go-ansiterm d6e3b3328b783f23731bc4d058875b0371ff8109
 github.com/docker/docker a9fbbdc8dd8794b20af358382ab780559bca589d
+github.com/docker/distribution v2.7.1
 github.com/docker/go-units 9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1
 github.com/docker/spdystream 449fdfce4d962303d702fec724ef0ad181c92528
 github.com/fsnotify/fsnotify f12c6236fe7b5cf6bcf30e5935d08cb079d78334