fix: Use Cephfs storage if no block storage

Signed-off-by: Denilson Nastacio <[email protected]>
IBM · Sep 15, 2023 · e34c864 · e34c864
1 parent 57c51d5
commit e34c864
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/config/argocd-cloudpaks/cp-shared/Chart.yaml b/config/argocd-cloudpaks/cp-shared/Chart.yaml
@@ -16,9 +16,9 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.6.2
+version: 0.6.3
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: "1.3.2"
+appVersion: "1.3.3"
diff --git a/config/argocd-cloudpaks/cp-shared/templates/0050-sync-common-config-map.yaml b/config/argocd-cloudpaks/cp-shared/templates/0050-sync-common-config-map.yaml
@@ -45,6 +45,14 @@ spec:
               else
                 storage_class_rwo=$(oc get StorageClasses rook-ceph-block -o name 2> /dev/null | cut -d "/" -f 2) || true
                 storage_class_rwx=$(oc get StorageClasses rook-cephfs -o name 2> /dev/null | cut -d "/" -f 2) || true
+
+                # If the cluster does not have the dedicated block storage class, the NFS
+                # driver can address most use cases with the exception of "block" volume
+                # mode, which is not needed for Cloud Paks
+                if [ -z "${storage_class_rwo}" ] && [ -n "${storage_class_rwx}" ]; then
+                    storage_class_rwo=${storage_class_rwx}
+                fi
+
                 if [ -n "${storage_class_rwo}" ] && [ -n "${storage_class_rwx}" ]; then
                   echo "INFO: Cluster has Ceph installed, using Ceph storage classes."
                 fi

diff --git a/config/argocd-cloudpaks/cp-shared/templates/0050-sync-cp4a-config-map.yaml b/config/argocd-cloudpaks/cp-shared/templates/0050-sync-cp4a-config-map.yaml
@@ -51,6 +51,14 @@ spec:
               else
                 storage_class_rwo=$(oc get StorageClasses rook-ceph-block -o name 2> /dev/null | cut -d "/" -f 2) || true
                 storage_class_rwx=$(oc get StorageClasses rook-cephfs -o name 2> /dev/null | cut -d "/" -f 2) || true
+
+                # If the cluster does not have the dedicated block storage class, the NFS
+                # driver can address most use cases with the exception of "block" volume
+                # mode, which is not needed for Cloud Paks
+                if [ -z "${storage_class_rwo}" ] && [ -n "${storage_class_rwx}" ]; then
+                    storage_class_rwo=${storage_class_rwx}
+                fi
+
                 if [ -n "${storage_class_rwo}" ] && [ -n "${storage_class_rwx}" ]; then
                   echo "INFO: Cluster has Ceph installed, using Ceph storage classes."
                 fi