Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update pause image to 3.10 #10258

Merged
merged 1 commit into from
May 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions contrib/ansible/cri-containerd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,6 @@
# TODO This needs to be removed once we have consistent concurrent pull results
- name: "Pre-pull pause container image"
shell: |
/usr/local/bin/ctr pull registry.k8s.io/pause:3.9
/usr/local/bin/ctr pull registry.k8s.io/pause:3.10
/usr/local/bin/crictl --runtime-endpoint unix:///run/containerd/containerd.sock \
pull registry.k8s.io/pause:3.9
pull registry.k8s.io/pause:3.10
2 changes: 1 addition & 1 deletion docs/cri/config.md
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ version = 2
selinux_category_range = 1024

# sandbox_image is the image used by sandbox container.
sandbox_image = "registry.k8s.io/pause:3.9"
sandbox_image = "registry.k8s.io/pause:3.10"

# stats_collect_period is the period (in seconds) of snapshots stats collection.
stats_collect_period = 10
Expand Down
22 changes: 11 additions & 11 deletions docs/cri/crictl.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,29 +59,29 @@ command. With the load command you inject a container image into the container
runtime from a file. First you need to create a container image tarball. For
example to create an image tarball for a pause container using Docker:
```console
$ docker pull registry.k8s.io/pause:3.9
3.9: Pulling from pause
$ docker pull registry.k8s.io/pause:3.10
3.10: Pulling from pause
7582c2cc65ef: Pull complete
Digest: sha256:7031c1b283388d2c2e09b57badb803c05ebed362dc88d84b480cc47f72a21097
Status: Downloaded newer image for registry.k8s.io/pause:3.9
registry.k8s.io/pause:3.9
$ docker save registry.k8s.io/pause:3.9 -o pause.tar
Digest: sha256:ee6521f290b2168b6e0935a181d4cff9be1ac3f505666ef0e3c98fae8199917a
Status: Downloaded newer image for registry.k8s.io/pause:3.10
registry.k8s.io/pause:3.10
$ docker save registry.k8s.io/pause:3.10 -o pause.tar
```
Then use `ctr` to load the container image into the container runtime:
```console
# The cri plugin uses the "k8s.io" containerd namespace.
$ sudo ctr -n=k8s.io images import pause.tar
Loaded image: registry.k8s.io/pause:3.9
Loaded image: registry.k8s.io/pause:3.10
```
List images and inspect the pause image:
```console
$ sudo crictl images
IMAGE TAG IMAGE ID SIZE
docker.io/library/busybox latest f6e427c148a76 728kB
registry.k8s.io/pause 3.9 e6f181688397 311kB
$ sudo crictl inspecti e6f181688397
registry.k8s.io/pause 3.10 873ed75102791 311kB
$ sudo crictl inspecti 873ed75102791
... displays information about the pause image.
$ sudo crictl inspecti registry.k8s.io/pause:3.9
$ sudo crictl inspecti registry.k8s.io/pause:3.10
... displays information about the pause image.
```

Expand Down Expand Up @@ -290,7 +290,7 @@ $ crictl info
"streamIdleTimeout": "4h0m0s",
"enableSelinux": false,
"selinuxCategoryRange": 1024,
"sandboxImage": "registry.k8s.io/pause:3.9",
"sandboxImage": "registry.k8s.io/pause:3.10",
"statsCollectPeriod": 10,
"systemdCgroup": false,
"enableTLSStreaming": false,
Expand Down
3 changes: 1 addition & 2 deletions integration/client/testdata/default-1.6.toml
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,7 @@ version = 2
netns_mounts_under_state_dir = false
restrict_oom_score_adj = false
# Default image update in latest
#sandbox_image = "registry.k8s.io/pause:3.6"
sandbox_image = "registry.k8s.io/pause:3.9"
sandbox_image = "registry.k8s.io/pause:3.10"
selinux_category_range = 1024
stats_collect_period = 10
stream_idle_timeout = "4h0m0s"
Expand Down
2 changes: 1 addition & 1 deletion integration/client/testdata/default-1.7.toml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ version = 2
restrict_oom_score_adj = false
# Updated in latest
#sandbox_image = "registry.k8s.io/pause:3.8"
sandbox_image = "registry.k8s.io/pause:3.9"
sandbox_image = "registry.k8s.io/pause:3.10"
selinux_category_range = 1024
stats_collect_period = 10
stream_idle_timeout = "4h0m0s"
Expand Down
2 changes: 1 addition & 1 deletion integration/images/image_list.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ func initImages(imageListFile string) {
imageList = ImageList{
Alpine: "ghcr.io/containerd/alpine:3.14.0",
BusyBox: "ghcr.io/containerd/busybox:1.36",
Pause: "registry.k8s.io/pause:3.9",
Pause: "registry.k8s.io/pause:3.10",
ResourceConsumer: "registry.k8s.io/e2e-test-images/resource-consumer:1.10",
VolumeCopyUp: "ghcr.io/containerd/volume-copy-up:2.2",
VolumeOwnership: "ghcr.io/containerd/volume-ownership:2.1",
Expand Down
2 changes: 1 addition & 1 deletion integration/images/image_list.sample.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
alpine = "docker.io/library/alpine:latest"
busybox = "docker.io/library/busybox:latest"
pause = "registry.k8s.io/pause:3.9"
pause = "registry.k8s.io/pause:3.10"
VolumeCopyUp = "ghcr.io/containerd/volume-copy-up:2.1"
VolumeOwnership = "ghcr.io/containerd/volume-ownership:2.1"
ArgsEscaped = "cplatpublic.azurecr.io/args-escaped-test-image-ns:1.0"
4 changes: 2 additions & 2 deletions internal/cri/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"`
Expand Down
4 changes: 2 additions & 2 deletions internal/cri/server/images/image_pull_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion plugins/cri/images/plugin_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
)

func TestSandboxImageConfigMigration(t *testing.T) {
image := "rancher/mirrored-pause:3.9-amd64"
image := "rancher/mirrored-pause:3.10-amd64"
mikebrow marked this conversation as resolved.
Show resolved Hide resolved
grpcCri := map[string]interface{}{
"sandbox_image": image,
}
Expand Down