github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 19:01:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #101287 from soltysh/replace_with_default

Browse Source 
Fail fast when image is specified without tag
This commit is contained in:
Kubernetes Prow Robot 2021-04-20 17:38:24 -07:00 committed by GitHub
commit 6a7572e4ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/testing-manifests/storage-csi/mock/csi-mock-proxy.yaml
View File

@ -73,7 +73,7 @@ spec:
# test for directories or create them. It needs additional privileges # test for directories or create them. It needs additional privileges
# for that. # for that.
- name: busybox - name: busybox
image: k8s.gcr.io/busybox image: k8s.gcr.io/e2e-test-images/busybox:1.29-1
securityContext: securityContext:
privileged: true privileged: true
command: command:

5
test/utils/image/manifest.go
View File

@ -373,6 +373,9 @@ func ReplaceRegistryInImageURL(imageURL string) (string, error) {
} }
} }
last := strings.SplitN(parts[countParts-1], ":", 2) last := strings.SplitN(parts[countParts-1], ":", 2)
if len(last) == 1 {
return "", fmt.Errorf("image %q is required to be in an image:tag format", imageURL)
}
config := getRepositoryMappedConfig(index, Config{ config := getRepositoryMappedConfig(index, Config{
registry: parts[0], registry: parts[0],
name: strings.Join([]string{strings.Join(parts[1:countParts-1], "/"), last[0]}, "/"), name: strings.Join([]string{strings.Join(parts[1:countParts-1], "/"), last[0]}, "/"),
@ -384,6 +387,8 @@ func ReplaceRegistryInImageURL(imageURL string) (string, error) {
switch registryAndUser { switch registryAndUser {
case "gcr.io/kubernetes-e2e-test-images": case "gcr.io/kubernetes-e2e-test-images":
registryAndUser = e2eRegistry registryAndUser = e2eRegistry
case "k8s.gcr.io/e2e-test-images":
registryAndUser = promoterE2eRegistry
case "k8s.gcr.io": case "k8s.gcr.io":
registryAndUser = gcRegistry registryAndUser = gcRegistry
case "k8s.gcr.io/sig-storage": case "k8s.gcr.io/sig-storage":