github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Update Pause image in tests & config

Browse Source 
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 <atuvenie@cloudbasesolutions.com>
This commit is contained in:
Adelina Tuvenie 2021-08-31 13:45:38 +03:00
parent 44d5a7e26d
commit 6d3d34b85d
11 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/ansible/cri-containerd.yaml
View File

@ -61,6 +61,6 @@
# TODO This needs to be removed once we have consistent concurrent pull results # TODO This needs to be removed once we have consistent concurrent pull results
- name: "Pre-pull pause container image" - name: "Pre-pull pause container image"
shell: | shell: |
/usr/local/bin/ctr pull k8s.gcr.io/pause:3.5 /usr/local/bin/ctr pull k8s.gcr.io/pause:3.6
/usr/local/bin/crictl --runtime-endpoint unix:///run/containerd/containerd.sock \ /usr/local/bin/crictl --runtime-endpoint unix:///run/containerd/containerd.sock \
pull k8s.gcr.io/pause:3.5 pull k8s.gcr.io/pause:3.6

2
docs/PLUGINS.md
View File

@ -244,7 +244,7 @@ example configuration
stream_server_address = "" stream_server_address = ""
stream_server_port = "10010" stream_server_port = "10010"
enable_selinux = false enable_selinux = false
sandbox_image = "k8s.gcr.io/pause:3.5" sandbox_image = "k8s.gcr.io/pause:3.6"
stats_collect_period = 10 stats_collect_period = 10
systemd_cgroup = false systemd_cgroup = false
[plugins.cri.containerd] [plugins.cri.containerd]

2
docs/cri/config.md
View File

@ -40,7 +40,7 @@ version = 2
selinux_category_range = 1024 selinux_category_range = 1024
# sandbox_image is the image used by sandbox container. # sandbox_image is the image used by sandbox container.
sandbox_image = "k8s.gcr.io/pause:3.5" sandbox_image = "k8s.gcr.io/pause:3.6"
# stats_collect_period is the period (in seconds) of snapshots stats collection. # stats_collect_period is the period (in seconds) of snapshots stats collection.
stats_collect_period = 10 stats_collect_period = 10

20
docs/cri/crictl.md
View File

@ -59,26 +59,26 @@ 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 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: example to create an image tarball for a pause container using Docker:
```console ```console
$ docker pull k8s.gcr.io/pause:3.5 $ docker pull k8s.gcr.io/pause:3.6
3.5: Pulling from pause 3.6: Pulling from pause
019d8da33d91: Pull complete fbe1a72f5dcd: Pull complete
Digest: sha256:1ff6c18fbef2045af6b9c16bf034cc421a29027b800e4f9b68ae9b1cb3e9ae07 Digest: sha256:3d380ca8864549e74af4b29c10f9cb0956236dfb01c40ca076fb6c37253234db
Status: Downloaded newer image for k8s.gcr.io/pause:3.5 Status: Downloaded newer image for k8s.gcr.io/pause:3.6
k8s.gcr.io/pause:3.5 k8s.gcr.io/pause:3.6
$ docker save k8s.gcr.io/pause:3.5 -o pause.tar $ docker save k8s.gcr.io/pause:3.6 -o pause.tar
``` ```
Then use `ctr` to load the container image into the container runtime: Then use `ctr` to load the container image into the container runtime:
```console ```console
# The cri plugin uses the "k8s.io" containerd namespace. # The cri plugin uses the "k8s.io" containerd namespace.
$ sudo ctr -n=k8s.io images import pause.tar $ sudo ctr -n=k8s.io images import pause.tar
Loaded image: k8s.gcr.io/pause:3.5 Loaded image: k8s.gcr.io/pause:3.6
``` ```
List images and inspect the pause image: List images and inspect the pause image:
```console ```console
$ sudo crictl images $ sudo crictl images
IMAGE TAG IMAGE ID SIZE IMAGE TAG IMAGE ID SIZE
docker.io/library/busybox latest f6e427c148a76 728kB docker.io/library/busybox latest f6e427c148a76 728kB
k8s.gcr.io/pause 3.5 ed210e3e4a5ba 683kB k8s.gcr.io/pause 3.6 ed210e3e4a5ba 683kB
$ sudo crictl inspecti ed210e3e4a5ba $ sudo crictl inspecti ed210e3e4a5ba
... displays information about the pause image. ... displays information about the pause image.
$ sudo crictl inspecti k8s.gcr.io/pause:3.5 $ sudo crictl inspecti k8s.gcr.io/pause:3.5
@ -201,7 +201,7 @@ $ crictl info
} }
}, },
"streamServerPort": "10010", "streamServerPort": "10010",
"sandboxImage": "k8s.gcr.io/pause:3.5", "sandboxImage": "k8s.gcr.io/pause:3.6",
"statsCollectPeriod": 10, "statsCollectPeriod": 10,
"containerdRootDir": "/var/lib/containerd", "containerdRootDir": "/var/lib/containerd",
"containerdEndpoint": "unix:///run/containerd/containerd.sock", "containerdEndpoint": "unix:///run/containerd/containerd.sock",

4
integration/client/client_test.go
View File

