From f19cd8ad67c8d5089983a5d8da339021cc6ec789 Mon Sep 17 00:00:00 2001 From: Mike Brown Date: Wed, 7 Feb 2018 13:47:23 -0600 Subject: [PATCH 1/2] update critools Signed-off-by: Mike Brown --- hack/install-deps.sh | 2 +- hack/versions | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hack/install-deps.sh b/hack/install-deps.sh index a14d386c0..c2cbb626e 100755 --- a/hack/install-deps.sh +++ b/hack/install-deps.sh @@ -178,7 +178,7 @@ ${sudo} sh -c "PATH=${PATH} make install -e DESTDIR=${CONTAINERD_DIR}" checkout_repo ${CRITOOL_PKG} ${CRITOOL_VERSION} cd ${GOPATH}/src/${CRITOOL_PKG} make crictl -${sudo} install -D -m 755 ${GOPATH}/bin/crictl ${CRICTL_DIR}/crictl +${sudo} make install-crictl -e BINDIR=${CRICTL_DIR} GOPATH=${GOPATH} ${sudo} mkdir -p ${CRICTL_CONFIG_DIR} ${sudo} bash -c 'cat >'${CRICTL_CONFIG_DIR}'/crictl.yaml < Date: Wed, 7 Feb 2018 17:09:01 -0600 Subject: [PATCH 2/2] change crictl sandboxes to pods; other references to sandboxes Signed-off-by: Mike Brown --- cluster/health-monitor.sh | 6 +++--- docs/crictl.md | 12 ++++++------ hack/cri-reset.sh | 12 ++++++------ pkg/server/instrumented_service.go | 2 +- pkg/server/restart.go | 8 ++++---- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/cluster/health-monitor.sh b/cluster/health-monitor.sh index f0e1ce873..b9a690f42 100755 --- a/cluster/health-monitor.sh +++ b/cluster/health-monitor.sh @@ -28,10 +28,10 @@ CHECK_PERIOD=${CHECK_PERIOD:-10} SLEEP_SECONDS=${SLEEP_SECONDS:-120} while true; do - # Use crictl sandboxes because it requires both containerd and + # Use crictl pods because it requires both containerd and # cri-containerd to be working. - if ! timeout ${COMMAND_TIMEOUT} ${CRICTL} sandboxes > /dev/null; then - echo "crictl sandboxes timeout!" + if ! timeout ${COMMAND_TIMEOUT} ${CRICTL} pods > /dev/null; then + echo "crictl pods timeout!" pkill containerd pkill cri-containerd # Wait for a while, as we don't want to kill it again before it is really up. diff --git a/docs/crictl.md b/docs/crictl.md index c0dc68b53..70a526f75 100644 --- a/docs/crictl.md +++ b/docs/crictl.md @@ -50,19 +50,19 @@ $ cat sandbox-config.json } } -$ crictl runs sandbox-config.json +$ crictl runp sandbox-config.json e1c83b0b8d481d4af8ba98d5f7812577fc175a37b10dc824335951f52addbb4e -$ crictl sandboxes -SANDBOX ID CREATED STATE NAME NAMESPACE ATTEMPT +$ crictl pods +PODSANDBOX ID CREATED STATE NAME NAMESPACE ATTEMPT e1c83b0b8d481 2 hours ago SANDBOX_READY nginx-sandbox default 1 $ crictl inspects e1c8 - ... displays information about the pod and the sandbox pause container. + ... displays information about the pod and the pod sandbox pause container. ``` * Note: As shown above, you may use truncated IDs if they are unique. * Other commands to manage the pod include `stops ID` to stop a running pod and -`rms ID` to remove a pod sandbox. +`rmp ID` to remove a pod sandbox. -## Create and Run a Container in a Sandbox (using a config file) +## Create and Run a Container in a Pod Sandbox (using a config file) ```console $ cat sandbox-config.json { diff --git a/hack/cri-reset.sh b/hack/cri-reset.sh index c1c93b600..f62578f01 100755 --- a/hack/cri-reset.sh +++ b/hack/cri-reset.sh @@ -29,14 +29,14 @@ crictl_rm_stopped_containers() { done } -crictl_stop_sandboxes() { - for x in $($CRICTL_CLI sandboxes | awk '{ print $1 }' | awk '{if(NR>1)print}') ;do +crictl_stop_pods() { + for x in $($CRICTL_CLI pods | awk '{ print $1 }' | awk '{if(NR>1)print}') ;do $CRICTL_CLI stops $x done } -crictl_rm_sandboxes() { - for x in $($CRICTL_CLI sandboxes | awk '{ print $1 }' | awk '{if(NR>1)print}') ;do +crictl_rm_pods() { + for x in $($CRICTL_CLI pods | awk '{ print $1 }' | awk '{if(NR>1)print}') ;do $CRICTL_CLI rms $x done } @@ -50,6 +50,6 @@ crictl_rm_images() { command -v crictl >/dev/null 2>&1 || { echo >&2 "crictl not installed. Install from https://github.com/kubernetes-incubator/cri-tools. Aborting."; exit 2; } crictl_stop_running_containers crictl_rm_stopped_containers -crictl_stop_sandboxes -crictl_rm_sandboxes +crictl_stop_pods +crictl_rm_pods crictl_rm_images diff --git a/pkg/server/instrumented_service.go b/pkg/server/instrumented_service.go index b7de2fe81..c9b8a5323 100644 --- a/pkg/server/instrumented_service.go +++ b/pkg/server/instrumented_service.go @@ -71,7 +71,7 @@ func (in *instrumentedService) ListPodSandbox(ctx context.Context, r *runtime.Li if err != nil { logrus.WithError(err).Error("ListPodSandbox failed") } else { - log.Tracef("ListPodSandbox returns sandboxes %+v", res.GetItems()) + log.Tracef("ListPodSandbox returns pod sandboxes %+v", res.GetItems()) } }() return in.c.ListPodSandbox(ctx, r) diff --git a/pkg/server/restart.go b/pkg/server/restart.go index ee8f471ec..42a833686 100644 --- a/pkg/server/restart.go +++ b/pkg/server/restart.go @@ -452,7 +452,7 @@ func cleanupOrphanedSandboxDirs(cntrs []containerd.Container, sandboxesRoot stri // Cleanup orphaned sandbox directories. dirs, err := ioutil.ReadDir(sandboxesRoot) if err != nil && !os.IsNotExist(err) { - return fmt.Errorf("failed to read sandboxes directory %q: %v", sandboxesRoot, err) + return fmt.Errorf("failed to read pod sandboxes directory %q: %v", sandboxesRoot, err) } cntrsMap := make(map[string]containerd.Container) for _, cntr := range cntrs { @@ -460,7 +460,7 @@ func cleanupOrphanedSandboxDirs(cntrs []containerd.Container, sandboxesRoot stri } for _, d := range dirs { if !d.IsDir() { - logrus.Warnf("Invalid file %q found in sandboxes directory", d.Name()) + logrus.Warnf("Invalid file %q found in pod sandboxes directory", d.Name()) continue } if _, ok := cntrsMap[d.Name()]; ok { @@ -469,9 +469,9 @@ func cleanupOrphanedSandboxDirs(cntrs []containerd.Container, sandboxesRoot stri } sandboxDir := filepath.Join(sandboxesRoot, d.Name()) if err := system.EnsureRemoveAll(sandboxDir); err != nil { - logrus.WithError(err).Warnf("Failed to remove sandbox directory %q", sandboxDir) + logrus.WithError(err).Warnf("Failed to remove pod sandbox directory %q", sandboxDir) } else { - logrus.Debugf("Cleanup orphaned sandbox directory %q", sandboxDir) + logrus.Debugf("Cleanup orphaned pod sandbox directory %q", sandboxDir) } } return nil