Skip to content

Commit 22f2af4

Browse files
committed
update pause image to 3.10
Signed-off-by: bzsuni <[email protected]>
1 parent 45e3091 commit 22f2af4

File tree

10 files changed

+23
-24
lines changed

10 files changed

+23
-24
lines changed

contrib/ansible/cri-containerd.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,6 @@
6161
# TODO This needs to be removed once we have consistent concurrent pull results
6262
- name: "Pre-pull pause container image"
6363
shell: |
64-
/usr/local/bin/ctr pull registry.k8s.io/pause:3.9
64+
/usr/local/bin/ctr pull registry.k8s.io/pause:3.10
6565
/usr/local/bin/crictl --runtime-endpoint unix:///run/containerd/containerd.sock \
66-
pull registry.k8s.io/pause:3.9
66+
pull registry.k8s.io/pause:3.10

docs/cri/config.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ version = 2
153153
selinux_category_range = 1024
154154
155155
# sandbox_image is the image used by sandbox container.
156-
sandbox_image = "registry.k8s.io/pause:3.9"
156+
sandbox_image = "registry.k8s.io/pause:3.10"
157157
158158
# stats_collect_period is the period (in seconds) of snapshots stats collection.
159159
stats_collect_period = 10

docs/cri/crictl.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,29 +59,29 @@ command. With the load command you inject a container image into the container
5959
runtime from a file. First you need to create a container image tarball. For
6060
example to create an image tarball for a pause container using Docker:
6161
```console
62-
$ docker pull registry.k8s.io/pause:3.9
63-
3.9: Pulling from pause
62+
$ docker pull registry.k8s.io/pause:3.10
63+
3.10: Pulling from pause
6464
7582c2cc65ef: Pull complete
65-
Digest: sha256:7031c1b283388d2c2e09b57badb803c05ebed362dc88d84b480cc47f72a21097
66-
Status: Downloaded newer image for registry.k8s.io/pause:3.9
67-
registry.k8s.io/pause:3.9
68-
$ docker save registry.k8s.io/pause:3.9 -o pause.tar
65+
Digest: sha256:ee6521f290b2168b6e0935a181d4cff9be1ac3f505666ef0e3c98fae8199917a
66+
Status: Downloaded newer image for registry.k8s.io/pause:3.10
67+
registry.k8s.io/pause:3.10
68+
$ docker save registry.k8s.io/pause:3.10 -o pause.tar
6969
```
7070
Then use `ctr` to load the container image into the container runtime:
7171
```console
7272
# The cri plugin uses the "k8s.io" containerd namespace.
7373
$ sudo ctr -n=k8s.io images import pause.tar
74-
Loaded image: registry.k8s.io/pause:3.9
74+
Loaded image: registry.k8s.io/pause:3.10
7575
```
7676
List images and inspect the pause image:
7777
```console
7878
$ sudo crictl images
7979
IMAGE TAG IMAGE ID SIZE
8080
docker.io/library/busybox latest f6e427c148a76 728kB
81-
registry.k8s.io/pause 3.9 e6f181688397 311kB
82-
$ sudo crictl inspecti e6f181688397
81+
registry.k8s.io/pause 3.10 873ed75102791 311kB
82+
$ sudo crictl inspecti 873ed75102791
8383
... displays information about the pause image.
84-
$ sudo crictl inspecti registry.k8s.io/pause:3.9
84+
$ sudo crictl inspecti registry.k8s.io/pause:3.10
8585
... displays information about the pause image.
8686
```
8787

@@ -290,7 +290,7 @@ $ crictl info
290290
"streamIdleTimeout": "4h0m0s",
291291
"enableSelinux": false,
292292
"selinuxCategoryRange": 1024,
293-
"sandboxImage": "registry.k8s.io/pause:3.9",
293+
"sandboxImage": "registry.k8s.io/pause:3.10",
294294
"statsCollectPeriod": 10,
295295
"systemdCgroup": false,
296296
"enableTLSStreaming": false,

