github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #586 from Random-Liu/add-ctrcri

Browse Source 
Add a separate CLI for cri-containerd `ctrcri`.
This commit is contained in:
Lantao Liu
2018-02-02 10:43:15 -08:00
committed by GitHub
parent 2d61bdbb0a 1f1e03e001
commit 34dd28ab32
7 changed files with 107 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/gce/env
View File

@@ -13,7 +13,7 @@ export KUBE_MASTER_EXTRA_METADATA="user-data=${GCE_DIR}/cloud-init/master.yaml,c
export KUBE_NODE_EXTRA_METADATA="user-data=${GCE_DIR}/cloud-init/node.yaml,cri-containerd-configure-sh=${GCE_DIR}/configure.sh,version=${version_file}"
export KUBE_CONTAINER_RUNTIME="remote"
export KUBE_CONTAINER_RUNTIME_ENDPOINT="/var/run/cri-containerd.sock"
export KUBE_LOAD_IMAGE_COMMAND="/home/cri-containerd/usr/local/bin/cri-containerd load"
export KUBE_LOAD_IMAGE_COMMAND="/home/cri-containerd/usr/local/bin/ctrcri load"
export NETWORK_POLICY_PROVIDER="calico"
export NON_MASQUERADE_CIDR="0.0.0.0/0"
export KUBE_KUBELET_ARGS="--runtime-cgroups=/runtime"