summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorIan Lewis <ianlewis@google.com>2020-09-02 19:37:06 -0700
committerAndrei Vagin <avagin@gmail.com>2020-09-09 17:53:10 -0700
commitd128abc269777db80a6debd21fddde68927639a1 (patch)
treea82124ed791606c3781acf7fd643a8d12821188b
parent6ff4234587a7509db17262c7a64db17daee12806 (diff)
Update version in cni tutorial
Update the cniVersion used in the CNI tutorial so that it works with containerd 1.2. Containerd 1.2 includes a version of the cri plugin (release/1.2) that, in turn, includes a version of the cni library (0.6.0) that only supports up to 0.3.1. https://github.com/containernetworking/cni/blob/v0.6.0/pkg/version/version.go#L38 PiperOrigin-RevId: 329837188
-rw-r--r--g3doc/user_guide/tutorials/cni.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/g3doc/user_guide/tutorials/cni.md b/g3doc/user_guide/tutorials/cni.md
index ce2fd09a8..a3507c25b 100644
--- a/g3doc/user_guide/tutorials/cni.md
+++ b/g3doc/user_guide/tutorials/cni.md
@@ -47,7 +47,7 @@ sudo mkdir -p /etc/cni/net.d
sudo sh -c 'cat > /etc/cni/net.d/10-bridge.conf << EOF
{
- "cniVersion": "0.4.0",
+ "cniVersion": "0.3.1",
"name": "mynet",
"type": "bridge",
"bridge": "cni0",
@@ -65,7 +65,7 @@ EOF'
sudo sh -c 'cat > /etc/cni/net.d/99-loopback.conf << EOF
{
- "cniVersion": "0.4.0",
+ "cniVersion": "0.3.1",
"name": "lo",
"type": "loopback"
}