Addressing installation review comments across all drivers (#32)

dell · Nov 16, 2021 · d62f6aa · d62f6aa
1 parent c3ec588
commit d62f6aa
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/dell-csi-helm-installer/common.sh b/dell-csi-helm-installer/common.sh
@@ -42,6 +42,14 @@ function log() {
     debuglog_only "Installation cannot continue"
     exit 1
     ;;
+  uninstall_error)
+    log separator
+    printf "${RED}Error: $2\n"
+    printf "${RED}Uninstallation cannot continue${NC}\n"
+    debuglog_only "Error: $2"
+    debuglog_only "Uninstallation cannot continue"
+    exit 1
+    ;;
   step)
     printf "|\n|- %-65s" "$2"
     debuglog_only "${2}"

diff --git a/dell-csi-helm-installer/csi-install.sh b/dell-csi-helm-installer/csi-install.sh
@@ -147,6 +147,8 @@ function install_driver() {
   HELMOUTPUT="/tmp/csi-install.$$.out"
   run_command helm ${1} \
     --set openshift=${OPENSHIFT} \
+    --values "${DRIVERDIR}/${DRIVER}/k8s-${kMajorVersion}.${kMinorVersion}-values.yaml" \
+    --values "${DRIVERDIR}/${DRIVER}/driver-image.yaml" \
     --values "${VALUES}" \
     --namespace ${NS} "${RELEASE}" \
     "${DRIVERDIR}/${DRIVER}" >"${HELMOUTPUT}" 2>&1

diff --git a/dell-csi-helm-installer/csi-uninstall.sh b/dell-csi-helm-installer/csi-uninstall.sh
@@ -70,7 +70,7 @@ function validate_params() {
 function check_for_driver() {
     NUM=$(run_command helm list --namespace "${NAMESPACE}" | grep "^${RELEASE}\b" | wc -l)
     if [ "${NUM}" == "0" ]; then
-        log error "The CSI Driver is not installed."
+        log uninstall_error "The CSI Driver is not installed."
         exit 1
     fi
 }