From e99a78edffca5fa5a93ad29fbcb3aba6020836a6 Mon Sep 17 00:00:00 2001
From: Antonio Murdaca <runcom@redhat.com>
Date: Sat, 11 Nov 2017 12:05:36 +0100
Subject: [PATCH] *: add crictl.yaml

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
---
 Dockerfile                                   | 2 +-
 Makefile                                     | 2 ++
 contrib/test/integration/build/cri-tools.yml | 2 +-
 crictl.yaml                                  | 1 +
 test/helpers.bash                            | 4 ++--
 5 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 crictl.yaml

diff --git a/Dockerfile b/Dockerfile
index 86ea8d7b..6f170b26 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -97,7 +97,7 @@ RUN set -x \
        && rm -rf "$GOPATH"
 
 # Install crictl
-ENV CRICTL_COMMIT 9ff5e8f78a4182ab8d5ba9bcccdda5f338600eab
+ENV CRICTL_COMMIT b42fc3f364dd48f649d55926c34492beeb9b2e99
 RUN set -x \
        && export GOPATH="$(mktemp -d)" \
        && git clone https://github.com/kubernetes-incubator/cri-tools.git "$GOPATH/src/github.com/kubernetes-incubator/cri-tools" \
diff --git a/Makefile b/Makefile
index 5c669831..c458fd37 100644
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,7 @@ MANDIR ?= ${PREFIX}/share/man
 ETCDIR ?= ${DESTDIR}/etc
 ETCDIR_CRIO ?= ${ETCDIR}/crio
 BUILDTAGS ?= seccomp $(shell hack/btrfs_tag.sh) $(shell hack/libdm_tag.sh) $(shell hack/btrfs_installed_tag.sh) $(shell hack/ostree_tag.sh) $(shell hack/selinux_tag.sh)
+CRICTL_CONFIG_DIR=${DESTDIR}/etc
 
 BASHINSTALLDIR=${PREFIX}/share/bash-completion/completions
 OCIUMOUNTINSTALLDIR=$(PREFIX)/share/oci-umount/oci-umount.d
@@ -152,6 +153,7 @@ install.config:
 	install ${SELINUXOPT} -D -m 644 crio.conf $(ETCDIR_CRIO)/crio.conf
 	install ${SELINUXOPT} -D -m 644 seccomp.json $(ETCDIR_CRIO)/seccomp.json
 	install ${SELINUXOPT} -D -m 644 crio-umount.conf $(OCIUMOUNTINSTALLDIR)/crio-umount.conf
+	install ${SELINUXOPT} -D -m 644 crictl.yaml $(CRICTL_CONFIG_DIR)
 
 install.completions:
 	install ${SELINUXOPT} -d -m 755 ${BASHINSTALLDIR}
diff --git a/contrib/test/integration/build/cri-tools.yml b/contrib/test/integration/build/cri-tools.yml
index 9a117f3c..5d748112 100644
--- a/contrib/test/integration/build/cri-tools.yml
+++ b/contrib/test/integration/build/cri-tools.yml
@@ -4,7 +4,7 @@
   git:
     repo: "https://github.com/kubernetes-incubator/cri-tools.git"
     dest: "{{ ansible_env.GOPATH }}/src/github.com/kubernetes-incubator/cri-tools"
-    version: "9ff5e8f78a4182ab8d5ba9bcccdda5f338600eab"
+    version: "b42fc3f364dd48f649d55926c34492beeb9b2e99"
 
 - name: install crictl
   command: "/usr/bin/go install github.com/kubernetes-incubator/cri-tools/cmd/crictl"
diff --git a/crictl.yaml b/crictl.yaml
new file mode 100644
index 00000000..841cbe47
--- /dev/null
+++ b/crictl.yaml
@@ -0,0 +1 @@
+runtime-endpoint: /var/run/crio.sock
diff --git a/test/helpers.bash b/test/helpers.bash
index c71db7bc..21488e1f 100644
--- a/test/helpers.bash
+++ b/test/helpers.bash
@@ -207,9 +207,9 @@ function retry() {
 	false
 }
 
-# Waits until the given crio becomes reachable.
+# Waits until crio becomes reachable.
 function wait_until_reachable() {
-	retry 15 1 crictl status
+	retry 15 1 crictl info
 }
 
 # Start crio.