Fix for Helm Installation checking Snapshot CRD Only When Snapshot En…

…abled is True (#253) * Update for installation check of the snapshot * Update the k8s version * Remove the unnecessary echo
dell · Jan 1, 2025 · fd5fc8f · fd5fc8f
1 parent c0da4c2
commit fd5fc8f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/dell-csi-helm-installer/verify-csi-unity.sh b/dell-csi-helm-installer/verify-csi-unity.sh
@@ -15,14 +15,18 @@ function verify-csi-unity() {
   verify_namespace "${NS}"
   verify_required_secrets "${RELEASE}-creds"
   verify_optional_secrets "${RELEASE}-certs"
-  verify_alpha_snap_resources
+  snapshot_value=$(is_snapshot_enabled)
+  if [ "$snapshot_value" == "true" ]; then
+    verify_alpha_snap_resources
+  fi
   verify_unity_protocol_installation
-  verify_snap_requirements  
+  if [ "$snapshot_value" == "true" ]; then
+    verify_snap_requirements 
+  fi
   verify_helm_3
   verify_helm_values_version "${DRIVER_VERSION}"
 }
 
-
 function verify_unity_protocol_installation() {
 if [ ${NODE_VERIFY} -eq 0 ]; then
     return

diff --git a/dell-csi-helm-installer/verify.sh b/dell-csi-helm-installer/verify.sh
@@ -41,6 +41,10 @@ function source-verify-driver() {
   fi
 }
 
+function is_snapshot_enabled() {
+snapshot_enabled=$(sed -n '/snapshot:/,/resizer:/p' "$VALUES" | grep -v '^\s*#' | grep "enabled:" | awk '{print $2}')
+}
+
 
 #
 # verify-driver will call the proper method to verify a specific driver
-Original file line number
+Diff line change
@@ Expand Up / @@ -41,6 +41,10 @@ function source-verify-driver() { @@
       fi
     }
+    function is_snapshot_enabled() {
+    snapshot_enabled=$(sed -n '/snapshot:/,/resizer:/p' "$VALUES" | grep -v '^\s*#' | grep "enabled:" | awk '{print $2}')
+    }
     #
     # verify-driver will call the proper method to verify a specific driver
@@ Expand Down @@