From f0655ecfe0e63eb9570990ed5b99a83a7662b314 Mon Sep 17 00:00:00 2001 From: Lantao Liu Date: Mon, 26 Mar 2018 07:11:41 +0000 Subject: [PATCH] Use pause image from new source. Signed-off-by: Lantao Liu --- contrib/ansible/cri-containerd.yaml | 4 ++-- docs/config.md | 2 +- docs/crictl.md | 2 +- integration/test_utils.go | 2 +- pkg/config/config.go | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/ansible/cri-containerd.yaml b/contrib/ansible/cri-containerd.yaml index 512458b55..d6475fa14 100644 --- a/contrib/ansible/cri-containerd.yaml +++ b/contrib/ansible/cri-containerd.yaml @@ -56,6 +56,6 @@ # TODO This needs to be removed once we have consistent concurrent pull results - name: "Pre-pull pause container image" shell: | - /usr/local/bin/ctr pull gcr.io/google_containers/pause:3.1 + /usr/local/bin/ctr pull k8s.gcr.io/pause:3.1 /usr/local/bin/crictl --runtime-endpoint /run/containerd/containerd.sock \ - pull gcr.io/google_containers/pause:3.1 + pull k8s.gcr.io/pause:3.1 diff --git a/docs/config.md b/docs/config.md index 91a8b910d..3a4d9e312 100644 --- a/docs/config.md +++ b/docs/config.md @@ -16,7 +16,7 @@ The explanation and default value of each configuration item are as follows: enable_selinux = false # sandbox_image is the image used by sandbox container. - sandbox_image = "gcr.io/google_containers/pause:3.1" + sandbox_image = "k8s.gcr.io/pause:3.1" # stats_collect_period is the period (in seconds) of snapshots stats collection. stats_collect_period = 10 diff --git a/docs/crictl.md b/docs/crictl.md index 8d0578af2..e1f112584 100644 --- a/docs/crictl.md +++ b/docs/crictl.md @@ -185,7 +185,7 @@ $ crictl info } }, "streamServerPort": "10010", - "sandboxImage": "gcr.io/google_containers/pause:3.0", + "sandboxImage": "k8s.gcr.io/pause:3.1", "statsCollectPeriod": 10, "containerdRootDir": "/var/lib/containerd", "containerdEndpoint": "/run/containerd/containerd.sock", diff --git a/integration/test_utils.go b/integration/test_utils.go index 4a98b0c60..2593f34cc 100644 --- a/integration/test_utils.go +++ b/integration/test_utils.go @@ -39,7 +39,7 @@ import ( const ( timeout = 1 * time.Minute - pauseImage = "gcr.io/google_containers/pause:3.1" // This is the same with default sandbox image. + pauseImage = "k8s.gcr.io/pause:3.1" // This is the same with default sandbox image. k8sNamespace = constants.K8sContainerdNamespace containerdEndpoint = "/run/containerd/containerd.sock" ) diff --git a/pkg/config/config.go b/pkg/config/config.go index 5c24faf4d..7b7601311 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -118,7 +118,7 @@ func DefaultConfig() PluginConfig { StreamServerAddress: "", StreamServerPort: "10010", EnableSelinux: false, - SandboxImage: "gcr.io/google_containers/pause:3.1", + SandboxImage: "k8s.gcr.io/pause:3.1", StatsCollectPeriod: 10, SystemdCgroup: false, Registry: Registry{