mirror of
https://github.com/ceph/ceph-csi.git
synced 2024-11-09 16:00:22 +00:00
ci: skip enabling nfs modules in e2e
As we dont need to enable nfs modules in ceph v16.2.8 onwards skipping this one. Because of this one we have a regression in nfs export Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
This commit is contained in:
parent
d45bb12cc1
commit
10bec8a002
@ -268,40 +268,6 @@ func (yrn *yamlResourceNamespaced) Do(action kubectlAction) error {
|
|||||||
return nil
|
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(
|
func waitForDeploymentUpdateScale(
|
||||||
c kubernetes.Interface,
|
c kubernetes.Interface,
|
||||||
ns,
|
ns,
|
||||||
|
13
e2e/nfs.go
13
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)
|
framework.Failf("failed to create pool for NFS config %q: %v", nfsPoolName, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
createORDeleteNFSResources(f, kubectlCreate)
|
createORDeleteNFSResources(kubectlCreate)
|
||||||
}
|
}
|
||||||
|
|
||||||
func deleteNFSPlugin() {
|
func deleteNFSPlugin() {
|
||||||
createORDeleteNFSResources(nil, kubectlDelete)
|
createORDeleteNFSResources(kubectlDelete)
|
||||||
}
|
}
|
||||||
|
|
||||||
func createORDeleteNFSResources(f *framework.Framework, action kubectlAction) {
|
func createORDeleteNFSResources(action kubectlAction) {
|
||||||
cephConfigFile := getConfigFile(cephConfconfigMap, deployPath, examplePath)
|
cephConfigFile := getConfigFile(cephConfconfigMap, deployPath, examplePath)
|
||||||
resources := []ResourceDeployer{
|
resources := []ResourceDeployer{
|
||||||
// shared resources
|
// shared resources
|
||||||
@ -112,12 +112,7 @@ func createORDeleteNFSResources(f *framework.Framework, action kubectlAction) {
|
|||||||
filename: nfsDirPath + nfsNodePlugin,
|
filename: nfsDirPath + nfsNodePlugin,
|
||||||
namespace: cephCSINamespace,
|
namespace: cephCSINamespace,
|
||||||
},
|
},
|
||||||
// NFS-export management by Rook
|
// NFS server deployment
|
||||||
&rookNFSResource{
|
|
||||||
f: f,
|
|
||||||
modules: []string{"rook", "nfs"},
|
|
||||||
orchBackend: "rook",
|
|
||||||
},
|
|
||||||
&yamlResourceNamespaced{
|
&yamlResourceNamespaced{
|
||||||
filename: nfsExamplePath + nfsRookCephNFS,
|
filename: nfsExamplePath + nfsRookCephNFS,
|
||||||
namespace: rookNamespace,
|
namespace: rookNamespace,
|
||||||
|
Loading…
Reference in New Issue
Block a user