diff --git a/e2e/deployment.go b/e2e/deployment.go index 98ee7ae1e..f4f63642a 100644 --- a/e2e/deployment.go +++ b/e2e/deployment.go @@ -268,40 +268,6 @@ func (yrn *yamlResourceNamespaced) Do(action kubectlAction) error { return nil } -type rookNFSResource struct { - f *framework.Framework - modules []string - orchBackend string -} - -func (rnr *rookNFSResource) Do(action kubectlAction) error { - if action != kubectlCreate { - // we won't disabled modules - return nil - } - - for _, module := range rnr.modules { - cmd := fmt.Sprintf("ceph mgr module enable %s", module) - _, _, err := execCommandInToolBoxPod(rnr.f, cmd, rookNamespace) - if err != nil { - // depending on the Ceph/Rook version, modules are - // enabled by default - framework.Logf("enabling module %q failed: %v", module, err) - } - } - - if rnr.orchBackend != "" { - // this is not required for all Rook versions, allow failing - cmd := fmt.Sprintf("ceph orch set backend %s", rnr.orchBackend) - _, _, err := execCommandInToolBoxPod(rnr.f, cmd, rookNamespace) - if err != nil { - framework.Logf("setting orch backend %q failed: %v", rnr.orchBackend, err) - } - } - - return nil -} - func waitForDeploymentUpdateScale( c kubernetes.Interface, ns, diff --git a/e2e/nfs.go b/e2e/nfs.go index dca1b227c..56f9cc7f4 100644 --- a/e2e/nfs.go +++ b/e2e/nfs.go @@ -72,14 +72,14 @@ func deployNFSPlugin(f *framework.Framework) { framework.Failf("failed to create pool for NFS config %q: %v", nfsPoolName, err) } - createORDeleteNFSResources(f, kubectlCreate) + createORDeleteNFSResources(kubectlCreate) } func deleteNFSPlugin() { - createORDeleteNFSResources(nil, kubectlDelete) + createORDeleteNFSResources(kubectlDelete) } -func createORDeleteNFSResources(f *framework.Framework, action kubectlAction) { +func createORDeleteNFSResources(action kubectlAction) { cephConfigFile := getConfigFile(cephConfconfigMap, deployPath, examplePath) resources := []ResourceDeployer{ // shared resources @@ -112,12 +112,7 @@ func createORDeleteNFSResources(f *framework.Framework, action kubectlAction) { filename: nfsDirPath + nfsNodePlugin, namespace: cephCSINamespace, }, - // NFS-export management by Rook - &rookNFSResource{ - f: f, - modules: []string{"rook", "nfs"}, - orchBackend: "rook", - }, + // NFS server deployment &yamlResourceNamespaced{ filename: nfsExamplePath + nfsRookCephNFS, namespace: rookNamespace,