From 94f89f9dd25e466e772ccb637b09a1f57c113604 Mon Sep 17 00:00:00 2001
From: Jim Grady <jimgrady.jg@gmail.com>
Date: Tue, 9 Apr 2024 11:30:58 -0400
Subject: [PATCH] Update install/uninstall scripts (#3044)

also, configure helm to wait for ingress-controller
---
 deploy/scripts/install-combine.sh              | 10 ++--------
 deploy/scripts/setup_files/cluster_config.yaml |  2 +-
 deploy/scripts/uninstall-combine               |  1 +
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/deploy/scripts/install-combine.sh b/deploy/scripts/install-combine.sh
index 5c9d3e7fa7..b32cb18d66 100755
--- a/deploy/scripts/install-combine.sh
+++ b/deploy/scripts/install-combine.sh
@@ -1,4 +1,5 @@
 #! /usr/bin/env bash
+set -eo pipefail
 
 # Set the environment variables that are required by The Combine.
 # In addition, the values are stored in a file so that they do not
@@ -8,13 +9,6 @@ set-combine-env () {
     # Generate JWT Secret Key
     COMBINE_JWT_SECRET_KEY=`LC_ALL=C tr -dc 'A-Za-z0-9*\-_@!' </dev/urandom | head -c 64; echo`
     # Collect values from user
-    cat << .EOM
-
-     The installation process will setup an initial user as a site
-     administrator.  This you can select a username that you will use
-     for your normal word collection work.  The default username is admin.
-
-.EOM
     read -p "Enter AWS_ACCESS_KEY_ID: " AWS_ACCESS_KEY_ID
     read -p "Enter AWS_SECRET_ACCESS_KEY: " AWS_SECRET_ACCESS_KEY
     # write collected values and static values to config file
@@ -203,11 +197,11 @@ if [ -z "${COMBINE_VERSION}" ] ; then
   exit 1
 fi
 
+create-python-venv
 # Step through the installation stages
 while [ "$STATE" != "Done" ] ; do
   case $STATE in
     Pre-reqs)
-      create-python-venv
       install-kubernetes
       next-state "Restart"
       ;;
diff --git a/deploy/scripts/setup_files/cluster_config.yaml b/deploy/scripts/setup_files/cluster_config.yaml
index db6cd382f6..13797df35b 100644
--- a/deploy/scripts/setup_files/cluster_config.yaml
+++ b/deploy/scripts/setup_files/cluster_config.yaml
@@ -30,7 +30,7 @@ nginx-ingress-controller:
     name: ingress-controller
     reference: ingress-nginx/ingress-nginx
     namespace: ingress-nginx
-    wait: false
+    wait: true
 
 rancher-ui:
   repo:
diff --git a/deploy/scripts/uninstall-combine b/deploy/scripts/uninstall-combine
index aa27e2f99d..0f6c5ffebf 100755
--- a/deploy/scripts/uninstall-combine
+++ b/deploy/scripts/uninstall-combine
@@ -1,4 +1,5 @@
 #! /usr/bin/env bash
+set -euo pipefail
 
 delete-files () {
   for file in "$@" ; do