Merge pull request #10258 from bzsuni/bz/update/pause

update pause image to 3.10
This commit is contained in:
Maksym Pavlenko
2024-05-28 18:01:23 +00:00
committed by GitHub
10 changed files with 23 additions and 24 deletions

View File

@@ -70,7 +70,7 @@ const (
ModeShim SandboxControllerMode = "shim"
// DefaultSandboxImage is the default image to use for sandboxes when empty or
// for default configurations.
DefaultSandboxImage = "registry.k8s.io/pause:3.9"
DefaultSandboxImage = "registry.k8s.io/pause:3.10"
// IOTypeFifo is container io implemented by creating named pipe
IOTypeFifo = "fifo"
// IOTypeStreaming is container io implemented by connecting the streaming api to sandbox endpoint
@@ -284,7 +284,7 @@ type ImageConfig struct {
// by other plugins to lookup the current image name.
// Image names should be full names including domain and tag
// Examples:
// "sandbox": "k8s.gcr.io/pause:3.9"
// "sandbox": "k8s.gcr.io/pause:3.10"
// "base": "docker.io/library/ubuntu:latest"
// Migrated from:
// (PluginConfig).SandboxImage string `toml:"sandbox_image" json:"sandboxImage"`

View File

@@ -498,8 +498,8 @@ func TestImageGetLabels(t *testing.T) {
{
name: "pinned image labels should get added on sandbox image",
expectedLabel: map[string]string{labels.ImageLabelKey: labels.ImageLabelValue, labels.PinnedImageLabelKey: labels.PinnedImageLabelValue},
pinnedImages: map[string]string{"sandbox": "k8s.gcr.io/pause:3.9"},
pullImageName: "k8s.gcr.io/pause:3.9",
pinnedImages: map[string]string{"sandbox": "k8s.gcr.io/pause:3.10"},
pullImageName: "k8s.gcr.io/pause:3.10",
},
{
name: "pinned image labels should get added on sandbox image without tag",