e2e: use ResourceDeployer for RBD

Signed-off-by: Niels de Vos <ndevos@redhat.com>

e2e/rbd.go

@@ -20,7 +20,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"os"
 	"strings"
 	"time"
 
@@ -131,90 +130,50 @@ func deleteRBDPlugin() {
 }
 
 func createORDeleteRbdResources(action kubectlAction) {
-	csiDriver, err := os.ReadFile(rbdDirPath + csiDriverObject)
+	resources := []ResourceDeployer{
-	if err != nil {
+		&yamlResource{
-		// createORDeleteRbdResources is used for upgrade testing as csidriverObject is
+			filename:     rbdDirPath + csiDriverObject,
-		// newly added, discarding file not found error.
+			allowMissing: true,
-		if !os.IsNotExist(err) {
+		},
-			e2elog.Failf("failed to read content from %s: %v", rbdDirPath+csiDriverObject, err)
+		&yamlResource{
-		}
+			filename:     examplePath + cephConfconfigMap,
-	} else {
+			allowMissing: true,
-		err = retryKubectlInput(cephCSINamespace, action, string(csiDriver), deployTimeout)
+		},
+		&yamlResourceNamespaced{
+			filename:       rbdDirPath + rbdProvisioner,
+			namespace:      cephCSINamespace,
+			oneReplica:     true,
+			enableTopology: true,
+		},
+		&yamlResourceNamespaced{
+			filename:  rbdDirPath + rbdProvisionerRBAC,
+			namespace: cephCSINamespace,
+		},
+		&yamlResourceNamespaced{
+			filename:  rbdDirPath + rbdProvisionerPSP,
+			namespace: cephCSINamespace,
+		},
+		&yamlResourceNamespaced{
+			filename:    rbdDirPath + rbdNodePlugin,
+			namespace:   cephCSINamespace,
+			domainLabel: nodeRegionLabel + "," + nodeZoneLabel,
+		},
+		&yamlResourceNamespaced{
+			filename:  rbdDirPath + rbdNodePluginRBAC,
+			namespace: cephCSINamespace,
+		},
+		&yamlResourceNamespaced{
+			filename:  rbdDirPath + rbdNodePluginPSP,
+			namespace: cephCSINamespace,
+		},
+	}
+
+	for _, r := range resources {
+		err := r.Do(action)
 		if err != nil {
-			e2elog.Failf("failed to %s CSIDriver object: %v", action, err)
+			e2elog.Failf("failed to %s resource: %v", action, err)
 		}
 	}
-	cephConf, err := os.ReadFile(examplePath + cephConfconfigMap)
-	if err != nil {
-		// createORDeleteRbdResources is used for upgrade testing as cephConf Configmap is
-		// newly added, discarding file not found error.
-		if !os.IsNotExist(err) {
-			e2elog.Failf("failed to read content from %s: %v", examplePath+cephConfconfigMap, err)
-		}
-	} else {
-		err = retryKubectlInput(cephCSINamespace, action, string(cephConf), deployTimeout)
-		if err != nil {
-			e2elog.Failf("failed to %s ceph-conf configmap object: %v", action, err)
-		}
-	}
-	data, err := replaceNamespaceInTemplate(rbdDirPath + rbdProvisioner)
-	if err != nil {
-		e2elog.Failf("failed to read content from %s: %v", rbdDirPath+rbdProvisioner, err)
-	}
-	data = oneReplicaDeployYaml(data)
-	data = enableTopologyInTemplate(data)
-	err = retryKubectlInput(cephCSINamespace, action, data, deployTimeout)
-	if err != nil {
-		e2elog.Failf("failed to %s rbd provisioner: %v", action, err)
-	}
-
-	data, err = replaceNamespaceInTemplate(rbdDirPath + rbdProvisionerRBAC)
-	if err != nil {
-		e2elog.Failf("failed to read content from %s: %v", rbdDirPath+rbdProvisionerRBAC, err)
-	}
-	err = retryKubectlInput(cephCSINamespace, action, data, deployTimeout)
-	if err != nil {
-		e2elog.Failf("failed to %s provisioner rbac: %v", action, err)
-	}
-
-	data, err = replaceNamespaceInTemplate(rbdDirPath + rbdProvisionerPSP)
-	if err != nil {
-		e2elog.Failf("failed to read content from %s: %v", rbdDirPath+rbdProvisionerPSP, err)
-	}
-	err = retryKubectlInput(cephCSINamespace, action, data, deployTimeout)
-	if err != nil {
-		e2elog.Failf("failed to %s provisioner psp: %v", action, err)
-	}
-
-	data, err = replaceNamespaceInTemplate(rbdDirPath + rbdNodePlugin)
-	if err != nil {
-		e2elog.Failf("failed to read content from %s: %v", rbdDirPath+rbdNodePlugin, err)
-	}
-
-	domainLabel := nodeRegionLabel + "," + nodeZoneLabel
-	data = addTopologyDomainsToDSYaml(data, domainLabel)
-	err = retryKubectlInput(cephCSINamespace, action, data, deployTimeout)
-	if err != nil {
-		e2elog.Failf("failed to %s nodeplugin: %v", action, err)
-	}
-
-	data, err = replaceNamespaceInTemplate(rbdDirPath + rbdNodePluginRBAC)
-	if err != nil {
-		e2elog.Failf("failed to read content from %s: %v", rbdDirPath+rbdNodePluginRBAC, err)
-	}
-	err = retryKubectlInput(cephCSINamespace, action, data, deployTimeout)
-	if err != nil {
-		e2elog.Failf("failed to %s nodeplugin rbac: %v", action, err)
-	}
-
-	data, err = replaceNamespaceInTemplate(rbdDirPath + rbdNodePluginPSP)
-	if err != nil {
-		e2elog.Failf("failed to read content from %s: %v", rbdDirPath+rbdNodePluginPSP, err)
-	}
-	err = retryKubectlInput(cephCSINamespace, action, data, deployTimeout)
-	if err != nil {
-		e2elog.Failf("failed to %s nodeplugin psp: %v", action, err)
-	}
 }
 
 func validateRBDImageCount(f *framework.Framework, count int, pool string) {