From ee4c5cee4b0abe1a1d55bd2249be0bd038c2ade5 Mon Sep 17 00:00:00 2001
From: kaczyns <kaczynsk@us.ibm.com>
Date: Fri, 4 Oct 2019 16:05:46 -0400
Subject: [PATCH] Remove the kappnav prompt from the install script

---
 scripts/README.md                      |  2 ++
 scripts/install-kabanero-foundation.sh | 11 ++++-------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/scripts/README.md b/scripts/README.md
index 439faf7..ffa5d2f 100644
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -15,6 +15,8 @@ Retrieve the [installation scripts from our documentation repository](https://gi
 
 ## Installation
 
+Review the installation script for any optional components that you wish to enable.  Components can be enabled by passing the appropriate environment variable to the script, or by editing the script.
+
 As a `cluster-admin`, execute the installation script, replacing `my.openshift.master.default.subdomain` with your subdomain:
 ```
 openshift_master_default_subdomain=<my.openshift.master.default.subdomain> ./install-kabanero-foundation.sh
diff --git a/scripts/install-kabanero-foundation.sh b/scripts/install-kabanero-foundation.sh
index fdc6b22..7571759 100755
--- a/scripts/install-kabanero-foundation.sh
+++ b/scripts/install-kabanero-foundation.sh
@@ -9,6 +9,9 @@ set -Eeox pipefail
 # Branch/Release of Kabanero #
 KABANERO_BRANCH="${KABANERO_BRANCH:-0.2.0-rc.1}"
 
+# Optional components (yes/no)
+ENABLE_KAPPNAV="${ENABLE_KAPPNAV:-no}"
+
 # Kserving domain matches openshift_master_default_subdomain #
 # openshift_master_default_subdomain="${openshift_master_default_subdomain:-my.openshift.master.default.subdomain}"
 if [ -z "$openshift_master_default_subdomain" ]
@@ -17,12 +20,6 @@ then
   read openshift_master_default_subdomain
 fi
 
-# Query for optional components
-if [ -z "$enable_kappnav" ]
-then
-  echo "Would you like to configure KAppNav (yes/no)?"
-  read enable_kappnav
-fi
 
 ### Istio ###
 
@@ -133,7 +130,7 @@ do
 done
 
 # Install KAppNav if selected
-if [ "$enable_kappnav" == "yes" ]
+if [ "$ENABLE_KAPPNAV" == "yes" ]
 then
   oc apply -f https://raw.githubusercontent.com/kabanero-io/kabanero-operator/${KABANERO_BRANCH}/deploy/optional.yaml --selector=kabanero.io/component=kappnav
 fi