Merge pull request #602 from mikebrow/critools-install-minor-update

update critools

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

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 <<EOF
 runtime-endpoint: /var/run/cri-containerd.sock

hack/versions

@@ -2,5 +2,5 @@ RUNC_VERSION=9f9c96235cc97674e935002fc3d78361b696a69e
 CNI_VERSION=v0.6.0
 CONTAINERD_VERSION=f12ba2407e328c98f8be5eacbb9c510b073dd4c0
 CONTAINERD_REPO=
-CRITOOL_VERSION=v1.0.0-alpha.0
+CRITOOL_VERSION=ded07bb08aa23492fa0233bb3af8c4629875f286
 KUBERNETES_VERSION=v1.9.0