From df69703265e213476e221e5699aca2d2e68bd4a2 Mon Sep 17 00:00:00 2001 From: Wilson Radadia Date: Tue, 31 Dec 2024 13:08:20 +0530 Subject: [PATCH 1/3] Update for installation check of the snapshot --- dell-csi-helm-installer/verify-csi-unity.sh | 12 ++++++++---- dell-csi-helm-installer/verify.sh | 5 +++++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dell-csi-helm-installer/verify-csi-unity.sh b/dell-csi-helm-installer/verify-csi-unity.sh index 2a52874..8820fce 100644 --- a/dell-csi-helm-installer/verify-csi-unity.sh +++ b/dell-csi-helm-installer/verify-csi-unity.sh @@ -10,19 +10,23 @@ # verify-csi-unity method function verify-csi-unity() { - verify_k8s_versions "1.25" "1.31" + verify_k8s_versions "1.25" "1.32" verify_openshift_versions "4.16" "4.17" 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 index 1249aea..50168a6 100755 --- a/dell-csi-helm-installer/verify.sh +++ b/dell-csi-helm-installer/verify.sh @@ -41,6 +41,11 @@ 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}') +echo ${snapshot_enabled} +} + # # verify-driver will call the proper method to verify a specific driver From 36cc2e7e0957f39fa2d14b1c6bc2ccc4f8d6fc7c Mon Sep 17 00:00:00 2001 From: Wilson Radadia Date: Tue, 31 Dec 2024 15:53:50 +0530 Subject: [PATCH 2/3] Update the k8s version --- dell-csi-helm-installer/verify-csi-unity.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dell-csi-helm-installer/verify-csi-unity.sh b/dell-csi-helm-installer/verify-csi-unity.sh index 8820fce..f250816 100644 --- a/dell-csi-helm-installer/verify-csi-unity.sh +++ b/dell-csi-helm-installer/verify-csi-unity.sh @@ -10,7 +10,7 @@ # verify-csi-unity method function verify-csi-unity() { - verify_k8s_versions "1.25" "1.32" + verify_k8s_versions "1.25" "1.31" verify_openshift_versions "4.16" "4.17" verify_namespace "${NS}" verify_required_secrets "${RELEASE}-creds" From 5cf26d3e53ba51a26231d88cb6d4cf4b47086869 Mon Sep 17 00:00:00 2001 From: Wilson Radadia Date: Wed, 1 Jan 2025 11:07:30 +0530 Subject: [PATCH 3/3] Remove the unnecessary echo --- dell-csi-helm-installer/verify.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/dell-csi-helm-installer/verify.sh b/dell-csi-helm-installer/verify.sh index 50168a6..682628b 100755 --- a/dell-csi-helm-installer/verify.sh +++ b/dell-csi-helm-installer/verify.sh @@ -43,7 +43,6 @@ function source-verify-driver() { function is_snapshot_enabled() { snapshot_enabled=$(sed -n '/snapshot:/,/resizer:/p' "$VALUES" | grep -v '^\s*#' | grep "enabled:" | awk '{print $2}') -echo ${snapshot_enabled} }