Skip to content

Commit

Permalink
UPSTREAM: 93510: Allow test images to be in a single mirror
Browse files Browse the repository at this point in the history
In downstream contexts, it's extremely useful to be able to combine
all the "testable" images in Kubernetes into a single repo so that
a user could mirror these offline in one chunk, and audit the set of
images for changes. For instance, within OpenShift we would like to
have a single place we can place all the images used by all the tests
with a single authentication scheme. While some images are not "real"
and can't be mirrored (for instance, the images that point to an
auth protected registry), that is not the majority.

This code makes it possible to specify an environment variable
KUBE_TEST_REPO that maps the static strings of the registry to a
single repository by placing the uniqueness in a tag. For instance:

    KUBE_TEST_REPO=quay.io/openshift/community-e2e-images

would translate

    k8s.gcr.io/prometheus-to-sd:v0.5.0

to

    quay.io/openshift/community-e2e-images:e2e-30-k8s-gcr-io-prometheus-to-sd-v0-5-0-6JI59Yih4oaj3oQOjRfhyQ

The tag is a safe form of the name, plus the index (the constant within
manifest.go), plus a hash of the full input. The length of the tag is
constrained to the minimum of hash + index + the safe name.

The public method is changed to return two maps - index to original
name and index to test repo name. These maps would be the same if
the env var is not set.
  • Loading branch information
smarterclayton authored and soltysh committed Sep 7, 2021
1 parent 6257562 commit 14f549a
Show file tree
Hide file tree
Showing 2 changed files with 138 additions and 2 deletions.
112 changes: 110 additions & 2 deletions test/utils/image/manifest.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,12 @@ limitations under the License.
package image

