Merge pull request #20 from openshift-cloud-functions/minikube

jcrossley3 · web-flow · commit f6e453f83191 · 2019-02-21T12:19:20.000-05:00
Install our knative operators on minikube
diff --git a/etc/scripts/install-on-minikube.sh b/etc/scripts/install-on-minikube.sh
@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+
+# WARNING: this totally destroys and recreates your `knative` profile,
+# thereby guaranteeing (hopefully) a clean environment upon successful
+# completion.
+
+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 ${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"
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+"$DIR/install.sh" -q
diff --git a/etc/scripts/install-on-minishift.sh b/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
 
diff --git a/etc/scripts/install.sh b/etc/scripts/install.sh
@@ -1,16 +1,19 @@
 #!/usr/bin/env bash
 
-# Installs OLM first, and then istio and knative using OLM operators
+# Attempts to install istio, knative, and OLM, ideally not in that order.
 
 if [ "$1" != "-q" ]; then
   echo
-  echo "  WARNING: This script will blindly attempt to install OLM, istio, and knative"
-  echo "  on your OpenShift cluster, so if any are already there, hijinks may ensue."
+  echo "  This script will attempt to install istio, knative, and OLM in your "
+  echo "  Kubernetes/OpenShift cluster."
+  echo
+  echo "  If targeting OpenShift, a recent version of 'oc' should be available"
+  echo "  in your PATH. Otherwise, 'kubectl' will be used."
   echo
   echo "  If using OpenShift 3.11 and your cluster isn't minishift, ensure"
   echo "  \$KUBE_SSH_KEY and \$KUBE_SSH_USER are set"
   echo
-  echo "  Pass -q to disable this warning"
+  echo "  Pass -q to disable this prompt"
   echo
   read -p "Enter to continue or Ctrl-C to exit: "
 fi
@@ -35,18 +38,22 @@ wait_for_all_pods knative-serving
 # skip tag resolving for internal registry
 # OpenShift 3 and 4 place the registry in different locations, hence
 # the two hostnames here
-oc -n knative-serving get cm config-controller -oyaml | sed "s/\(^ *registriesSkippingTagResolving.*$\)/\1,docker-registry.default.svc:5000,image-registry.openshift-image-registry.svc:5000/" | oc apply -f -
-
-# Add Golang imagestreams to be able to build go based images
-oc import-image -n openshift golang --from=centos/go-toolset-7-centos7 --confirm
-oc import-image -n openshift golang:1.11 --from=centos/go-toolset-7-centos7 --confirm
-
-# these perms are required by istio
-if ! oc project myproject 2>/dev/null; then
-  oc new-project myproject
+$CMD -n knative-serving get cm config-controller -oyaml | sed "s/\(^ *registriesSkippingTagResolving.*$\)/\1,docker-registry.default.svc:5000,image-registry.openshift-image-registry.svc:5000/" | oc apply -f -
+
+if $CMD get ns openshift 2>/dev/null; then
+  # Add Golang imagestreams to be able to build go based images
+  oc import-image -n openshift golang --from=centos/go-toolset-7-centos7 --confirm
+  oc import-image -n openshift golang:1.11 --from=centos/go-toolset-7-centos7 --confirm
+
+  if ! oc project myproject 2>/dev/null; then
+    oc new-project myproject
+  fi
+  # these perms are required by istio
+  oc adm policy add-scc-to-user privileged -z default
+  oc adm policy add-scc-to-user anyuid -z default
+else
+  $CMD create namespace myproject
 fi
-oc adm policy add-scc-to-user privileged -z default
-oc adm policy add-scc-to-user anyuid -z default
 
-# show all the pods
-oc get pods --all-namespaces
+# show all the running pods
+$CMD get pods --all-namespaces
diff --git a/etc/scripts/installation-functions.sh b/etc/scripts/installation-functions.sh
@@ -11,6 +11,11 @@ KNATIVE_EVENTING_VERSION=v0.3.0
 
 INSTALL_SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
 
+CMD=kubectl
+if hash oc 2>/dev/null; then
+  CMD=$_
+fi
+
 # Loops until duration (car) is exceeded or command (cdr) returns non-zero
 function timeout() {
   SECONDS=0; TIMEOUT=$1; shift
@@ -22,24 +27,44 @@ function timeout() {
 
 # Waits for all pods in the given namespace to complete successfully.
 function wait_for_all_pods {
-  timeout 300 "oc get pods -n $1 2>&1 | grep -v -E '(Running|Completed|STATUS)'"
+  timeout 300 "$CMD get pods -n $1 2>&1 | grep -v -E '(Running|Completed|STATUS)'"
+}
+
+function show_server {
+  if [ "$CMD" = "oc" ]; then
+    $CMD whoami --show-server
+  else
+    $CMD cluster-info | head -1
+  fi
 }
 
 function check_minishift {
-  (hash minishift && oc whoami --show-server | grep "$(minishift ip)") >/dev/null 2>&1
+  (hash minishift &&
+     minishift ip | grep -oE "\b([0-9]{1,3}\.){3}[0-9]{1,3}\b" &&
+     show_server | grep "$(minishift ip)"
+  ) >/dev/null 2>&1
+}
+
+function check_minikube {
+  (hash minikube &&
+     minikube ip | grep -oE "\b([0-9]{1,3}\.){3}[0-9]{1,3}\b" &&
+     show_server | grep "$(minikube ip)"
+  ) >/dev/null 2>&1
 }
 
 function check_openshift_4 {
-  oc api-resources | grep machineconfigs | grep machineconfiguration.openshift.io > /dev/null 2>&1
+  $CMD api-resources | grep machineconfigs | grep machineconfiguration.openshift.io > /dev/null 2>&1
 }
 
 function check_operatorgroups {
-  oc get crd operatorgroups.operators.coreos.com >/dev/null 2>&1
+  $CMD get crd operatorgroups.operators.coreos.com >/dev/null 2>&1
 }
 
 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 - 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
@@ -72,7 +97,7 @@ function enable_admission_webhooks {
   else
     echo "Attempting to enable admission webhooks via SSH."
     KUBE_SSH_USER=${KUBE_SSH_USER:-cloud-user}
-    API_SERVER=$(oc config view --minify | grep server | awk -F'//' '{print $2}' | awk -F':' '{print $1}')
+    API_SERVER=$($CMD config view --minify | grep server | awk -F'//' '{print $2}' | awk -F':' '{print $1}')
 
     ssh $KUBE_SSH_USER@$API_SERVER -i $KUBE_SSH_KEY /bin/bash <<- EOF
 	sudo -i
@@ -121,7 +146,7 @@ function install_olm {
   if check_openshift_4; then
     echo "Detected OpenShift 4 - skipping OLM installation."
     OLM_NS="openshift-operator-lifecycle-manager"
-  elif oc get ns "$OLM_NS"; then
+  elif $CMD get ns "$OLM_NS" 2>/dev/null; then
     echo "Detected OpenShift 3 with OLM already installed."
     # we'll assume this is v3.11.0, which doesn't support
     # OperatorGroups, or ClusterRoles in the CSV, so...
@@ -136,32 +161,37 @@ function install_olm {
     rm -rf "$OLM_DIR"
     git clone https://github.com/operator-framework/operator-lifecycle-manager "$OLM_DIR"
     pushd $OLM_DIR; git checkout eaf605cca864e; popd
-    for i in "$OLM_DIR"/deploy/okd/manifests/latest/*.crd.yaml; do oc apply -f $i; done
-    for i in $(find "$OLM_DIR/deploy/okd/manifests/latest/" -type f ! -name "*crd.yaml" | sort); do oc create -f $i; done
+    for i in "$OLM_DIR"/deploy/okd/manifests/latest/*.crd.yaml; do $CMD apply -f $i; done
+    for i in $(find "$OLM_DIR/deploy/okd/manifests/latest/" -type f ! -name "*crd.yaml" | sort); do $CMD create -f $i; done
     wait_for_all_pods openshift-operator-lifecycle-manager
     # perms required by the OLM console: $OLM_DIR/scripts/run_console_local.sh
-    oc adm policy add-cluster-role-to-user cluster-admin system:serviceaccount:kube-system:default
+    # oc adm policy add-cluster-role-to-user cluster-admin system:serviceaccount:kube-system:default
     # check our namespace
     OLM_NS=$(grep "catalog_namespace:" "$OLM_DIR/deploy/okd/values.yaml" | awk '{print $2}')
   fi
   # and finally apply the catalog sources
-  oc apply -f "$ROOT_DIR/knative-operators.catalogsource.yaml" -n "$OLM_NS"
-  oc apply -f "$ROOT_DIR/maistra-operators.catalogsource.yaml" -n "$OLM_NS"
+  $CMD apply -f "$ROOT_DIR/knative-operators.catalogsource.yaml" -n "$OLM_NS"
+  $CMD apply -f "$ROOT_DIR/maistra-operators.catalogsource.yaml" -n "$OLM_NS"
 }
 
 function install_istio {
-  # istio
-  oc create ns istio-operator
-  if check_operatorgroups; then
-    cat <<-EOF | oc apply -f -
+  if check_minikube; then
+    echo "Detected minikube - incompatible with Maistra operator, so installing upstream istio."
+    $CMD apply -f "https://github.com/knative/serving/releases/download/${KNATIVE_SERVING_VERSION}/istio-crds.yaml" && \
+    $CMD apply -f "https://github.com/knative/serving/releases/download/${KNATIVE_SERVING_VERSION}/istio.yaml"
+    wait_for_all_pods istio-system
+  else
+    $CMD create ns istio-operator
+    if check_operatorgroups; then
+      cat <<-EOF | $CMD apply -f -
 	apiVersion: operators.coreos.com/v1alpha2
 	kind: OperatorGroup
 	metadata:
 	  name: istio-operator
 	  namespace: istio-operator
 	EOF
-  fi
-  cat <<-EOF | oc apply -f -
+    fi
+    cat <<-EOF | $CMD apply -f -
 	apiVersion: operators.coreos.com/v1alpha1
 	kind: Subscription
 	metadata:
@@ -172,9 +202,9 @@ function install_istio {
 	  name: maistra
 	  source: maistra-operators
 	EOF
-  wait_for_all_pods istio-operator
+    wait_for_all_pods istio-operator
 
-  cat <<-EOF | oc apply -f -
+    cat <<-EOF | $CMD apply -f -
 	apiVersion: istio.openshift.com/v1alpha1
 	kind: Installation
 	metadata:
@@ -191,32 +221,33 @@ function install_istio {
 	    prefix: kiali/
 	    version: v0.7.1
 	EOF
-  timeout 900 'oc get pods -n istio-system && [[ $(oc get pods -n istio-system | grep openshift-ansible-istio-installer | grep -c Completed) -eq 0 ]]'
+    timeout 900 '$CMD get pods -n istio-system && [[ $($CMD get pods -n istio-system | grep openshift-ansible-istio-installer | grep -c Completed) -eq 0 ]]'
 
-  # Scale down unused services deployed by the istio operator. The
-  # jaeger pods will fail anyway due to the elasticsearch pod failing
-  # due to "max virtual memory areas vm.max_map_count [65530] is too
-  # low, increase to at least [262144]" which could be mitigated on
-  # minishift with:
-  #  minishift ssh "echo 'echo vm.max_map_count = 262144 >/etc/sysctl.d/99-elasticsearch.conf' | sudo sh"
-  oc scale -n istio-system --replicas=0 deployment/grafana
-  oc scale -n istio-system --replicas=0 deployment/jaeger-collector
-  oc scale -n istio-system --replicas=0 deployment/jaeger-query
-  oc scale -n istio-system --replicas=0 statefulset/elasticsearch
+    # Scale down unused services deployed by the istio operator. The
+    # jaeger pods will fail anyway due to the elasticsearch pod failing
+    # due to "max virtual memory areas vm.max_map_count [65530] is too
+    # low, increase to at least [262144]" which could be mitigated on
+    # minishift with:
+    #  minishift ssh "echo 'echo vm.max_map_count = 262144 >/etc/sysctl.d/99-elasticsearch.conf' | sudo sh"
+    $CMD scale -n istio-system --replicas=0 deployment/grafana
+    $CMD scale -n istio-system --replicas=0 deployment/jaeger-collector
+    $CMD scale -n istio-system --replicas=0 deployment/jaeger-query
+    $CMD scale -n istio-system --replicas=0 statefulset/elasticsearch
+  fi
 }
 
 function install_knative_build {
-  oc create ns knative-build
+  $CMD create ns knative-build
   if check_operatorgroups; then
-    cat <<-EOF | oc apply -f -
+    cat <<-EOF | $CMD apply -f -
 	apiVersion: operators.coreos.com/v1alpha2
 	kind: OperatorGroup
 	metadata:
 	  name: knative-build
 	  namespace: knative-build
 	EOF
   fi
-  cat <<-EOF | oc apply -f -
+  cat <<-EOF | $CMD apply -f -
 	apiVersion: operators.coreos.com/v1alpha1
 	kind: Subscription
 	metadata:
@@ -232,17 +263,17 @@ function install_knative_build {
 }
 
 function install_knative_serving {
-  oc create ns knative-serving
+  $CMD create ns knative-serving
   if check_operatorgroups; then
-    cat <<-EOF | oc apply -f -
+    cat <<-EOF | $CMD apply -f -
 	apiVersion: operators.coreos.com/v1alpha2
 	kind: OperatorGroup
 	metadata:
 	  name: knative-serving
 	  namespace: knative-serving
 	EOF
   fi
-  cat <<-EOF | oc apply -f -
+  cat <<-EOF | $CMD apply -f -
 	apiVersion: operators.coreos.com/v1alpha1
 	kind: Subscription
 	metadata:
@@ -258,17 +289,17 @@ function install_knative_serving {
 }
 
 function install_knative_eventing {
-  oc create ns knative-eventing
+  $CMD create ns knative-eventing
   if check_operatorgroups; then
-    cat <<-EOF | oc apply -f -
+    cat <<-EOF | $CMD apply -f -
 	apiVersion: operators.coreos.com/v1alpha2
 	kind: OperatorGroup
 	metadata:
 	  name: knative-eventing
 	  namespace: knative-eventing
 	EOF
   fi
-  cat <<-EOF | oc apply -f -
+  cat <<-EOF | $CMD apply -f -
 	apiVersion: operators.coreos.com/v1alpha1
 	kind: Subscription
 	metadata:
