Automatically use latest tag for command cache

Signed-off-by: Ling Samuel <lingsamuelgrace@gmail.com>
pull/10058/head
Ling Samuel 2020-12-29 11:10:55 +08:00
parent 199ea3425b
commit b79ab3fedf
No known key found for this signature in database
GPG Key ID: 1405A670863B367F
4 changed files with 66 additions and 0 deletions

View File

@ -76,6 +76,7 @@ func SaveToDir(images []string, cacheDir string) error {
// saveToTarFile caches an image
func saveToTarFile(iname, rawDest string) error {
iname = normalizeTagName(iname)
start := time.Now()
defer func() {
klog.Infof("cache image %q -> %q took %s", iname, rawDest, time.Since(start))

View File

@ -212,3 +212,22 @@ func cleanImageCacheDir() error {
})
return err
}
// normalizeTagName automatically tag latest to image
// Example:
// nginx -> nginx:latest
// localhost:5000/nginx -> localhost:5000/nginx:latest
// localhost:5000/nginx:latest -> localhost:5000/nginx:latest
// docker.io/dotnet/core/sdk -> docker.io/dotnet/core/sdk:latest
func normalizeTagName(image string) string {
base := image
tag := "latest"
// From google/go-containerregistry/pkg/name/tag.go
parts := strings.Split(strings.TrimSpace(image), ":")
if len(parts) > 1 && !strings.Contains(parts[len(parts)-1], "/") {
base = strings.Join(parts[:len(parts)-1], ":")
tag = parts[len(parts)-1]
}
return base + ":" + tag
}

View File

@ -46,3 +46,48 @@ func TestTag(t *testing.T) {
})
}
}
func TestNormalizeImageName(t *testing.T) {
cases := []struct {
image string
expected string
}{
{
image: "nginx",
expected: "nginx:latest",
},
{
image: "localhost:5000/nginx",
expected: "localhost:5000/nginx:latest",
},
{
image: "localhost:5000/nginx:3.0",
expected: "localhost:5000/nginx:3.0",
},
{
image: "localhost:5000/nginx:latest",
expected: "localhost:5000/nginx:latest",
},
{
image: "docker.io/nginx",
expected: "docker.io/nginx:latest",
},
{
image: "nginx:3.0",
expected: "nginx:3.0",
},
{
image: "docker.io/dotnet/core/sdk",
expected: "docker.io/dotnet/core/sdk:latest",
},
}
for _, c := range cases {
t.Run(c.image, func(t *testing.T) {
got := normalizeTagName(c.image)
if got != c.expected {
t.Errorf("Normalize error: expected: %v, got: %v", c.expected, got)
}
})
}
}

View File

@ -218,6 +218,7 @@ func CacheAndLoadImages(images []string) error {
if err != nil {
failed = append(failed, m)
klog.Warningf("Failed to load cached images for profile %s. make sure the profile is running. %v", pName, err)
continue
}
succeeded = append(succeeded, m)
}