Skip to content

Commit 6d68490

Browse files
mikebrowmikebrow
authored
Merge pull request #5014 from Iceber/update-pause-version
move to v3.4.1 for the pause image
2 parents 185aaf2 + f37ae8f commit 6d68490

8 files changed

Lines changed: 19 additions & 20 deletions

File tree

‎client_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ func TestImagePullSomePlatforms(t *testing.T) {
357357
opts = append(opts, WithPlatform(platform))
358358
}
359359

360-
img, err := client.Fetch(ctx, "k8s.gcr.io/pause:3.1", opts...)
360+
img, err := client.Fetch(ctx, "k8s.gcr.io/pause:3.4.1", opts...)
361361
if err != nil {
362362
t.Fatal(err)
363363
}

‎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 k8s.gcr.io/pause:3.2
64+
/usr/local/bin/ctr pull k8s.gcr.io/pause:3.4.1
6565
/usr/local/bin/crictl --runtime-endpoint unix:///run/containerd/containerd.sock \
66-
pull k8s.gcr.io/pause:3.2
66+
pull k8s.gcr.io/pause:3.4.1

‎docs/PLUGINS.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ example configuration
244244
stream_server_address = ""
245245
stream_server_port = "10010"
246246
enable_selinux = false
247-
sandbox_image = "k8s.gcr.io/pause:3.1"
247+
sandbox_image = "k8s.gcr.io/pause:3.4.1"
248248
stats_collect_period = 10
249249
systemd_cgroup = false
250250
[plugins.cri.containerd]

‎docs/cri/config.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ version = 2
4040
selinux_category_range = 1024
4141

4242
# sandbox_image is the image used by sandbox container.
43-
sandbox_image = "k8s.gcr.io/pause:3.2"
43+
sandbox_image = "k8s.gcr.io/pause:3.4.1"
4444

4545
# stats_collect_period is the period (in seconds) of snapshots stats collection.
4646
stats_collect_period = 10

‎docs/cri/crictl.md‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -59,29 +59,28 @@ 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 k8s.gcr.io/pause-amd64:3.2
63-
3.2: Pulling from pause-amd64
62+
$ docker pull k8s.gcr.io/pause:3.4.1
63+
3.4.1: Pulling from pause
6464
67ddbfb20a22: Pull complete
65-
Digest: sha256:59eec8837a4d942cc19a52b8c09ea75121acc38114a2c68b98983ce9356b8610
66-
Status: Downloaded newer image for k8s.gcr.io/pause-amd64:3.2
67-
$ docker save k8s.gcr.io/pause-amd64:3.2 -o pause.tar
65+
Digest: sha256:6c3835cab3980f11b83277305d0d736051c32b17606f5ec59f1dda67c9ba3810
66+
Status: Downloaded newer image for k8s.gcr.io/pause:3.4.1
67+
$ docker save k8s.gcr.io/pause:3.4.1 -o pause.tar
6868
```
69-
Then use [`ctr`](https://github.com/containerd/containerd/blob/master/docs/man/ctr.1.md)
70-
to load the container image into the container runtime:
69+
Then use `ctr` to load the container image into the container runtime:
7170
```console
7271
# The cri plugin uses the "k8s.io" containerd namespace.
7372
$ sudo ctr -n=k8s.io images import pause.tar
74-
Loaded image: k8s.gcr.io/pause-amd64:3.2
73+
Loaded image: k8s.gcr.io/pause:3.4.1
7574
```
7675
List images and inspect the pause image:
7776
```console
7877
$ sudo crictl images
7978
IMAGE TAG IMAGE ID SIZE
8079
docker.io/library/busybox latest f6e427c148a76 728kB
81-
k8s.gcr.io/pause-amd64 3.2 da86e6ba6ca19 746kB
82-
$ sudo crictl inspecti da86e6ba6ca19
80+
k8s.gcr.io/pause 3.4.1 0f8457a4c2eca 686kB
81+
$ sudo crictl inspecti 0f8457a4c2eca
8382
... displays information about the pause image.
84-
$ sudo crictl inspecti k8s.gcr.io/pause-amd64:3.2
83+
$ sudo crictl inspecti k8s.gcr.io/pause:3.4.1
8584
... displays information about the pause image.
8685
```
8786

@@ -201,7 +200,7 @@ $ crictl info
201200
}
202201
},
203202
"streamServerPort": "10010",
204-
"sandboxImage": "k8s.gcr.io/pause:3.2",
203+
"sandboxImage": "k8s.gcr.io/pause:3.4.1",
205204
"statsCollectPeriod": 10,
206205
"containerdRootDir": "/var/lib/containerd",
207206
"containerdEndpoint": "unix:///run/containerd/containerd.sock",

‎integration/main_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ import (
4949

5050
const (
5151
timeout = 1 * time.Minute
52-
pauseImage = "k8s.gcr.io/pause:3.2" // This is the same with default sandbox image.
52+
pauseImage = "k8s.gcr.io/pause:3.4.1" // This is the same with default sandbox image.
5353
k8sNamespace = constants.K8sContainerdNamespace
5454
)
5555

‎pkg/cri/config/config_unix.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func DefaultConfig() PluginConfig {
5656
TLSKeyFile: "",
5757
TLSCertFile: "",
5858
},
59-
SandboxImage: "k8s.gcr.io/pause:3.2",
59+
SandboxImage: "k8s.gcr.io/pause:3.4.1",
6060
StatsCollectPeriod: 10,
6161
SystemdCgroup: false,
6262
MaxContainerLogLineSize: 16 * 1024,

‎pkg/cri/config/config_windows.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ func DefaultConfig() PluginConfig {
5454
TLSKeyFile: "",
5555
TLSCertFile: "",
5656
},
57-
SandboxImage: "mcr.microsoft.com/oss/kubernetes/pause:1.4.1",
57+
SandboxImage: "k8s.gcr.io/pause:3.4.1",
5858
StatsCollectPeriod: 10,
5959
MaxContainerLogLineSize: 16 * 1024,
6060
Registry: Registry{

0 commit comments

Comments
 (0)