From 19e2b20c13b23f737cd1ec8f68fedaf8095f9461 Mon Sep 17 00:00:00 2001 From: Lantao Liu Date: Fri, 12 Apr 2019 14:40:05 -0700 Subject: [PATCH] Use ctr images import. Signed-off-by: Lantao Liu --- cluster/gce/env | 2 +- docs/crictl.md | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cluster/gce/env b/cluster/gce/env index 613516c5e..3e3bb01f9 100644 --- a/cluster/gce/env +++ b/cluster/gce/env @@ -13,7 +13,7 @@ export KUBE_NODE_EXTRA_METADATA="user-data=${GCE_DIR}/cloud-init/node.yaml,conta export KUBE_CONTAINER_RUNTIME="remote" export KUBE_CONTAINER_RUNTIME_ENDPOINT="unix:///run/containerd/containerd.sock" export KUBE_CONTAINER_RUNTIME_NAME=containerd -export KUBE_LOAD_IMAGE_COMMAND="/home/containerd/usr/local/bin/ctr cri load" +export KUBE_LOAD_IMAGE_COMMAND="/home/containerd/usr/local/bin/ctr -n=k8s.io images import" export NETWORK_PROVIDER="" export NON_MASQUERADE_CIDR="0.0.0.0/0" export KUBE_KUBELET_EXTRA_ARGS="--runtime-cgroups=/system.slice/containerd.service" diff --git a/docs/crictl.md b/docs/crictl.md index db81dca86..c09299a72 100644 --- a/docs/crictl.md +++ b/docs/crictl.md @@ -54,7 +54,8 @@ $ docker save k8s.gcr.io/pause-amd64:3.1 -o pause.tar Then use [`ctr`](https://github.com/containerd/containerd/blob/master/docs/man/ctr.1.md) to load the container image into the container runtime: ```console -$ sudo ctr cri load pause.tar +# The cri plugin uses the "k8s.io" containerd namespace. +$ sudo ctr -n=k8s.io images import pause.tar Loaded image: k8s.gcr.io/pause-amd64:3.1 ``` List images and inspect the pause image: