From 5edad74e8a62353af5ba0dc735c4d12e705d3ad1 Mon Sep 17 00:00:00 2001
From: irbekrm <irbekrm@gmail.com>
Date: Thu, 22 Jul 2021 20:27:38 +0100
Subject: [PATCH] Ensure jq is available

Signed-off-by: irbekrm <irbekrm@gmail.com>
---
 devel/addon/ingressnginx/install.sh | 6 ++++--
 devel/lib/lib.sh                    | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/devel/addon/ingressnginx/install.sh b/devel/addon/ingressnginx/install.sh
index f54f54b99..31a60a661 100755
--- a/devel/addon/ingressnginx/install.sh
+++ b/devel/addon/ingressnginx/install.sh
@@ -36,10 +36,12 @@ fi
 RELEASE_NAME="${RELEASE_NAME:-ingress-nginx}"
 IMAGE_TAG=""
 
-# Require helm available on PATH
+# Require helm, kubectl and jq available on PATH
 check_tool kubectl
 check_tool helm
-check_tool jq
+bazel build //hack/bin:jq
+bindir="$(bazel info bazel-bin)"
+export PATH="${bindir}/hack/bin/:$PATH"
 
 # We need to install different versions of Ingress depending on which version of
 # Kubernetes we are running as the NGINX Ingress controller does not have a
diff --git a/devel/lib/lib.sh b/devel/lib/lib.sh
index 0f010ffdc..724fd55ec 100644
--- a/devel/lib/lib.sh
+++ b/devel/lib/lib.sh
@@ -39,7 +39,7 @@ export INGRESS_IP="${SERVICE_IP_PREFIX}.15"
 # versions of the tools required for development
 setup_tools() {
   check_bazel
-  bazel build //hack/bin:helm //hack/bin:kind //hack/bin:kubectl //devel/bin:ginkgo
+  bazel build //hack/bin:helm //hack/bin:kind //hack/bin:kubectl //hack/bin:jq //devel/bin:ginkgo
   if [[ "$IS_OPENSHIFT" == "true" ]] ; then
     bazel build //hack/bin:oc3
   fi
@@ -47,6 +47,7 @@ setup_tools() {
   export HELM="${bindir}/hack/bin/helm"
   export KIND="${bindir}/hack/bin/kind"
   export OC3="${bindir}/hack/bin/oc3"
+  export JQ="${bindir}/hack/bin/jq"
   export KUBECTL="${bindir}/hack/bin/kubectl"
   export KUSTOMIZE="${bindir}/hack/bin/kustomize"
   export GINKGO="${bindir}/devel/bin/ginkgo"