Remove 10-containerd-net.conflist from cri-containerd-cni release tarball.
Signed-off-by: Lantao Liu <lantaol@google.com>
This commit is contained in:
@@ -20,7 +20,6 @@ set -o pipefail
|
||||
|
||||
source $(dirname "${BASH_SOURCE[0]}")/utils.sh
|
||||
CNI_DIR=${DESTDIR}/opt/cni
|
||||
CNI_CONFIG_DIR=${DESTDIR}/etc/cni/net.d
|
||||
CNI_PKG=github.com/containernetworking/plugins
|
||||
|
||||
# Create a temporary GOPATH for cni installation.
|
||||
@@ -34,33 +33,6 @@ cd ${GOPATH}/src/${CNI_PKG}
|
||||
FASTBUILD=true ./build.sh
|
||||
${SUDO} mkdir -p ${CNI_DIR}
|
||||
${SUDO} cp -r ./bin ${CNI_DIR}
|
||||
${SUDO} mkdir -p ${CNI_CONFIG_DIR}
|
||||
${SUDO} bash -c 'cat >'${CNI_CONFIG_DIR}'/10-containerd-net.conflist <<EOF
|
||||
{
|
||||
"cniVersion": "0.3.1",
|
||||
"name": "containerd-net",
|
||||
"plugins": [
|
||||
{
|
||||
"type": "bridge",
|
||||
"bridge": "cni0",
|
||||
"isGateway": true,
|
||||
"ipMasq": true,
|
||||
"promiscMode": true,
|
||||
"ipam": {
|
||||
"type": "host-local",
|
||||
"subnet": "10.88.0.0/16",
|
||||
"routes": [
|
||||
{ "dst": "0.0.0.0/0" }
|
||||
]
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "portmap",
|
||||
"capabilities": {"portMappings": true}
|
||||
}
|
||||
]
|
||||
}
|
||||
EOF'
|
||||
|
||||
# Clean the tmp GOPATH dir.
|
||||
rm -rf ${TMPGOPATH}
|
||||
|
||||
Reference in New Issue
Block a user