chore(minnaker): Update Halyard to 1.9.1

Author: Justin Lee

scripts/functions.sh

@@ -1,4 +1,6 @@
 
+ARMORY_HALYARD_IMAGE="armory/halyard-armory:1.9.1"
+
 install_k3s () {
   curl -sfL https://get.k3s.io | INSTALL_K3S_VERSION="v1.17.4+k3s1" K3S_KUBECONFIG_MODE=644 sh -
 }

scripts/install.sh

@@ -74,7 +74,8 @@ if [[ ${OPEN_SOURCE} -eq 1 ]]; then
   HALYARD_IMAGE="gcr.io/spinnaker-marketplace/halyard:stable"
 else
   printf "Using Armory Spinnaker"
-  HALYARD_IMAGE="armory/halyard-armory:1.9.0"
+  # This is defined in functions.sh
+  HALYARD_IMAGE="${ARMORY_HALYARD_IMAGE}"
 fi
 
 echo "Setting the Halyard Image to ${HALYARD_IMAGE}"

scripts/no_auth_install.sh

@@ -74,7 +74,8 @@ if [[ ${OPEN_SOURCE} -eq 1 ]]; then
   HALYARD_IMAGE="gcr.io/spinnaker-marketplace/halyard:stable"
 else
   printf "Using Armory Spinnaker"
-  HALYARD_IMAGE="armory/halyard-armory:1.9.0"
+  # This is defined in functions.sh
+  HALYARD_IMAGE="${ARMORY_HALYARD_IMAGE}"
 fi
 
 echo "Setting the Halyard Image to ${HALYARD_IMAGE}"

scripts/operator_install.sh

@@ -194,16 +194,6 @@ while [ "$#" -gt 0 ]; do
   shift
 done
 
-# if [[ ${OPEN_SOURCE} -eq 1 ]]; then
-#   printf "Using OSS Spinnaker"
-#   HALYARD_IMAGE="gcr.io/spinnaker-marketplace/halyard:stable"
-# else
-#   printf "Using Armory Spinnaker"
-#   HALYARD_IMAGE="armory/halyard-armory:1.9.0"
-# fi
-
-# echo "Setting the Halyard Image to ${HALYARD_IMAGE}"
-
 # Scaffold out directories
 if [[ ${LINUX} -eq 1 ]]; then
   echo "Running minnaker setup for Linux"

scripts/osx_install.sh

@@ -64,7 +64,8 @@ if [[ ${OPEN_SOURCE} -eq 1 ]]; then
   HALYARD_IMAGE="gcr.io/spinnaker-marketplace/halyard:stable"
 else
   printf "Using Armory Spinnaker"
-  HALYARD_IMAGE="armory/halyard-armory:1.9.0"
+  # This is defined in functions.sh
+  HALYARD_IMAGE="${ARMORY_HALYARD_IMAGE}"
 fi
 
 echo "Setting the Halyard Image to ${HALYARD_IMAGE}"