docs: point cri release tarball to github release page

zhsj · zhsj · commit 91dc69ee4380 · 2021-01-03T17:50:40.000+08:00
Signed-off-by: Shengjing Zhu &lt;zhsj@debian.org&gt;
diff --git a/README.md b/README.md
@@ -231,8 +231,7 @@ Please see [RELEASES.md](RELEASES.md) for details on versioning and stability
 of containerd components.
 
 Downloadable 64-bit Intel/AMD binaries of all official releases are available on
-our [releases page](https://github.com/containerd/containerd/releases), as well as
-auto-published to the [cri-containerd-release storage bucket](https://console.cloud.google.com/storage/browser/cri-containerd-release?pli=1).
+our [releases page](https://github.com/containerd/containerd/releases).
 
 For other architectures and distribution support, you will find that many
 Linux distributions package their own containerd and provide it across several
@@ -262,7 +261,7 @@ loaded for the user's shell environment.
 
 `cri` is a [containerd](https://containerd.io/) plugin implementation of the Kubernetes [container runtime interface (CRI)](https://github.com/kubernetes/cri-api/blob/master/pkg/apis/runtime/v1alpha2/api.proto). With it, you are able to use containerd as the container runtime for a Kubernetes cluster.
 
-![cri](./docs/cri.png)
+![cri](./docs/cri/cri.png)
 
 #### CRI Status
 
@@ -286,7 +285,7 @@ A Kubernetes incubator project, [cri-tools](https://github.com/kubernetes-sigs/c
 #### CRI Guides
 * [Bringing up a Production Quality Cluster on GCE](docs/cri/kube-up.md)
 * [Installing with Ansible and Kubeadm](contrib/ansible/README.md)
-* [For Non-Ansible Users, Preforming a Custom Installation Using the Release Tarball and Kubeadm](docs/installation.md)
+* [For Non-Ansible Users, Preforming a Custom Installation Using the Release Tarball and Kubeadm](docs/cri/installation.md)
 * [CRI Plugin Testing Guide](./docs/cri/testing.md)
 * [Debugging Pods, Containers, and Images with `crictl`](./docs/cri/crictl.md)
 * [Configuring `cri` Plugins](./docs/cri/config.md)
diff --git a/contrib/ansible/tasks/binaries.yaml b/contrib/ansible/tasks/binaries.yaml
@@ -1,7 +1,7 @@
 ---
 - name: "Get Containerd"
   unarchive:
-    src: "https://storage.googleapis.com/cri-containerd-release/cri-containerd-{{ containerd_release_version }}.linux-amd64.tar.gz"
+    src: "https://github.com/containerd/containerd/releases/download/v{{ containerd_release_version }}/cri-containerd-cni-{{ containerd_release_version }}-linux-amd64.tar.gz"
     dest: "/"
     remote_src: yes
 
diff --git a/docs/cri/cri.png b/docs/cri/cri.png
diff --git a/docs/cri/installation.md b/docs/cri/installation.md
@@ -4,50 +4,74 @@ This document provides the steps to install `containerd` and its dependencies wi
 These steps have been verified on Ubuntu 16.04. For other OS distributions, the steps may differ. Please feel free to file issues or PRs if you encounter any problems on other OS distributions.
 
 *Note: You need to run the following steps on each node you are planning to use in your Kubernetes cluster.*
+
 ## Release Tarball
-For each `containerd` release, we'll publish a release tarball specifically for Kubernetes named `cri-containerd-${VERSION}.${OS}-${ARCH}.tar.gz`. This release tarball contains all required binaries and files for using `containerd` with Kubernetes. For example, the 1.2.4 version is available at https://storage.googleapis.com/cri-containerd-release/cri-containerd-1.2.4.linux-amd64.tar.gz.
+For each `containerd` release, we'll publish a release tarball specifically for Kubernetes named `cri-containerd-cni-${VERSION}-${OS}-${ARCH}.tar.gz`. This release tarball contains all required binaries and files for using `containerd` with Kubernetes. For example, the 1.4.3 version is available at https://github.com/containerd/containerd/releases/download/v1.4.3/cri-containerd-cni-1.4.3-linux-amd64.tar.gz.
 
-Note: The VERSION tag specified for the tarball corresponds to the `containerd` release tag, not a containerd/cri repository release tag. The `containerd` release includes the containerd/cri repository code through vendoring. The containerd/cri version of the containerd/cri code included in `containerd` is specified via a commit hash for containerd/cri in containerd/containerd/vendor.conf.
 ### Content
 As shown below, the release tarball contains:
-1) `containerd`, `containerd-shim`, `containerd-stress`, `containerd-release`, `ctr`: binaries for containerd.
-2) `runc`: runc binary.
-3) `crictl`, `crictl.yaml`: command line tools for CRI container runtime and its config file.
-4) `critest`: binary to run [CRI validation test](https://github.com/kubernetes-sigs/cri-tools/blob/master/docs/validation.md).
-5) `containerd.service`: Systemd unit for containerd.
-6) `/opt/containerd/cluster/`: scripts for `kube-up.sh`.
+
+- `containerd`, `containerd-shim`, `containerd-shim-runc-v1`, `containerd-shim-runc-v2`, `ctr`: binaries for containerd.
+- `runc`: runc binary.
+- `/opt/cni/bin`: binaries for [Container Network Interface](https://github.com/containernetworking/cni)
+- `crictl`, `crictl.yaml`: command line tools for CRI container runtime and its config file.
+- `critest`: binary to run [CRI validation test](https://github.com/kubernetes-sigs/cri-tools/blob/master/docs/validation.md).
+- `containerd.service`: Systemd unit for containerd.
+- `/opt/containerd/cluster/`: scripts for `kube-up.sh`.
+
 ```console
-$ tar -tf cri-containerd-1.1.0-rc.0.linux-amd64.tar.gz
-./
-./opt
-./opt/containerd
-./opt/containerd/cluster
-./opt/containerd/cluster/gce
-./opt/containerd/cluster/gce/cloud-init
-./opt/containerd/cluster/gce/cloud-init/node.yaml
-./opt/containerd/cluster/gce/cloud-init/master.yaml
-./opt/containerd/cluster/gce/configure.sh
-./opt/containerd/cluster/gce/env
-./opt/containerd/cluster/version
-./opt/containerd/cluster/health-monitor.sh
-./usr
-./usr/local
-./usr/local/sbin
-./usr/local/sbin/runc
-./usr/local/bin
-./usr/local/bin/crictl
-./usr/local/bin/containerd
-./usr/local/bin/containerd-stress
-./usr/local/bin/critest
-./usr/local/bin/containerd-release
-./usr/local/bin/containerd-shim
-./usr/local/bin/ctr
-./etc
-./etc/systemd
-./etc/systemd/system
-./etc/systemd/system/containerd.service
-./etc/crictl.yaml
+$ tar -tf cri-containerd-cni-1.4.3-linux-amd64.tar.gz
+etc/
+etc/cni/
+etc/cni/net.d/
+etc/cni/net.d/10-containerd-net.conflist
+etc/crictl.yaml
+etc/systemd/
+etc/systemd/system/
+etc/systemd/system/containerd.service
+usr/
+usr/local/
+usr/local/bin/
+usr/local/bin/containerd-shim-runc-v2
+usr/local/bin/ctr
+usr/local/bin/containerd-shim
+usr/local/bin/containerd-shim-runc-v1
+usr/local/bin/crictl
+usr/local/bin/critest
+usr/local/bin/containerd
+usr/local/sbin/
+usr/local/sbin/runc
+opt/
+opt/cni/
+opt/cni/bin/
+opt/cni/bin/vlan
+opt/cni/bin/host-local
+opt/cni/bin/flannel
+opt/cni/bin/bridge
+opt/cni/bin/host-device
+opt/cni/bin/tuning
+opt/cni/bin/firewall
+opt/cni/bin/bandwidth
+opt/cni/bin/ipvlan
+opt/cni/bin/sbr
+opt/cni/bin/dhcp
+opt/cni/bin/portmap
+opt/cni/bin/ptp
+opt/cni/bin/static
+opt/cni/bin/macvlan
+opt/cni/bin/loopback
+opt/containerd/
+opt/containerd/cluster/
+opt/containerd/cluster/version
+opt/containerd/cluster/gce/
+opt/containerd/cluster/gce/cni.template
+opt/containerd/cluster/gce/configure.sh
+opt/containerd/cluster/gce/cloud-init/
+opt/containerd/cluster/gce/cloud-init/master.yaml
+opt/containerd/cluster/gce/cloud-init/node.yaml
+opt/containerd/cluster/gce/env
 ```
+
 ### Binary Information
 Information about the binaries in the release tarball:
 
@@ -62,7 +86,7 @@ If you have other requirements for the binaries, e.g. another architecture suppo
 
 ### Download
 
-The release tarball could be downloaded from the release GCS bucket https://storage.googleapis.com/cri-containerd-release/.
+The release tarball could be downloaded from the release page https://github.com/containerd/containerd/releases.
 
 ## Step 0: Install Dependent Libraries
 Install required library for seccomp.
@@ -75,18 +99,18 @@ Note that:
 ## Step 1: Download Release Tarball
 Download release tarball for the `containerd` version you want to install from the GCS bucket.
 ```bash
-wget https://storage.googleapis.com/cri-containerd-release/cri-containerd-${VERSION}.linux-amd64.tar.gz
+wget https://github.com/containerd/containerd/releases/download/v${VERSION}/cri-containerd-cni-${VERSION}-linux-amd64.tar.gz
 ```
 Validate checksum of the release tarball:
 ```bash
-sha256sum cri-containerd-${VERSION}.linux-amd64.tar.gz
-curl https://storage.googleapis.com/cri-containerd-release/cri-containerd-${VERSION}.linux-amd64.tar.gz.sha256
-# Compare to make sure the 2 checksums are the same.
+wget https://github.com/containerd/containerd/releases/download/v${VERSION}/cri-containerd-cni-${VERSION}-linux-amd64.tar.gz.sha256sum
+sha256sum --check cri-containerd-cni-${VERSION}-linux-amd64.tar.gz.sha256sum
 ```
 ## Step 2: Install Containerd
 If you are using systemd, just simply unpack the tarball to the root directory:
 ```bash
-sudo tar --no-overwrite-dir -C / -xzf cri-containerd-${VERSION}.linux-amd64.tar.gz
+sudo tar --no-overwrite-dir -C / -xzf cri-containerd-cni-${VERSION}-linux-amd64.tar.gz
+sudo systemctl daemon-reload
 sudo systemctl start containerd
 ```
 If you are not using systemd, please unpack all binaries into a directory in your `PATH`, and start `containerd` as monitored long running services with the service manager you are using e.g. `supervisord`, `upstart` etc.
diff --git a/docs/cri/kube-up.md b/docs/cri/kube-up.md
@@ -7,11 +7,11 @@ export KUBE_CONTAINER_RUNTIME=containerd
 ```
 Follow these instructions [here](https://kubernetes.io/docs/setup/turnkey/gce/) to create a production quality Kubernetes cluster on GCE.
 ## Download CRI-Containerd Release Tarball
-To download release tarball, see [step 1](./installation.md#step-1-download-cri-containerd-release-tarball) in installation.md.
+To download release tarball, see [step 1](./installation.md#step-1-download-release-tarball) in installation.md.
 
 Unpack release tarball to any directory, using `${CRI_CONTAINERD_PATH}` to indicate the directory in the doc:
 ```bash
-tar -C ${CRI_CONTAINERD_PATH} -xzf cri-containerd-${VERSION}.linux-amd64.tar.gz
+tar -C ${CRI_CONTAINERD_PATH} -xzf cri-containerd-cni-${VERSION}-linux-amd64.tar.gz
 ```
 ## Set Environment Variables for CRI-Containerd
 ```bash
diff --git a/docs/cri/release.md b/docs/cri/release.md
