NONRTRIC Kong PV creation handling removed

The logic to enable/disable PV creation based on the default storage class has been removed.
PV is created by default using the smo-storage storage class. Hence there is no need to check for the default storage class.

Issue-ID: INT-170
Change-Id: I03baf34e17ac8ae489d18d464c452ad9f99e1003
Signed-off-by: aravind.est <aravindhan.a@est.tech>

diff --git a/smo-install/helm-override/default/oran-override.yaml b/smo-install/helm-override/default/oran-override.yaml
index b806b8c..5f8781f 100644 (file)
--- a/smo-install/helm-override/default/oran-override.yaml
+++ b/smo-install/helm-override/default/oran-override.yaml
@@ -89,9 +89,7 @@ kong:
     enabled: true
   kongpv:
     # This enables/disables the PV creation for kong
-    # PV creation is necessary when there is no default storage class
-    # This should be set to false when there is a default storage class, Which lets the PVC provisions the PV dynamically.
-    # In SMO installation, this is handled as part of smo-install/scripts/sub-scripts/install-nonrtric.sh script
+    # PV creation is handled using the smo-storage storage class
     enabled: true
     persistence:
       storageClassName: *smo-sc

diff --git a/smo-install/scripts/sub-scripts/install-nonrtric.sh b/smo-install/scripts/sub-scripts/install-nonrtric.sh
index 6cf836c..acb0e24 100755 (executable)
--- a/smo-install/scripts/sub-scripts/install-nonrtric.sh
+++ b/smo-install/scripts/sub-scripts/install-nonrtric.sh
@@ -30,17 +30,9 @@ OVERRIDEYAML=$1
 
 MODE=$2
 
-defaultSc=$(kubectl get storageclass -o jsonpath='{.items[?(@.metadata.annotations.storageclass\.kubernetes\.io/is-default-class=="true")].metadata.name}')
-kongPvEnabled=true
-if [ -n "$defaultSc" ]; then
-    echo "Default storage is set to : $defaultSc. Setting kong.kongpv.enable to false"
-    kongPvEnabled=false
-fi
-
-
 if [ "$MODE" == "dev" ]; then
     echo "Installing NONRTRIC in dev mode"
-    helm upgrade --install --debug oran-nonrtric local/nonrtric --namespace nonrtric -f $OVERRIDEYAML --set nonrtric.persistence.mountPath="/dockerdata-nfs/deployment-$3" --set kong.kongpv.enabled=$kongPvEnabled
+    helm upgrade --install --debug oran-nonrtric local/nonrtric --namespace nonrtric -f $OVERRIDEYAML --set nonrtric.persistence.mountPath="/dockerdata-nfs/deployment-$3"
 else
     echo "Installing NONRTRIC in release mode"
     # This following should be modified once the charts are uploaded and available in the nexus repository
@@ -48,7 +40,7 @@ else
         # helm repo add nonrtric https://nexus3.o-ran-sc.org/repository/smo-helm-snapshots/
         # helm repo update
         # helm install oran-nonrtric nonrtric/nonrtric --namespace nonrtric -f $OVERRIDEYAML --create-namespace
-    helm upgrade --install oran-nonrtric local/nonrtric --namespace nonrtric -f $OVERRIDEYAML --set nonrtric.persistence.mountPath="/dockerdata-nfs/deployment-$3" --set kong.kongpv.enabled=$kongPvEnabled
+    helm upgrade --install oran-nonrtric local/nonrtric --namespace nonrtric -f $OVERRIDEYAML --set nonrtric.persistence.mountPath="/dockerdata-nfs/deployment-$3"
 fi