[patch] fix

Author: Sanjay Prabhakar

src/mas/devops/ocp.py

@@ -20,6 +20,8 @@
 from kubernetes.stream import stream
 from kubernetes.stream.ws_client import ERROR_CHANNEL
 
+from .mas import getDefaultStorageClasses
+
 import yaml
 
 logger = logging.getLogger(__name__)
@@ -177,12 +179,18 @@ def waitForPVC(dynClient: DynamicClient, namespace: str, pvcName: str) -> bool:
     return foundReadyPVC
 
 
-def patchPendingPVC(dynClient: DynamicClient, namespace: str, pvcName: str, storageClassName: str) -> bool:
+def patchPendingPVC(dynClient: DynamicClient, namespace: str, pvcName: str, storageClassName: str = None) -> bool:
     pvcAPI = dynClient.resources.get(api_version="v1", kind="PersistentVolumeClaim")
     try:
         pvc = pvcAPI.get(name=pvcName, namespace=namespace)
         if pvc.status.phase == "Pending" and pvc.spec.storageClassName is None:
-            pvc.spec.storageClassName = storageClassName
+            if getStorageClasses is not None:
+                pvc.spec.storageClassName = storageClassName
+            else:
+                defaultStorageClasses = getDefaultStorageClasses(dynClient)
+                if defaultStorageClasses.provider is not None:
+                    pvc.spec.storageClassName = defaultStorageClasses.rwo
+
             pvcAPI.patch(body=pvc, namespace=namespace)
 
             maxRetries = 60

src/mas/devops/tekton.py

@@ -27,7 +27,7 @@
 logger = logging.getLogger(__name__)
 
 
-def installOpenShiftPipelines(dynClient: DynamicClient) -> bool:
+def installOpenShiftPipelines(dynClient: DynamicClient, customStorageClassName: str = None) -> bool:
     """
     Install the OpenShift Pipelines Operator and wait for it to be ready to use
     """
@@ -94,8 +94,8 @@ def installOpenShiftPipelines(dynClient: DynamicClient) -> bool:
     if foundReadyPVC:
         logger.info("OpenShift Pipelines postgres is installed and ready")
     else:
-        patchedPVC = patchPVC(dynClient, namespace="openshift-pipelines", pvcName="postgredb-tekton-results-postgres-0")
-        if patchPVC:
+        patchedPVC = patchPendingPVC(dynClient, namespace="openshift-pipelines", pvcName="postgredb-tekton-results-postgres-0", storageClassName=customStorageClassName)
+        if patchedPVC:
             logger.info("OpenShift Pipelines postgres is installed and ready")
         else:
             logger.error("OpenShift Pipelines postgres PVC is NOT ready")