import (
"crypto/sha256"
"encoding/base64"
"fmt"
"io/ioutil"
"os"
"regexp"
"strings"

yaml "gopkg.in/yaml.v2"
Expand Down Expand Up @@ -115,7 +118,7 @@ var (
sampleRegistry = registry.SampleRegistry

// Preconfigured image configs
imageConfigs = initImageConfigs()
imageConfigs, originalImageConfigs = initImageConfigs()
)

const (
Expand Down Expand Up @@ -200,7 +203,7 @@ const (
VolumeRBDServer
)

func initImageConfigs() map[int]Config {
func initImageConfigs() (map[int]Config, map[int]Config) {
configs := map[int]Config{}
configs[Agnhost] = Config{promoterE2eRegistry, "agnhost", "2.21"}
configs[AgnhostPrivate] = Config{PrivateRegistry, "agnhost", "2.6"}
Expand Down Expand Up @@ -241,9 +244,97 @@ func initImageConfigs() map[int]Config {
configs[VolumeISCSIServer] = Config{e2eVolumeRegistry, "iscsi", "2.0"}
configs[VolumeGlusterServer] = Config{e2eVolumeRegistry, "gluster", "1.0"}
configs[VolumeRBDServer] = Config{e2eVolumeRegistry, "rbd", "1.0.1"}

// if requested, map all the SHAs into a known format based on the input
originalImageConfigs := configs
if repo := os.Getenv("KUBE_TEST_REPO"); len(repo) > 0 {
configs = GetMappedImageConfigs(originalImageConfigs, repo)
}

return configs, originalImageConfigs
}

// GetMappedImageConfigs returns the images if they were mapped to the provided
// image repository. This method is public to allow tooling to convert these configs
// to an arbitrary repo.
func GetMappedImageConfigs(originalImageConfigs map[int]Config, repo string) map[int]Config {
configs := make(map[int]Config)
for i, config := range originalImageConfigs {
switch i {
case InvalidRegistryImage, AuthenticatedAlpine,
AuthenticatedWindowsNanoServer, AgnhostPrivate:
// These images are special and can't be run out of the cloud - some because they
// are authenticated, and others because they are not real images. Tests that depend
// on these images can't be run without access to the public internet.
configs[i] = config
continue
}

// Build a new tag with a the index, a hash of the image spec (to be unique) and
// shorten and make the pull spec "safe" so it will fit in the tag
configs[i] = mapConfigToRepos(i, config, repo)
}
return configs
}

var (
reCharSafe = regexp.MustCompile(`[^\w]`)
reDashes = regexp.MustCompile(`-+`)
)

// mapConfigToRepos maps an existing image to the provided repo, generating a
// tag that is unique with the input config. The tag will contain the index, a hash of
// the image spec (to be unique) and shorten and make the pull spec "safe" so it will
// fit in the tag to allow a human to recognize the value. If index is -1, then no
// index will be added to the tag.
func mapConfigToRepos(index int, config Config, repo string) Config {
parts := strings.SplitN(repo, "/", 2)
registry, name := parts[0], parts[1]

pullSpec := config.GetE2EImage()

const (
// length of hash in base64-url chosen to minimize possible collisions (64^16 possible)
hashLength = 16
// maximum length of a Docker spec image tag
maxTagLength = 127
// when building a tag, there are at most 6 characters in the format (e2e and 3 dashes),
// and we should allow up to 10 digits for the index and additional qualifiers we may add
// in the future
tagFormatCharacters = 6 + 10
)

h := sha256.New()
h.Write([]byte(pullSpec))
hash := base64.RawURLEncoding.EncodeToString(h.Sum(nil))[:hashLength]

shortName := reCharSafe.ReplaceAllLiteralString(pullSpec, "-")
shortName = reDashes.ReplaceAllLiteralString(shortName, "-")
maxLength := maxTagLength - hashLength - tagFormatCharacters
if len(shortName) > maxLength {
shortName = shortName[len(shortName)-maxLength:]
}
var version string
if index == -1 {
version = fmt.Sprintf("e2e-%s-%s", shortName, hash)
} else {
version = fmt.Sprintf("e2e-%d-%s-%s", index, shortName, hash)
}

return Config{
registry: registry,
name: name,
version: version,
}
}

// GetOriginalImageConfigs returns the configuration before any mapping rules. This
// method is public to allow tooling gain access to the default values for images regardless
// of environment variable being set.
func GetOriginalImageConfigs() map[int]Config {
return originalImageConfigs
}

// GetImageConfigs returns the map of imageConfigs
func GetImageConfigs() map[int]Config {
return imageConfigs
Expand Down Expand Up @@ -275,6 +366,23 @@ func ReplaceRegistryInImageURL(imageURL string) (string, error) {
countParts := len(parts)
registryAndUser := strings.Join(parts[:countParts-1], "/")

if repo := os.Getenv("KUBE_TEST_REPO"); len(repo) > 0 {
index := -1
for i, v := range originalImageConfigs {
if v.GetE2EImage() == imageURL {
index = i
break
}
}
last := strings.SplitN(parts[countParts-1], ":", 2)
config := mapConfigToRepos(index, Config{
registry: parts[0],
name: strings.Join([]string{strings.Join(parts[1:countParts-1], "/"), last[0]}, "/"),
version: last[1],
}, repo)
return config.GetE2EImage(), nil
}

switch registryAndUser {
case "gcr.io/kubernetes-e2e-test-images":
registryAndUser = e2eRegistry
Expand Down
28 changes: 28 additions & 0 deletions test/utils/image/manifest_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@ package image

import (
"fmt"
"reflect"
"testing"

"k8s.io/apimachinery/pkg/util/diff"
)

type result struct {
Expand Down Expand Up @@ -135,3 +138,28 @@ func TestReplaceRegistryInImageURL(t *testing.T) {
})
}
}

func TestGetOriginalImageConfigs(t *testing.T) {
if len(GetOriginalImageConfigs()) == 0 {
t.Fatalf("original map should not be empty")
}
}

func TestGetMappedImageConfigs(t *testing.T) {
originals := map[int]Config{
0: {registry: "docker.io", name: "source/repo", version: "1.0"},
}
mapping := GetMappedImageConfigs(originals, "quay.io/repo/for-test")

actual := make(map[string]string)
for i, mapping := range mapping {
source := originals[i]
actual[source.GetE2EImage()] = mapping.GetE2EImage()
}
expected := map[string]string{
"docker.io/source/repo:1.0": "quay.io/repo/for-test:e2e-0-docker-io-source-repo-1-0-72R4aXm7YnxQ4_ek",
}
if !reflect.DeepEqual(expected, actual) {
t.Fatal(diff.ObjectReflectDiff(expected, actual))
}
}

0 comments on commit 14f549a

Please sign in to comment.