Merge pull request #700 from Random-Liu/update-pause-image

Use pause image from new source.
containerd · Mar 26, 2018 · 796cae7 · 796cae7
2 parents 356a41c + f0655ec
commit 796cae7
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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{