From 2390a43415ba15c95c63ba90ddbff825cb9ace6c Mon Sep 17 00:00:00 2001 From: Prasanna Kumar Kalever Date: Tue, 14 Jun 2022 19:20:42 +0530 Subject: [PATCH] e2e: add tests to validate cluster name Signed-off-by: Prasanna Kumar Kalever --- e2e/cephfs.go | 10 ++++++++++ e2e/cephfs_helper.go | 1 + 2 files changed, 11 insertions(+) diff --git a/e2e/cephfs.go b/e2e/cephfs.go index 38a930481..6b757ef50 100644 --- a/e2e/cephfs.go +++ b/e2e/cephfs.go @@ -194,6 +194,14 @@ var _ = Describe(cephfsType, func() { if err != nil { e2elog.Failf("failed to create node secret: %v", err) } + + // wait for cluster name update in deployment + containers := []string{cephFSContainerName} + err = waitForContainersArgsUpdate(c, cephCSINamespace, cephFSDeploymentName, + "clustername", defaultClusterName, containers, deployTimeout) + if err != nil { + e2elog.Failf("timeout waiting for deployment update %s/%s: %v", cephCSINamespace, cephFSDeploymentName, err) + } }) AfterEach(func() { @@ -441,6 +449,8 @@ var _ = Describe(cephfsType, func() { e2elog.Failf("expected pvcNamespace %q got %q", pvc.Namespace, metadata.PVCNamespaceKey) } else if metadata.PVNameKey != pvcObj.Spec.VolumeName { e2elog.Failf("expected pvName %q got %q", pvcObj.Spec.VolumeName, metadata.PVNameKey) + } else if metadata.ClusterNameKey != defaultClusterName { + e2elog.Failf("expected clusterName %q got %q", defaultClusterName, metadata.ClusterNameKey) } err = deletePVCAndValidatePV(f.ClientSet, pvc, deployTimeout) diff --git a/e2e/cephfs_helper.go b/e2e/cephfs_helper.go index 2d2553b7e..9f641415f 100644 --- a/e2e/cephfs_helper.go +++ b/e2e/cephfs_helper.go @@ -216,6 +216,7 @@ type cephfsSubvolumeMetadata struct { PVCNameKey string `json:"csi.storage.k8s.io/pvc/name"` PVCNamespaceKey string `json:"csi.storage.k8s.io/pvc/namespace"` PVNameKey string `json:"csi.storage.k8s.io/pv/name"` + ClusterNameKey string `json:"csi.ceph.com/cluster/name"` } func listCephFSSubvolumeMetadata(