Merge pull request #690 from nitkon/master

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

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.0
+        /usr/local/bin/ctr pull gcr.io/google_containers/pause:3.1
         /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

integration/test_utils.go

@@ -39,7 +39,7 @@ import (
 
 const (
 	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
 	containerdEndpoint = "/run/containerd/containerd.sock"
 )

pkg/config/config.go

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