@ -330,7 +330,7 @@ func TestImagePullAllPlatforms(t *testing.T) {
defer cancel() defer cancel()
cs := client.ContentStore() cs := client.ContentStore()
img, err := client.Fetch(ctx, "k8s.gcr.io/pause:3.5") img, err := client.Fetch(ctx, "k8s.gcr.io/pause:3.6")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -380,7 +380,7 @@ func TestImagePullSomePlatforms(t *testing.T) {
// Note: Must be different to the image used in TestImagePullAllPlatforms // Note: Must be different to the image used in TestImagePullAllPlatforms
// or it will see the content pulled by that, and fail. // or it will see the content pulled by that, and fail.
img, err := client.Fetch(ctx, "k8s.gcr.io/pause:3.2", opts...) img, err := client.Fetch(ctx, "k8s.gcr.io/e2e-test-images/busybox:1.29-2", opts...)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }

4
integration/client/image_test.go
View File

@ -31,7 +31,7 @@ import (
) )
func TestImageIsUnpacked(t *testing.T) { func TestImageIsUnpacked(t *testing.T) {
const imageName = "k8s.gcr.io/pause:3.5" const imageName = "k8s.gcr.io/pause:3.6"
ctx, cancel := testContext(t) ctx, cancel := testContext(t)
defer cancel() defer cancel()
@ -137,7 +137,7 @@ func TestImageUsage(t *testing.T) {
t.Skip() t.Skip()
} }
imageName := "k8s.gcr.io/pause:3.5" imageName := "k8s.gcr.io/pause:3.6"
ctx, cancel := testContext(t) ctx, cancel := testContext(t)
defer cancel() defer cancel()

2
integration/client/lease_test.go
View File

@ -55,7 +55,7 @@ func TestLeaseResources(t *testing.T) {
defer ls.Delete(ctx, l, leases.SynchronousDelete) defer ls.Delete(ctx, l, leases.SynchronousDelete)
// step 1: download image // step 1: download image
imageName := "k8s.gcr.io/pause:3.5" imageName := "k8s.gcr.io/pause:3.6"
image, err := client.Pull(ctx, imageName, WithPullUnpack, WithPullSnapshotter("native")) image, err := client.Pull(ctx, imageName, WithPullUnpack, WithPullSnapshotter("native"))
if err != nil { if err != nil {

2
integration/common.go
View File

@ -49,7 +49,7 @@ func initImages(imageListFile string) {
imageList = ImageList{ imageList = ImageList{
Alpine: "docker.io/library/alpine:latest", Alpine: "docker.io/library/alpine:latest",
BusyBox: "docker.io/library/busybox:latest", BusyBox: "docker.io/library/busybox:latest",
Pause: "k8s.gcr.io/pause:3.5", Pause: "k8s.gcr.io/pause:3.6",
ResourceConsumer: "k8s.gcr.io/e2e-test-images/resource-consumer:1.9", ResourceConsumer: "k8s.gcr.io/e2e-test-images/resource-consumer:1.9",
VolumeCopyUp: "gcr.io/k8s-cri-containerd/volume-copy-up:2.0", VolumeCopyUp: "gcr.io/k8s-cri-containerd/volume-copy-up:2.0",
VolumeOwnership: "gcr.io/k8s-cri-containerd/volume-ownership:2.0", VolumeOwnership: "gcr.io/k8s-cri-containerd/volume-ownership:2.0",

2
integration/image_list.sample.toml
View File

@ -1,5 +1,5 @@
alpine = "docker.io/library/alpine:latest" alpine = "docker.io/library/alpine:latest"
busybox = "docker.io/library/busybox:latest" busybox = "docker.io/library/busybox:latest"
pause = "k8s.gcr.io/pause:3.5" pause = "k8s.gcr.io/pause:3.6"
VolumeCopyUp = "gcr.io/k8s-cri-containerd/volume-copy-up:2.0" VolumeCopyUp = "gcr.io/k8s-cri-containerd/volume-copy-up:2.0"
VolumeOwnership = "gcr.io/k8s-cri-containerd/volume-ownership:2.0" VolumeOwnership = "gcr.io/k8s-cri-containerd/volume-ownership:2.0"

2
pkg/cri/config/config_unix.go
View File

@ -92,7 +92,7 @@ func DefaultConfig() PluginConfig {
TLSKeyFile: "", TLSKeyFile: "",
TLSCertFile: "", TLSCertFile: "",
}, },
SandboxImage: "k8s.gcr.io/pause:3.5", SandboxImage: "k8s.gcr.io/pause:3.6",
StatsCollectPeriod: 10, StatsCollectPeriod: 10,
SystemdCgroup: false, SystemdCgroup: false,
MaxContainerLogLineSize: 16 * 1024, MaxContainerLogLineSize: 16 * 1024,

2
pkg/cri/config/config_windows.go
View File

@ -52,7 +52,7 @@ func DefaultConfig() PluginConfig {
TLSKeyFile: "", TLSKeyFile: "",
TLSCertFile: "", TLSCertFile: "",
}, },
SandboxImage: "k8s.gcr.io/pause:3.5", SandboxImage: "k8s.gcr.io/pause:3.6",
StatsCollectPeriod: 10, StatsCollectPeriod: 10,
MaxContainerLogLineSize: 16 * 1024, MaxContainerLogLineSize: 16 * 1024,
MaxConcurrentDownloads: 3, MaxConcurrentDownloads: 3,