Fix nil panic, add debug to CRD validation

Signed-off-by: Kyle Squizzato <[email protected]>
k0rdent · Oct 1, 2024 · 2cd1be6 · 2cd1be6
1 parent 9451437
commit 2cd1be6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/test/e2e/managedcluster/clusteridentity/clusteridentity.go b/test/e2e/managedcluster/clusteridentity/clusteridentity.go
@@ -18,6 +18,7 @@ import (
 	"context"
 	"fmt"
 	"os"
+	"time"
 
 	"github.com/Mirantis/hmc/test/e2e/kubeclient"
 	"github.com/Mirantis/hmc/test/e2e/managedcluster"
@@ -117,10 +118,14 @@ func (ci *ClusterIdentity) waitForResourceCRD(kc *kubeclient.KubeClient) {
 	ctx := context.Background()
 	client := kc.GetDynamicClient(ci.GroupVersionResource)
 
-	Eventually(func() bool {
-		_, err := client.List(ctx, metav1.ListOptions{})
-		return err == nil
-	}, "1m", "5s").Should(BeTrue(), "failed to list %s", ci.GroupVersionResource.String())
+	Eventually(func() error {
+		if _, err := client.List(ctx, metav1.ListOptions{}); err != nil {
+			_, _ = fmt.Fprintf(GinkgoWriter, "failed to list %s resources: %v, retrying...\n", ci.GroupVersionResource.Resource, err)
+			return err
+		}
+		_, _ = fmt.Fprintf(GinkgoWriter, "CRD available\n")
+		return nil
+	}).WithTimeout(time.Minute).WithPolling(5 * time.Second).Should(Succeed())
 }
 
 // createSecret creates a secret affiliated with a ClusterIdentity.

diff --git a/test/e2e/managedcluster/validate_deployed.go b/test/e2e/managedcluster/validate_deployed.go
@@ -191,7 +191,7 @@ func validateCSIDriver(ctx context.Context, kc *kubeclient.KubeClient, clusterNa
 		return fmt.Errorf("failed to get test PVC: %w", err)
 	}
 
-	if !strings.Contains(*pvc.Spec.StorageClassName, "csi") {
+	if pvc.Spec.StorageClassName != nil && !strings.Contains(*pvc.Spec.StorageClassName, "csi") {
 		Fail(fmt.Sprintf("%s PersistentVolumeClaim does not have a CSI driver storageClass", pvcName))
 	}