move to v3.4.1 for the pause image

Signed-off-by: Iceber Gu <wei.cai-nat@daocloud.io>
containerd · Mar 7, 2021 · f37ae8f · f37ae8f
1 parent a72fe7d
commit f37ae8f
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 20 deletions.
diff --git a/client_test.go b/client_test.go
@@ -357,7 +357,7 @@ func TestImagePullSomePlatforms(t *testing.T) {
 		opts = append(opts, WithPlatform(platform))
 	}
 
-	img, err := client.Fetch(ctx, "k8s.gcr.io/pause:3.1", opts...)
+	img, err := client.Fetch(ctx, "k8s.gcr.io/pause:3.4.1", opts...)
 	if err != nil {
 		t.Fatal(err)
 	}

diff --git a/contrib/ansible/cri-containerd.yaml b/contrib/ansible/cri-containerd.yaml
@@ -61,6 +61,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 k8s.gcr.io/pause:3.2
+        /usr/local/bin/ctr pull k8s.gcr.io/pause:3.4.1
         /usr/local/bin/crictl --runtime-endpoint unix:///run/containerd/containerd.sock \
-        pull k8s.gcr.io/pause:3.2
+        pull k8s.gcr.io/pause:3.4.1
diff --git a/docs/PLUGINS.md b/docs/PLUGINS.md
@@ -244,7 +244,7 @@ example configuration
     stream_server_address = ""
     stream_server_port = "10010"
     enable_selinux = false
-    sandbox_image = "k8s.gcr.io/pause:3.1"
+    sandbox_image = "k8s.gcr.io/pause:3.4.1"
     stats_collect_period = 10
     systemd_cgroup = false
     [plugins.cri.containerd]

diff --git a/docs/cri/config.md b/docs/cri/config.md
@@ -40,7 +40,7 @@ version = 2
   selinux_category_range = 1024
 
   # sandbox_image is the image used by sandbox container.
-  sandbox_image = "k8s.gcr.io/pause:3.2"
+  sandbox_image = "k8s.gcr.io/pause:3.4.1"
 
   # stats_collect_period is the period (in seconds) of snapshots stats collection.
   stats_collect_period = 10

diff --git a/docs/cri/crictl.md b/docs/cri/crictl.md
@@ -59,29 +59,28 @@ 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
 example to create an image tarball for a pause container using Docker:
 ```console
-$ docker pull k8s.gcr.io/pause-amd64:3.2
-  3.2: Pulling from pause-amd64
+$ docker pull k8s.gcr.io/pause:3.4.1
+  3.4.1: Pulling from pause
   67ddbfb20a22: Pull complete
-  Digest: sha256:59eec8837a4d942cc19a52b8c09ea75121acc38114a2c68b98983ce9356b8610
-  Status: Downloaded newer image for k8s.gcr.io/pause-amd64:3.2
-$ docker save k8s.gcr.io/pause-amd64:3.2 -o pause.tar
+  Digest: sha256:6c3835cab3980f11b83277305d0d736051c32b17606f5ec59f1dda67c9ba3810
+  Status: Downloaded newer image for k8s.gcr.io/pause:3.4.1
+$ docker save k8s.gcr.io/pause:3.4.1 -o pause.tar
 ```
-Then use [`ctr`](https://github.com/containerd/containerd/blob/master/docs/man/ctr.1.md)
-to load the container image into the container runtime:
+Then use `ctr` to load the container image into the container runtime:
 ```console
 # The cri plugin uses the "k8s.io" containerd namespace.
 $ sudo ctr -n=k8s.io images import pause.tar
-  Loaded image: k8s.gcr.io/pause-amd64:3.2
+  Loaded image: k8s.gcr.io/pause:3.4.1
 ```
 List images and inspect the pause image:
 ```console
 $ sudo crictl images
 IMAGE                       TAG                 IMAGE ID            SIZE
 docker.io/library/busybox   latest              f6e427c148a76       728kB
-k8s.gcr.io/pause-amd64      3.2                 da86e6ba6ca19       746kB
-$ sudo crictl inspecti da86e6ba6ca19
+k8s.gcr.io/pause            3.4.1               0f8457a4c2eca       686kB
+$ sudo crictl inspecti 0f8457a4c2eca
   ... displays information about the pause image.
-$ sudo crictl inspecti k8s.gcr.io/pause-amd64:3.2
+$ sudo crictl inspecti k8s.gcr.io/pause:3.4.1
   ... displays information about the pause image.
 ```
 
@@ -201,7 +200,7 @@ $ crictl info
       }
     },
     "streamServerPort": "10010",
-    "sandboxImage": "k8s.gcr.io/pause:3.2",
+    "sandboxImage": "k8s.gcr.io/pause:3.4.1",
     "statsCollectPeriod": 10,
     "containerdRootDir": "/var/lib/containerd",
     "containerdEndpoint": "unix:///run/containerd/containerd.sock",

diff --git a/integration/main_test.go b/integration/main_test.go
@@ -49,7 +49,7 @@ import (
 
 const (
 	timeout      = 1 * time.Minute
-	pauseImage   = "k8s.gcr.io/pause:3.2" // This is the same with default sandbox image.
+	pauseImage   = "k8s.gcr.io/pause:3.4.1" // This is the same with default sandbox image.
 	k8sNamespace = constants.K8sContainerdNamespace
 )
 

diff --git a/pkg/cri/config/config_unix.go b/pkg/cri/config/config_unix.go
@@ -56,7 +56,7 @@ func DefaultConfig() PluginConfig {
 			TLSKeyFile:  "",
 			TLSCertFile: "",
 		},
-		SandboxImage:            "k8s.gcr.io/pause:3.2",
+		SandboxImage:            "k8s.gcr.io/pause:3.4.1",
 		StatsCollectPeriod:      10,
 		SystemdCgroup:           false,
 		MaxContainerLogLineSize: 16 * 1024,

diff --git a/pkg/cri/config/config_windows.go b/pkg/cri/config/config_windows.go
@@ -54,7 +54,7 @@ func DefaultConfig() PluginConfig {
 			TLSKeyFile:  "",
 			TLSCertFile: "",
 		},
-		SandboxImage:            "mcr.microsoft.com/oss/kubernetes/pause:1.4.1",
+		SandboxImage:            "k8s.gcr.io/pause:3.4.1",
 		StatsCollectPeriod:      10,
 		MaxContainerLogLineSize: 16 * 1024,
 		Registry: Registry{