Merge pull request #477 from openSUSE/registry-prefix

Add registry prefix option

Author: k8s-ci-robot

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/framework/test_context.go

@@ -42,11 +42,16 @@ type TestContextType struct {
 
 	// Test configuration.
 	IsLcow bool
+
+	RegistryPrefix string
 }
 
 // TestContext is a test context.
 var TestContext TestContextType
 
+// DefaultRegistryPrefix specifies the default prefix used for images
+const DefaultRegistryPrefix = "docker.io/library"
+
 // RegisterFlags registers flags to e2e test suites.
 func RegisterFlags() {
 	// Turn on verbose by default to get spec names
@@ -77,4 +82,5 @@ func RegisterFlags() {
 	} else {
 		TestContext.IsLcow = false
 	}
+	flag.StringVar(&TestContext.RegistryPrefix, "registry-prefix", DefaultRegistryPrefix, "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/cri-api/pkg/apis"
 	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
@@ -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 != DefaultRegistryPrefix {
+			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)

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