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

Bump pause container to multi-arch gcr.io/google-containers/pause:3.1

Browse Source 
Signed-off-by: Nitesh Konkar <niteshkonkar@in.ibm.com>
This commit is contained in:
Nitesh Konkar 2018-03-22 05:40:57 +00:00
parent 246ffa325d
commit 6a542c596b
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,6 +56,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 gcr.io/google_containers/pause:3.0 /usr/local/bin/ctr pull gcr.io/google_containers/pause:3.1
/usr/local/bin/crictl --runtime-endpoint /run/containerd/containerd.sock \ /usr/local/bin/crictl --runtime-endpoint /run/containerd/containerd.sock \
pull gcr.io/google_containers/pause:3.0 pull gcr.io/google_containers/pause:3.1

2
integration/test_utils.go
View File

@ -39,7 +39,7 @@ import (
const ( const (
timeout = 1 * time.Minute timeout = 1 * time.Minute
pauseImage = "gcr.io/google_containers/pause:3.0" // This is the same with default sandbox image. pauseImage = "gcr.io/google_containers/pause:3.1" // This is the same with default sandbox image.
k8sNamespace = constants.K8sContainerdNamespace k8sNamespace = constants.K8sContainerdNamespace
containerdEndpoint = "/run/containerd/containerd.sock" containerdEndpoint = "/run/containerd/containerd.sock"
) )

2
pkg/config/config.go
View File

@ -120,7 +120,7 @@ func DefaultConfig() PluginConfig {
StreamServerAddress: "", StreamServerAddress: "",
StreamServerPort: "10010", StreamServerPort: "10010",
EnableSelinux: false, EnableSelinux: false,
SandboxImage: "gcr.io/google_containers/pause:3.0", SandboxImage: "gcr.io/google_containers/pause:3.1",
StatsCollectPeriod: 10, StatsCollectPeriod: 10,
SystemdCgroup: false, SystemdCgroup: false,
Registry: Registry{ Registry: Registry{