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

move to v3.2 for the pause image

Browse Source 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
This commit is contained in:
Mike Brown 2020-02-14 12:55:52 -06:00
parent 55566f9682
commit c9ed98462d
5 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,6 +48,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.1 /usr/local/bin/ctr pull k8s.gcr.io/pause:3.2
/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.1 pull k8s.gcr.io/pause:3.2

2
docs/config.md
View File

@ -35,7 +35,7 @@ version = 2
enable_selinux = false enable_selinux = false
# 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.1" sandbox_image = "k8s.gcr.io/pause:3.2"
# 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

16
docs/crictl.md
View File

@ -44,29 +44,29 @@ 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.1 $ docker pull k8s.gcr.io/pause-amd64:3.2
3.1: Pulling from pause-amd64 3.2: Pulling from pause-amd64
67ddbfb20a22: Pull complete 67ddbfb20a22: Pull complete
Digest: sha256:59eec8837a4d942cc19a52b8c09ea75121acc38114a2c68b98983ce9356b8610 Digest: sha256:59eec8837a4d942cc19a52b8c09ea75121acc38114a2c68b98983ce9356b8610
Status: Downloaded newer image for k8s.gcr.io/pause-amd64:3.1 Status: Downloaded newer image for k8s.gcr.io/pause-amd64:3.2
$ docker save k8s.gcr.io/pause-amd64:3.1 -o pause.tar $ docker save k8s.gcr.io/pause-amd64:3.2 -o pause.tar
``` ```
Then use [`ctr`](https://github.com/containerd/containerd/blob/master/docs/man/ctr.1.md) Then use [`ctr`](https://github.com/containerd/containerd/blob/master/docs/man/ctr.1.md)
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.1 Loaded image: k8s.gcr.io/pause-amd64:3.2
``` ```
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.1 da86e6ba6ca19 746kB k8s.gcr.io/pause-amd64 3.2 da86e6ba6ca19 746kB
$ sudo crictl inspecti da86e6ba6ca19 $ sudo crictl inspecti da86e6ba6ca19
... displays information about the pause image. ... displays information about the pause image.
$ sudo crictl inspecti k8s.gcr.io/pause-amd64:3.1 $ sudo crictl inspecti k8s.gcr.io/pause-amd64:3.2
... displays information about the pause image. ... displays information about the pause image.
``` ```
@ -186,7 +186,7 @@ $ crictl info
} }
}, },
"streamServerPort": "10010", "streamServerPort": "10010",
"sandboxImage": "k8s.gcr.io/pause:3.1", "sandboxImage": "k8s.gcr.io/pause:3.2",
"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

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

2
pkg/config/config_unix.go
View File

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