Incorporating PR feedback

Specifically adding configuration parameters with reasonable defaults,
e.g.
  $ MEMORY=10240 DISK_SIZE=30g ./etc/scripts/install-on-minikube.sh

Author: jcrossley3

etc/scripts/install-on-minikube.sh

@@ -4,27 +4,34 @@
 # thereby guaranteeing (hopefully) a clean environment upon successful
 # completion.
 
-if minikube status | grep "host: Running" >/dev/null; then
+if minikube status 2>&1 | grep -E "^E[0-9]{4}"; then
+  echo "minikube is confused, check for conflicting vm's, e.g. minishift"
+  exit -1
+fi
+if minikube status | head -1 | grep "Running" >/dev/null; then
   echo "Please stop your running minikube to acknowledge this script will destroy it."
   exit 1
 fi
 
 set -x
 
+KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.11.5}
+MEMORY=${MEMORY:-8192}
+CPUS=${CPUS:-4}
+DISK_SIZE=${DISK_SIZE:-50g}
+
 # blow away everything in the knative profile
 minikube delete --profile knative
 
 # configure knative profile
 minikube profile knative
-minikube config set kubernetes-version v1.11.5 -p knative
-minikube config set memory 10240 -p knative
-minikube config set cpus 4 -p knative
-minikube config set disk-size 50g -p knative
+minikube config set kubernetes-version ${KUBERNETES_VERSION}
+minikube config set memory ${MEMORY}
+minikube config set cpus ${CPUS}
+minikube config set disk-size ${DISK_SIZE}
 
 # Start minikube
 minikube start -p knative --extra-config=apiserver.enable-admission-plugins="LimitRanger,NamespaceExists,NamespaceLifecycle,ResourceQuota,ServiceAccount,DefaultStorageClass,MutatingAdmissionWebhook"
 
-#oc login -u admin -p admin
-
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
 "$DIR/install.sh" -q

etc/scripts/install-on-minishift.sh

@@ -4,22 +4,27 @@
 # thereby guaranteeing (hopefully) a clean environment upon successful
 # completion.
 
-if minishift status | grep "Minishift:  Running" >/dev/null; then
+if minishift status | head -1 | grep "Running" >/dev/null; then
   echo "Please stop your running minishift to acknowledge this script will destroy it."
   exit 1
 fi
 
 set -x
 
+OPENSHIFT_VERSION=${OPENSHIFT_VERSION:-v3.11.0}
+MEMORY=${MEMORY:-10GB}
+CPUS=${CPUS:-4}
+DISK_SIZE=${DISK_SIZE:-50g}
+
 # blow away everything in the knative profile
 minishift profile delete knative --force
 
 # configure knative profile
 minishift profile set knative
-minishift config set openshift-version v3.11.0
-minishift config set memory 10GB
-minishift config set cpus 4
-minishift config set disk-size 50g
+minishift config set openshift-version ${OPENSHIFT_VERSION}
+minishift config set memory ${MEMORY}
+minishift config set cpus ${CPUS}
+minishift config set disk-size ${DISK_SIZE}
 minishift config set image-caching true
 minishift addons enable admin-user
 

etc/scripts/install.sh

@@ -52,7 +52,6 @@ if oc get ns openshift 2>/dev/null; then
   oc adm policy add-scc-to-user anyuid -z default
 else
   oc create namespace myproject
-  oc label namespace myproject istio-injection=enabled
   oc project myproject
 fi
 

etc/scripts/installation-functions.sh

@@ -49,9 +49,9 @@ function check_operatorgroups {
 
 function enable_admission_webhooks {
   if check_openshift_4; then
-    echo "Detected OpenShift 4 - skipping enabling admission webhooks."
+    echo "Detected OpenShift 4 - skipping enabling admission webhooks"
   elif check_minikube; then
-    echo "Detected minikube - skipping enabling admission webhooks."
+    echo "Detected minikube - assuming admission webhooks enabled via --extra-config"
   elif check_minishift; then
     echo "Detected minishift - checking if admission webhooks are enabled."
     if ! minishift openshift config view --target=kube | grep ValidatingAdmissionWebhook >/dev/null; then
@@ -165,7 +165,6 @@ function install_istio {
   if check_minikube; then
     echo "Detected minikube - incompatible with Maistra operator, so installing upstream istio."
     oc apply -f "https://github.com/knative/serving/releases/download/${KNATIVE_SERVING_VERSION}/istio.yaml"
-    oc label namespace default istio-injection=enabled
     wait_for_all_pods istio-system
   else
     oc create ns istio-operator