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

Merge pull request #5014 from Iceber/update-pause-version

Browse Source 
move to v3.4.1 for the pause image
This commit is contained in:
Mike Brown 2021-03-08 15:48:03 -06:00 committed by GitHub
commit 6d68490ef6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client_test.go
View File

@ -357,7 +357,7 @@ func TestImagePullSomePlatforms(t *testing.T) {
opts = append(opts, WithPlatform(platform)) opts = append(opts, WithPlatform(platform))
} }
img, err := client.Fetch(ctx, "k8s.gcr.io/pause:3.1", opts...) img, err := client.Fetch(ctx, "k8s.gcr.io/pause:3.4.1", opts...)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }

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.2 /usr/local/bin/ctr pull k8s.gcr.io/pause:3.4.1
/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.2 pull k8s.gcr.io/pause:3.4.1

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.1" sandbox_image = "k8s.gcr.io/pause:3.4.1"
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.2" sandbox_image = "k8s.gcr.io/pause:3.4.1"
# 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

23
docs/cri/crictl.md
View File

@ -59,29 +59,28 @@ 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-amd64:3.2 $ docker pull k8s.gcr.io/pause:3.4.1
3.2: Pulling from pause-amd64 3.4.1: Pulling from pause
67ddbfb20a22: Pull complete 67ddbfb20a22: Pull complete
Digest: sha256:59eec8837a4d942cc19a52b8c09ea75121acc38114a2c68b98983ce9356b8610 Digest: sha256:6c3835cab3980f11b83277305d0d736051c32b17606f5ec59f1dda67c9ba3810
Status: Downloaded newer image for k8s.gcr.io/pause-amd64:3.2 Status: Downloaded newer image for k8s.gcr.io/pause:3.4.1
$ docker save k8s.gcr.io/pause-amd64:3.2 -o pause.tar $ docker save k8s.gcr.io/pause:3.4.1 -o pause.tar
``` ```
Then use [`ctr`](https://github.com/containerd/containerd/blob/master/docs/man/ctr.1.md) Then use `ctr` to load the container image into the container runtime:
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-amd64:3.2 Loaded image: k8s.gcr.io/pause:3.4.1
``` ```
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-amd64 3.2 da86e6ba6ca19 746kB k8s.gcr.io/pause 3.4.1 0f8457a4c2eca 686kB
$ sudo crictl inspecti da86e6ba6ca19 $ sudo crictl inspecti 0f8457a4c2eca
... displays information about the pause image. ... displays information about the pause image.
$ sudo crictl inspecti k8s.gcr.io/pause-amd64:3.2 $ sudo crictl inspecti k8s.gcr.io/pause:3.4.1
... displays information about the pause image. ... displays information about the pause image.
``` ```
@ -201,7 +200,7 @@ $ crictl info
} }
}, },
"streamServerPort": "10010", "streamServerPort": "10010",
"sandboxImage": "k8s.gcr.io/pause:3.2", "sandboxImage": "k8s.gcr.io/pause:3.4.1",
"statsCollectPeriod": 10, "statsCollectPeriod": 10,
"containerdRootDir": "/var/lib/containerd", "containerdRootDir": "/var/lib/containerd",
"containerdEndpoint": "unix:///run/containerd/containerd.sock", "containerdEndpoint": "unix:///run/containerd/containerd.sock",

2
integration/main_test.go
View File

@ -49,7 +49,7 @@ import (
const ( const (
timeout = 1 * time.Minute timeout = 1 * time.Minute
pauseImage = "k8s.gcr.io/pause:3.2" // This is the same with default sandbox image. pauseImage = "k8s.gcr.io/pause:3.4.1" // This is the same with default sandbox image.
k8sNamespace = constants.K8sContainerdNamespace k8sNamespace = constants.K8sContainerdNamespace
) )

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

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

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

@ -54,7 +54,7 @@ func DefaultConfig() PluginConfig {
TLSKeyFile: "", TLSKeyFile: "",
TLSCertFile: "", TLSCertFile: "",
}, },
SandboxImage: "mcr.microsoft.com/oss/kubernetes/pause:1.4.1", SandboxImage: "k8s.gcr.io/pause:3.4.1",
StatsCollectPeriod: 10, StatsCollectPeriod: 10,
MaxContainerLogLineSize: 16 * 1024, MaxContainerLogLineSize: 16 * 1024,
Registry: Registry{ Registry: Registry{