github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #8818 from thaJeztah/use_registry.k8s.io

Browse Source 
pkg/cri/server: TestImageGetLabels: use registry.k8s.io
This commit is contained in:
Phil Estes 2023-07-14 09:45:54 -04:00 committed by GitHub
commit 4c538164e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
pkg/cri/server/image_pull_test.go
View File

@ -436,9 +436,6 @@ func TestSnapshotterFromPodSandboxConfig(t *testing.T) {
} }
} }
func TestImageGetLabels(t *testing.T) { func TestImageGetLabels(t *testing.T) {
criService := newTestCRIService()
tests := []struct { tests := []struct {
name string name string
expectedLabel map[string]string expectedLabel map[string]string
@ -448,43 +445,41 @@ func TestImageGetLabels(t *testing.T) {
{ {
name: "pinned image labels should get added on sandbox image", name: "pinned image labels should get added on sandbox image",
expectedLabel: map[string]string{labels.ImageLabelKey: labels.ImageLabelValue, labels.PinnedImageLabelKey: labels.PinnedImageLabelValue}, expectedLabel: map[string]string{labels.ImageLabelKey: labels.ImageLabelValue, labels.PinnedImageLabelKey: labels.PinnedImageLabelValue},
configSandboxImage: "k8s.gcr.io/pause:3.9", configSandboxImage: "registry.k8s.io/pause:3.9",
pullImageName: "k8s.gcr.io/pause:3.9", pullImageName: "registry.k8s.io/pause:3.9",
}, },
{ {
name: "pinned image labels should get added on sandbox image without tag", name: "pinned image labels should get added on sandbox image without tag",
expectedLabel: map[string]string{labels.ImageLabelKey: labels.ImageLabelValue, labels.PinnedImageLabelKey: labels.PinnedImageLabelValue}, expectedLabel: map[string]string{labels.ImageLabelKey: labels.ImageLabelValue, labels.PinnedImageLabelKey: labels.PinnedImageLabelValue},
configSandboxImage: "k8s.gcr.io/pause", configSandboxImage: "registry.k8s.io/pause",
pullImageName: "k8s.gcr.io/pause:latest", pullImageName: "registry.k8s.io/pause:latest",
}, },
{ {
name: "pinned image labels should get added on sandbox image specified with tag and digest both", name: "pinned image labels should get added on sandbox image specified with tag and digest both",
expectedLabel: map[string]string{labels.ImageLabelKey: labels.ImageLabelValue, labels.PinnedImageLabelKey: labels.PinnedImageLabelValue}, expectedLabel: map[string]string{labels.ImageLabelKey: labels.ImageLabelValue, labels.PinnedImageLabelKey: labels.PinnedImageLabelValue},
configSandboxImage: "k8s.gcr.io/pause:3.9@sha256:45b23dee08af5e43a7fea6c4cf9c25ccf269ee113168c19722f87876677c5cb2", configSandboxImage: "registry.k8s.io/pause:3.9@sha256:7031c1b283388d2c2e09b57badb803c05ebed362dc88d84b480cc47f72a21097",
pullImageName: "k8s.gcr.io/pause@sha256:45b23dee08af5e43a7fea6c4cf9c25ccf269ee113168c19722f87876677c5cb2", pullImageName: "registry.k8s.io/pause@sha256:7031c1b283388d2c2e09b57badb803c05ebed362dc88d84b480cc47f72a21097",
}, },
{ {
name: "pinned image labels should get added on sandbox image specified with digest", name: "pinned image labels should get added on sandbox image specified with digest",
expectedLabel: map[string]string{labels.ImageLabelKey: labels.ImageLabelValue, labels.PinnedImageLabelKey: labels.PinnedImageLabelValue}, expectedLabel: map[string]string{labels.ImageLabelKey: labels.ImageLabelValue, labels.PinnedImageLabelKey: labels.PinnedImageLabelValue},
configSandboxImage: "k8s.gcr.io/pause@sha256:45b23dee08af5e43a7fea6c4cf9c25ccf269ee113168c19722f87876677c5cb2", configSandboxImage: "registry.k8s.io/pause@sha256:7031c1b283388d2c2e09b57badb803c05ebed362dc88d84b480cc47f72a21097",
pullImageName: "k8s.gcr.io/pause@sha256:45b23dee08af5e43a7fea6c4cf9c25ccf269ee113168c19722f87876677c5cb2", pullImageName: "registry.k8s.io/pause@sha256:7031c1b283388d2c2e09b57badb803c05ebed362dc88d84b480cc47f72a21097",
}, },
{ {
name: "pinned image labels should not get added on other image", name: "pinned image labels should not get added on other image",
expectedLabel: map[string]string{labels.ImageLabelKey: labels.ImageLabelValue}, expectedLabel: map[string]string{labels.ImageLabelKey: labels.ImageLabelValue},
configSandboxImage: "k8s.gcr.io/pause:3.9", configSandboxImage: "registry.k8s.io/pause:3.9",
pullImageName: "k8s.gcr.io/random:latest", pullImageName: "registry.k8s.io/random:latest",
}, },
} }
for _, tt := range tests { svc := newTestCRIService()
t.Run(tt.name, func(t *testing.T) { for _, tc := range tests {
criService.config.SandboxImage = tt.configSandboxImage tc := tc
labels := criService.getLabels(context.Background(), tt.pullImageName) t.Run(tc.name, func(t *testing.T) {
assert.Equal(t, tt.expectedLabel, labels) svc.config.SandboxImage = tc.configSandboxImage
assert.Equal(t, tc.expectedLabel, svc.getLabels(context.Background(), tc.pullImageName))
}) })
} }
} }