integration/client/testdata/default-1.6.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,7 @@ version = 2
6262
netns_mounts_under_state_dir = false
6363
restrict_oom_score_adj = false
6464
# Default image update in latest
65-
#sandbox_image = "registry.k8s.io/pause:3.6"
66-
sandbox_image = "registry.k8s.io/pause:3.9"
65+
sandbox_image = "registry.k8s.io/pause:3.10"
6766
selinux_category_range = 1024
6867
stats_collect_period = 10
6968
stream_idle_timeout = "4h0m0s"

integration/client/testdata/default-1.7.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ version = 2
6969
restrict_oom_score_adj = false
7070
# Updated in latest
7171
#sandbox_image = "registry.k8s.io/pause:3.8"
72-
sandbox_image = "registry.k8s.io/pause:3.9"
72+
sandbox_image = "registry.k8s.io/pause:3.10"
7373
selinux_category_range = 1024
7474
stats_collect_period = 10
7575
stream_idle_timeout = "4h0m0s"

integration/images/image_list.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func initImages(imageListFile string) {
5151
imageList = ImageList{
5252
Alpine: "ghcr.io/containerd/alpine:3.14.0",
5353
BusyBox: "ghcr.io/containerd/busybox:1.36",
54-
Pause: "registry.k8s.io/pause:3.9",
54+
Pause: "registry.k8s.io/pause:3.10",
5555
ResourceConsumer: "registry.k8s.io/e2e-test-images/resource-consumer:1.10",
5656
VolumeCopyUp: "ghcr.io/containerd/volume-copy-up:2.2",
5757
VolumeOwnership: "ghcr.io/containerd/volume-ownership:2.1",
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
alpine = "docker.io/library/alpine:latest"
22
busybox = "docker.io/library/busybox:latest"
3-
pause = "registry.k8s.io/pause:3.9"
3+
pause = "registry.k8s.io/pause:3.10"
44
VolumeCopyUp = "ghcr.io/containerd/volume-copy-up:2.1"
55
VolumeOwnership = "ghcr.io/containerd/volume-ownership:2.1"
66
ArgsEscaped = "cplatpublic.azurecr.io/args-escaped-test-image-ns:1.0"

internal/cri/config/config.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ const (
7070
ModeShim SandboxControllerMode = "shim"
7171
// DefaultSandboxImage is the default image to use for sandboxes when empty or
7272
// for default configurations.
73-
DefaultSandboxImage = "registry.k8s.io/pause:3.9"
73+
DefaultSandboxImage = "registry.k8s.io/pause:3.10"
7474
// IOTypeFifo is container io implemented by creating named pipe
7575
IOTypeFifo = "fifo"
7676
// IOTypeStreaming is container io implemented by connecting the streaming api to sandbox endpoint
@@ -284,7 +284,7 @@ type ImageConfig struct {
284284
// by other plugins to lookup the current image name.
285285
// Image names should be full names including domain and tag
286286
// Examples:
287-
// "sandbox": "k8s.gcr.io/pause:3.9"
287+
// "sandbox": "k8s.gcr.io/pause:3.10"
288288
// "base": "docker.io/library/ubuntu:latest"
289289
// Migrated from:
290290
// (PluginConfig).SandboxImage string `toml:"sandbox_image" json:"sandboxImage"`

internal/cri/server/images/image_pull_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -498,8 +498,8 @@ func TestImageGetLabels(t *testing.T) {
498498
{
499499
name: "pinned image labels should get added on sandbox image",
500500
expectedLabel: map[string]string{labels.ImageLabelKey: labels.ImageLabelValue, labels.PinnedImageLabelKey: labels.PinnedImageLabelValue},
501-
pinnedImages: map[string]string{"sandbox": "k8s.gcr.io/pause:3.9"},
502-
pullImageName: "k8s.gcr.io/pause:3.9",
501+
pinnedImages: map[string]string{"sandbox": "k8s.gcr.io/pause:3.10"},
502+
pullImageName: "k8s.gcr.io/pause:3.10",
503503
},
504504
{
505505
name: "pinned image labels should get added on sandbox image without tag",

plugins/cri/images/plugin_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
)
2727

2828
func TestSandboxImageConfigMigration(t *testing.T) {
29-
image := "rancher/mirrored-pause:3.9-amd64"
29+
image := "rancher/mirrored-pause:3.10-amd64"
3030
grpcCri := map[string]interface{}{
3131
"sandbox_image": image,
3232
}

0 commit comments

Comments
 (0)