X Tutup
Skip to content

Commit 91dc69e

Browse files
zhsjzhsj
committed
docs: point cri release tarball to github release page
Signed-off-by: Shengjing Zhu <zhsj@debian.org>
1 parent 602af6f commit 91dc69e

File tree

6 files changed

+74
-78
lines changed

6 files changed

+74
-78
lines changed

‎README.md‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -231,8 +231,7 @@ Please see [RELEASES.md](RELEASES.md) for details on versioning and stability
231231
of containerd components.
232232

233233
Downloadable 64-bit Intel/AMD binaries of all official releases are available on
234-
our [releases page](https://github.com/containerd/containerd/releases), as well as
235-
auto-published to the [cri-containerd-release storage bucket](https://console.cloud.google.com/storage/browser/cri-containerd-release?pli=1).
234+
our [releases page](https://github.com/containerd/containerd/releases).
236235

237236
For other architectures and distribution support, you will find that many
238237
Linux distributions package their own containerd and provide it across several
@@ -262,7 +261,7 @@ loaded for the user's shell environment.
262261

263262
`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.
264263

265-
![cri](./docs/cri.png)
264+
![cri](./docs/cri/cri.png)
266265

267266
#### CRI Status
268267

@@ -286,7 +285,7 @@ A Kubernetes incubator project, [cri-tools](https://github.com/kubernetes-sigs/c
286285
#### CRI Guides
287286
* [Bringing up a Production Quality Cluster on GCE](docs/cri/kube-up.md)
288287
* [Installing with Ansible and Kubeadm](contrib/ansible/README.md)
289-
* [For Non-Ansible Users, Preforming a Custom Installation Using the Release Tarball and Kubeadm](docs/installation.md)
288+
* [For Non-Ansible Users, Preforming a Custom Installation Using the Release Tarball and Kubeadm](docs/cri/installation.md)
290289
* [CRI Plugin Testing Guide](./docs/cri/testing.md)
291290
* [Debugging Pods, Containers, and Images with `crictl`](./docs/cri/crictl.md)
292291
* [Configuring `cri` Plugins](./docs/cri/config.md)

‎contrib/ansible/tasks/binaries.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
- name: "Get Containerd"
33
unarchive:
4-
src: "https://storage.googleapis.com/cri-containerd-release/cri-containerd-{{ containerd_release_version }}.linux-amd64.tar.gz"
4+
src: "https://github.com/containerd/containerd/releases/download/v{{ containerd_release_version }}/cri-containerd-cni-{{ containerd_release_version }}-linux-amd64.tar.gz"
55
dest: "/"
66
remote_src: yes
77

docs/cri.png renamed to docs/cri/cri.png

File renamed without changes.

docs/installation.md renamed to docs/cri/installation.md

Lines changed: 68 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -4,50 +4,74 @@ This document provides the steps to install `containerd` and its dependencies wi
44
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.
55

66
*Note: You need to run the following steps on each node you are planning to use in your Kubernetes cluster.*
7+
78
## Release Tarball
8-
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.
9+
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.
910

10-
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.
1111
### Content
1212
As shown below, the release tarball contains:
13-
1) `containerd`, `containerd-shim`, `containerd-stress`, `containerd-release`, `ctr`: binaries for containerd.
14-
2) `runc`: runc binary.
15-
3) `crictl`, `crictl.yaml`: command line tools for CRI container runtime and its config file.
16-
4) `critest`: binary to run [CRI validation test](https://github.com/kubernetes-sigs/cri-tools/blob/master/docs/validation.md).
17-
5) `containerd.service`: Systemd unit for containerd.
18-
6) `/opt/containerd/cluster/`: scripts for `kube-up.sh`.
13+
14+
- `containerd`, `containerd-shim`, `containerd-shim-runc-v1`, `containerd-shim-runc-v2`, `ctr`: binaries for containerd.
15+
- `runc`: runc binary.
16+
- `/opt/cni/bin`: binaries for [Container Network Interface](https://github.com/containernetworking/cni)
17+
- `crictl`, `crictl.yaml`: command line tools for CRI container runtime and its config file.
18+
- `critest`: binary to run [CRI validation test](https://github.com/kubernetes-sigs/cri-tools/blob/master/docs/validation.md).
19+
- `containerd.service`: Systemd unit for containerd.
20+
- `/opt/containerd/cluster/`: scripts for `kube-up.sh`.
21+
1922
```console
20-
$ tar -tf cri-containerd-1.1.0-rc.0.linux-amd64.tar.gz
21-
./
22-
./opt
23-
./opt/containerd
24-
./opt/containerd/cluster
25-
./opt/containerd/cluster/gce
26-
./opt/containerd/cluster/gce/cloud-init
27-
./opt/containerd/cluster/gce/cloud-init/node.yaml
28-
./opt/containerd/cluster/gce/cloud-init/master.yaml
29-
./opt/containerd/cluster/gce/configure.sh
30-
./opt/containerd/cluster/gce/env
31-
./opt/containerd/cluster/version
32-
./opt/containerd/cluster/health-monitor.sh
33-
./usr
34-
./usr/local
35-
./usr/local/sbin
36-
./usr/local/sbin/runc
37-
./usr/local/bin
38-
./usr/local/bin/crictl
39-
./usr/local/bin/containerd
40-
./usr/local/bin/containerd-stress
41-
./usr/local/bin/critest
42-
./usr/local/bin/containerd-release
43-
./usr/local/bin/containerd-shim
44-
./usr/local/bin/ctr
45-
./etc
46-
./etc/systemd
47-
./etc/systemd/system
48-
./etc/systemd/system/containerd.service
49-
./etc/crictl.yaml
23+
$ tar -tf cri-containerd-cni-1.4.3-linux-amd64.tar.gz
24+
etc/
25+
etc/cni/
26+
etc/cni/net.d/
27+
etc/cni/net.d/10-containerd-net.conflist
28+
etc/crictl.yaml
29+
etc/systemd/
30+
etc/systemd/system/
31+
etc/systemd/system/containerd.service
32+
usr/
33+
usr/local/
34+
usr/local/bin/
35+
usr/local/bin/containerd-shim-runc-v2
36+
usr/local/bin/ctr
37+
usr/local/bin/containerd-shim
38+
usr/local/bin/containerd-shim-runc-v1
39+
usr/local/bin/crictl
40+
usr/local/bin/critest
41+
usr/local/bin/containerd
42+
usr/local/sbin/
43+
usr/local/sbin/runc
44+
opt/
45+
opt/cni/
46+
opt/cni/bin/
47+
opt/cni/bin/vlan
48+
opt/cni/bin/host-local
49+
opt/cni/bin/flannel
50+
opt/cni/bin/bridge
51+
opt/cni/bin/host-device
52+
opt/cni/bin/tuning
53+
opt/cni/bin/firewall
54+
opt/cni/bin/bandwidth
55+
opt/cni/bin/ipvlan
56+
opt/cni/bin/sbr
57+
opt/cni/bin/dhcp
58+
opt/cni/bin/portmap
59+
opt/cni/bin/ptp
60+
opt/cni/bin/static
61+
opt/cni/bin/macvlan
62+
opt/cni/bin/loopback
63+
opt/containerd/
64+
opt/containerd/cluster/
65+
opt/containerd/cluster/version
66+
opt/containerd/cluster/gce/
67+
opt/containerd/cluster/gce/cni.template
68+
opt/containerd/cluster/gce/configure.sh
69+
opt/containerd/cluster/gce/cloud-init/
70+
opt/containerd/cluster/gce/cloud-init/master.yaml
71+
opt/containerd/cluster/gce/cloud-init/node.yaml
72+
opt/containerd/cluster/gce/env
5073
```
74+
5175
### Binary Information
5276
Information about the binaries in the release tarball:
5377

@@ -62,7 +86,7 @@ If you have other requirements for the binaries, e.g. another architecture suppo
6286

6387
### Download
6488

65-
The release tarball could be downloaded from the release GCS bucket https://storage.googleapis.com/cri-containerd-release/.
89+
The release tarball could be downloaded from the release page https://github.com/containerd/containerd/releases.
6690

6791
## Step 0: Install Dependent Libraries
6892
Install required library for seccomp.
@@ -75,18 +99,18 @@ Note that:
7599
## Step 1: Download Release Tarball
76100
Download release tarball for the `containerd` version you want to install from the GCS bucket.
77101
```bash
78-
wget https://storage.googleapis.com/cri-containerd-release/cri-containerd-${VERSION}.linux-amd64.tar.gz
102+
wget https://github.com/containerd/containerd/releases/download/v${VERSION}/cri-containerd-cni-${VERSION}-linux-amd64.tar.gz
79103
```
80104
Validate checksum of the release tarball:
81105
```bash
82-
sha256sum cri-containerd-${VERSION}.linux-amd64.tar.gz
83-
curl https://storage.googleapis.com/cri-containerd-release/cri-containerd-${VERSION}.linux-amd64.tar.gz.sha256
84-
# Compare to make sure the 2 checksums are the same.
106+
wget https://github.com/containerd/containerd/releases/download/v${VERSION}/cri-containerd-cni-${VERSION}-linux-amd64.tar.gz.sha256sum
107+
sha256sum --check cri-containerd-cni-${VERSION}-linux-amd64.tar.gz.sha256sum
85108
```
86109
## Step 2: Install Containerd
87110
If you are using systemd, just simply unpack the tarball to the root directory:
88111
```bash
89-
sudo tar --no-overwrite-dir -C / -xzf cri-containerd-${VERSION}.linux-amd64.tar.gz
112+
sudo tar --no-overwrite-dir -C / -xzf cri-containerd-cni-${VERSION}-linux-amd64.tar.gz
113+
sudo systemctl daemon-reload
90114
sudo systemctl start containerd
91115
```
92116
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.

‎docs/cri/kube-up.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ export KUBE_CONTAINER_RUNTIME=containerd
77
```
88
Follow these instructions [here](https://kubernetes.io/docs/setup/turnkey/gce/) to create a production quality Kubernetes cluster on GCE.
99
## Download CRI-Containerd Release Tarball
10-
To download release tarball, see [step 1](./installation.md#step-1-download-cri-containerd-release-tarball) in installation.md.
10+
To download release tarball, see [step 1](./installation.md#step-1-download-release-tarball) in installation.md.
1111

1212
Unpack release tarball to any directory, using `${CRI_CONTAINERD_PATH}` to indicate the directory in the doc:
1313
```bash
14-
tar -C ${CRI_CONTAINERD_PATH} -xzf cri-containerd-${VERSION}.linux-amd64.tar.gz
14+
tar -C ${CRI_CONTAINERD_PATH} -xzf cri-containerd-cni-${VERSION}-linux-amd64.tar.gz
1515
```
1616
## Set Environment Variables for CRI-Containerd
1717
```bash

‎docs/cri/release.md‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)
X Tutup