Skip to content

Commit 6d3d34b

Browse files
author
Adelina Tuvenie
committed
Update Pause image in tests & config
With the introduction of Windows Server 2022, some images have been updated to support WS2022 in their manifest list. This commit updates the test images accordingly. Signed-off-by: Adelina Tuvenie <[email protected]>
1 parent 44d5a7e commit 6d3d34b

11 files changed

Lines changed: 23 additions & 23 deletions

File tree

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

‎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.5"
247+
sandbox_image = "k8s.gcr.io/pause:3.6"
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.5"
43+
sandbox_image = "k8s.gcr.io/pause:3.6"
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: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,26 +59,26 @@ 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.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
62+
$ docker pull k8s.gcr.io/pause:3.6
63+
3.6: Pulling from pause
64+
fbe1a72f5dcd: Pull complete
65+
Digest: sha256:3d380ca8864549e74af4b29c10f9cb0956236dfb01c40ca076fb6c37253234db
66+
Status: Downloaded newer image for k8s.gcr.io/pause:3.6
67+
k8s.gcr.io/pause:3.6
68+
$ docker save k8s.gcr.io/pause:3.6 -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: k8s.gcr.io/pause:3.5
74+
Loaded image: k8s.gcr.io/pause:3.6
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-
k8s.gcr.io/pause 3.5 ed210e3e4a5ba 683kB
81+
k8s.gcr.io/pause 3.6 ed210e3e4a5ba 683kB
8282
$ sudo crictl inspecti ed210e3e4a5ba
8383
... displays information about the pause image.
8484
$ sudo crictl inspecti k8s.gcr.io/pause:3.5
@@ -201,7 +201,7 @@ $ crictl info
201201
}
202202
},
203203
"streamServerPort": "10010",
204-
"sandboxImage": "k8s.gcr.io/pause:3.5",
204+
"sandboxImage": "k8s.gcr.io/pause:3.6",
205205
"statsCollectPeriod": 10,
206206
"containerdRootDir": "/var/lib/containerd",
207207
"containerdEndpoint": "unix:///run/containerd/containerd.sock",

‎integration/client/client_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ func TestImagePullAllPlatforms(t *testing.T) {
330330
defer cancel()
331331

332332
cs := client.ContentStore()
333-
img, err := client.Fetch(ctx, "k8s.gcr.io/pause:3.5")
333+
img, err := client.Fetch(ctx, "k8s.gcr.io/pause:3.6")
334334
if err != nil {
335335
t.Fatal(err)
336336
}
@@ -380,7 +380,7 @@ func TestImagePullSomePlatforms(t *testing.T) {
380380

381381
// Note: Must be different to the image used in TestImagePullAllPlatforms
382382
// or it will see the content pulled by that, and fail.
383-
img, err := client.Fetch(ctx, "k8s.gcr.io/pause:3.2", opts...)
383+
img, err := client.Fetch(ctx, "k8s.gcr.io/e2e-test-images/busybox:1.29-2", opts...)
384384
if err != nil {
385385
t.Fatal(err)
386386
}

‎integration/client/image_test.go‎

Lines changed: 2 additions & 2 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.5"
34+
const imageName = "k8s.gcr.io/pause:3.6"
3535
ctx, cancel := testContext(t)
3636
defer cancel()
3737

@@ -137,7 +137,7 @@ func TestImageUsage(t *testing.T) {
137137
t.Skip()
138138
}
139139

140-
imageName := "k8s.gcr.io/pause:3.5"
140+
imageName := "k8s.gcr.io/pause:3.6"
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.5"
58+
imageName := "k8s.gcr.io/pause:3.6"
5959

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

‎integration/common.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ func initImages(imageListFile string) {
4949
imageList = ImageList{
5050
Alpine: "docker.io/library/alpine:latest",
5151
BusyBox: "docker.io/library/busybox:latest",
52-
Pause: "k8s.gcr.io/pause:3.5",
52+
Pause: "k8s.gcr.io/pause:3.6",
5353
ResourceConsumer: "k8s.gcr.io/e2e-test-images/resource-consumer:1.9",
5454
VolumeCopyUp: "gcr.io/k8s-cri-containerd/volume-copy-up:2.0",
5555
VolumeOwnership: "gcr.io/k8s-cri-containerd/volume-ownership:2.0",

‎integration/image_list.sample.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
alpine = "docker.io/library/alpine:latest"
22
busybox = "docker.io/library/busybox:latest"
3-
pause = "k8s.gcr.io/pause:3.5"
3+
pause = "k8s.gcr.io/pause:3.6"
44
VolumeCopyUp = "gcr.io/k8s-cri-containerd/volume-copy-up:2.0"
55
VolumeOwnership = "gcr.io/k8s-cri-containerd/volume-ownership:2.0"

‎pkg/cri/config/config_unix.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ func DefaultConfig() PluginConfig {
9292
TLSKeyFile: "",
9393
TLSCertFile: "",
9494
},
95-
SandboxImage: "k8s.gcr.io/pause:3.5",
95+
SandboxImage: "k8s.gcr.io/pause:3.6",
9696
StatsCollectPeriod: 10,
9797
SystemdCgroup: false,
9898
MaxContainerLogLineSize: 16 * 1024,

0 commit comments

Comments
 (0)