Skip to content

Commit ffff688

Browse files
pacoxupacoxu
committed
upgrade pause image to 3.5 for non-root
Signed-off-by: pacoxu <paco.xu@daocloud.io>
1 parent fef6bb8 commit ffff688

File tree

10 files changed

+24
-23
lines changed

10 files changed

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

‎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.4.1"
247+
sandbox_image = "k8s.gcr.io/pause:3.5"
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.4.1"
43+
sandbox_image = "k8s.gcr.io/pause:3.5"
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: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,28 +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 k8s.gcr.io/pause:3.4.1
63-
3.4.1: Pulling from pause
64-
67ddbfb20a22: Pull complete
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
62+
$ docker pull k8s.gcr.io/pause:3.5
63+
3.5: Pulling from pause
64+
019d8da33d91: Pull complete
65+
Digest: sha256:1ff6c18fbef2045af6b9c16bf034cc421a29027b800e4f9b68ae9b1cb3e9ae07
66+
Status: Downloaded newer image for k8s.gcr.io/pause:3.5
67+
k8s.gcr.io/pause:3.5
68+
$ docker save k8s.gcr.io/pause:3.5 -o pause.tar
6869
```
6970
Then use `ctr` to load the container image into the container runtime:
7071
```console
7172
# The cri plugin uses the "k8s.io" containerd namespace.
7273
$ sudo ctr -n=k8s.io images import pause.tar
73-
Loaded image: k8s.gcr.io/pause:3.4.1
74+
Loaded image: k8s.gcr.io/pause:3.5
7475
```
7576
List images and inspect the pause image:
7677
```console
7778
$ sudo crictl images
7879
IMAGE TAG IMAGE ID SIZE
7980
docker.io/library/busybox latest f6e427c148a76 728kB
80-
k8s.gcr.io/pause 3.4.1 0f8457a4c2eca 686kB
81-
$ sudo crictl inspecti 0f8457a4c2eca
81+
k8s.gcr.io/pause 3.5 ed210e3e4a5ba 683kB
82+
$ sudo crictl inspecti ed210e3e4a5ba
8283
... displays information about the pause image.
83-
$ sudo crictl inspecti k8s.gcr.io/pause:3.4.1
84+
$ sudo crictl inspecti k8s.gcr.io/pause:3.5
8485
... displays information about the pause image.
8586
```
8687

@@ -200,7 +201,7 @@ $ crictl info
200201
}
201202
},
202203
"streamServerPort": "10010",
203-
"sandboxImage": "k8s.gcr.io/pause:3.4.1",
204+
"sandboxImage": "k8s.gcr.io/pause:3.5",
204205
"statsCollectPeriod": 10,
205206
"containerdRootDir": "/var/lib/containerd",
206207
"containerdEndpoint": "unix:///run/containerd/containerd.sock",

‎integration/client/client_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ func TestImagePullAllPlatforms(t *testing.T) {
310310
defer cancel()
311311

312312
cs := client.ContentStore()
313-
img, err := client.Fetch(ctx, "k8s.gcr.io/pause:3.4.1")
313+
img, err := client.Fetch(ctx, "k8s.gcr.io/pause:3.5")
314314
if err != nil {
315315
t.Fatal(err)
316316
}

‎integration/client/image_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131
)
3232

3333
func TestImageIsUnpacked(t *testing.T) {
34-
const imageName = "k8s.gcr.io/pause:3.4.1"
34+
const imageName = "k8s.gcr.io/pause:3.5"
3535
ctx, cancel := testContext(t)
3636
defer cancel()
3737

@@ -81,7 +81,7 @@ func TestImagePullWithDistSourceLabel(t *testing.T) {
8181
var (
8282
source = "k8s.gcr.io"
8383
repoName = "pause"
84-
tag = "3.4.1"
84+
tag = "3.5"
8585
)
8686

8787
ctx, cancel := testContext(t)
@@ -137,7 +137,7 @@ func TestImageUsage(t *testing.T) {
137137
t.Skip()
138138
}
139139

140-
imageName := "k8s.gcr.io/pause:3.4.1"
140+
imageName := "k8s.gcr.io/pause:3.5"
141141
ctx, cancel := testContext(t)
142142
defer cancel()
143143

‎integration/client/lease_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ func TestLeaseResources(t *testing.T) {
5555
defer ls.Delete(ctx, l, leases.SynchronousDelete)
5656

5757
// step 1: download image
58-
imageName := "k8s.gcr.io/pause:3.4.1"
58+
imageName := "k8s.gcr.io/pause:3.5"
5959

6060
image, err := client.Pull(ctx, imageName, WithPullUnpack, WithPullSnapshotter("native"))
6161
if err != nil {

‎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.4.1" // This is the same with default sandbox image.
52+
pauseImage = "k8s.gcr.io/pause:3.5" // 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.4.1",
59+
SandboxImage: "k8s.gcr.io/pause:3.5",
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: "k8s.gcr.io/pause:3.4.1",
57+
SandboxImage: "k8s.gcr.io/pause:3.5",
5858
StatsCollectPeriod: 10,
5959
MaxContainerLogLineSize: 16 * 1024,
6060
Registry: Registry{

0 commit comments

Comments
 (0)